Skip to content

Fix DiffPipeline.ApplyPatch: handle differs that do internal atomic replacement #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JusterZhu merged 1 commit into from
May 23, 2026
Merged

Fix DiffPipeline.ApplyPatch: handle differs that do internal atomic replacement #274

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/c#/GeneralUpdate.Differential/Pipeline/DiffPipeline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,18 @@ private async Task ApplyPatch(string appFilePath, string patchFilePath, Cancella

await _binaryDiffer.DirtyAsync(appFilePath, tempPath, patchFilePath, ct);

if (File.Exists(appFilePath))
// Some differ implementations (e.g., BinaryHandler) perform atomic replacement
// internally: they delete oldPath and copy tempPath back to oldPath, then delete tempPath.
// We only handle the replacement ourselves when the differ left tempPath intact.
if (File.Exists(tempPath))
{
File.SetAttributes(appFilePath, FileAttributes.Normal);
File.Delete(appFilePath);
if (File.Exists(appFilePath))
{
File.SetAttributes(appFilePath, FileAttributes.Normal);
File.Delete(appFilePath);
}
File.Move(tempPath, appFilePath);
}
File.Move(tempPath, appFilePath);
}

private static void HandleDeleteList(IEnumerable<FileInfo> patchFiles, IEnumerable<FileInfo> oldFiles)
Expand Down
Loading