Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Instantiate UpdateManager after install directory has been set up to prevent locking

Browse Source
This commit is contained in:
Caelan
2022-06-08 14:10:29 -06:00
parent 34fbcad9a0
commit 0e8db6ff01
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Update.Windows/Program.cs
View File

@@ -1,4 +1,4 @@
using Squirrel.SimpleSplat;
using Squirrel.SimpleSplat;
using Squirrel.Json;
using System;
using System.Collections.Generic;
@@ -256,14 +256,12 @@ namespace Squirrel.Update
.First().PackageName;
var rootAppDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), ourAppName);
var appDesc = new AppDescWindows(rootAppDir, ourAppName, true);
using var mgr = new UpdateManager(new SimpleFileSource(sourceDi), appDesc);
Log.Info("About to install to: " + rootAppDir);
if (Directory.Exists(rootAppDir)) {
Log.Warn("Install path {0} already exists, burning it to the ground", rootAppDir);
mgr.KillAllExecutablesBelongingToPackage();
PlatformUtil.KillProcessesInDirectory(rootAppDir);
await Task.Delay(500);
Log.ErrorIfThrows(() => Utility.Retry(() => Utility.DeleteFileOrDirectoryHard(rootAppDir, throwOnFailure: true, renameFirst: true)),
@@ -279,6 +277,8 @@ namespace Squirrel.Update
Log.ErrorIfThrows(() => File.Copy(SquirrelRuntimeInfo.EntryExePath, updateTarget, true),
"Failed to copy Update.exe to " + updateTarget);
var appDesc = new AppDescWindows(rootAppDir, ourAppName, true);
using var mgr = new UpdateManager(new SimpleFileSource(sourceDi), appDesc);
await mgr.FullInstall(silentInstall, progressSource.Raise);
using var rk = await Log.ErrorIfThrows(() => mgr.CreateUninstallerRegistryEntry(),