search

synhershko / NAppUpdate

A simple framework for providing auto-update support to .NET applications
http://www.code972.com/blog/2010/08/nappupdate-application-auto-update-framework-for-dotnet/
Apache License 2.0
525 stars 163 forks source link

Redo feed builder fix #99

Open vbjay opened 7 years ago

vbjay commented 7 years ago
vbjay commented 7 years ago

Ready to merge

robinwassen commented 7 years ago

Hi @vbjay!

I appreciate the changes you have done, but it seems like you managed to revert some of the later fixes to the project.

For example:

I will go through the changes and see how we can perform the merge gracefully.

vbjay commented 7 years ago

I'll look. I tried really hard not to do that. I'll go through the diff again.

On Wed, May 31, 2017, 3:18 AM Robin Andersson notifications@github.com wrote:

Hi @vbjay https://github.com/vbjay!

I appreciate the changes you have done, but it seems like you managed to revert some of the later fixes to the project.

For example:

  • Removing FileLockWait(); in FileUpdateTask.cs and adding the commented wait logic
  • Removing FileSystem.CopyAccessControl(...) in FileUpdateTask.cs

I will go through the changes and see how we can perform the merge gracefully.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/synhershko/NAppUpdate/pull/99#issuecomment-305106407, or mute the thread https://github.com/notifications/unsubscribe-auth/ADdhsX4D_m6nM5ayqDBq_vG9eKubrgE3ks5r_RRIgaJpZM4NoGaq .

vbjay commented 7 years ago

Let me know if there is anything else.

vbjay commented 7 years ago

I understand other things taking your time. I had to redo this work because it was ignored the first time. Am i wasting my time with trying to give back to this project?

robinwassen commented 7 years ago

Hi @vbjay,

It is my ambition to merge this - but it will take some time since I am usually very thorough when reviewing changes and want to understand each line that is changed to determine the impact of the change.

Which makes it take some time when the change is on 2500 LOC.

Regards, Robin

robinwassen commented 7 years ago

I have reviewed each commit up to d2a4fc97a4664aa3ae73159f6eb08fcb49dfcd8b this far.

robinwassen commented 7 years ago

@vbjay Do not worry about the conflict.

Some questions I have:

vbjay commented 7 years ago

Look at the next commit for why I added Rx.

I upgraded to 4.62 because I wanted framework 4.0 stuff. It also runs on windows 7sp1 and higher. Windows XP support should not be a factor. Microsoft dumped their support for xp in 2014. We should too. O

robinwassen commented 7 years ago

@vbjay Sorry, my mistake about the upgrade. Thought it was from 4.5 -> 4.6.2 which left me puzzling, but 3.5 -> 4.x makes more sense!

Thanks! Everything is a bit more clear now, so I can keep on working with the review and merge.

robinwassen commented 7 years ago

Most of the refactors and smaller changes has been merged now.

I noticed some more collateral damage in the commits, so I am going through commit per commit and cherry-pick them to the branch feedbuilder-improvements and review all changes in detail.

One comparision is the original commit: https://github.com/synhershko/NAppUpdate/pull/99/commits/af11eac3f7f2222295bc78b442a2911b655ae1b1?w=1

My modified: https://github.com/synhershko/NAppUpdate/commit/641e4f229d3e0dd3a89184ab2d14f26a8dca7a04?w=1

This can take a while, but I will get through it :)

vbjay commented 7 years ago

@robinwassen I appreciate the work you are doing. It means a lot.