SetProcessAppUserModelId should not throw (#60)

clowd · Mar 9, 2022 · 86d8efe · 86d8efe
1 parent 7aa7372
commit 86d8efe
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 7 deletions.
diff --git a/src/Squirrel/UpdateManager.cs b/src/Squirrel/UpdateManager.cs
@@ -190,15 +190,27 @@ public SemanticVersion CurrentlyInstalledVersion(string executable = null)
         /// <inheritdoc/>
         public void SetProcessAppUserModelId()
         {
-            var releases = Utility.LoadLocalReleases(Utility.LocalReleaseFileForAppDir(AppDirectory));
-            var thisRelease = Utility.FindCurrentVersion(releases);
-
-            var zf = new ZipPackage(Path.Combine(
-                Utility.PackageDirectoryForAppDir(AppDirectory),
-                thisRelease.Filename));
+            if (_applicationIdOverride == null && !IsInstalledApp) {
+                // can't set model id if we don't know the package id.
+                return;
+            }
 
             var exeName = Path.GetFileName(AssemblyRuntimeInfo.EntryExePath);
-            var appUserModelId = Utility.GetAppUserModelId(zf.Id, exeName);
+
+            string appUserModelId;
+            if (_applicationIdOverride != null) {
+                appUserModelId = Utility.GetAppUserModelId(_applicationIdOverride, exeName);
+            } else {
+                var releases = Utility.LoadLocalReleases(Utility.LocalReleaseFileForAppDir(AppDirectory));
+                var thisRelease = Utility.FindCurrentVersion(releases);
+
+                var zf = new ZipPackage(Path.Combine(
+                    Utility.PackageDirectoryForAppDir(AppDirectory),
+                    thisRelease.Filename));
+
+                appUserModelId = Utility.GetAppUserModelId(zf.Id, exeName);
+            }
+
             NativeMethods.SetCurrentProcessExplicitAppUserModelID(appUserModelId);
         }
 

diff --git a/test/UpdateManagerTests.cs b/test/UpdateManagerTests.cs
@@ -341,6 +341,16 @@ public void CurrentlyInstalledVersionDoesNotThrow()
                 Assert.False(fixture.IsInstalledApp);
             }
 
+            [Fact]
+            public void SetModelIdDoesNotThrow()
+            {
+                using (var fixture = new UpdateManager(null))
+                    fixture.SetProcessAppUserModelId();
+
+                using (var fixture2 = new UpdateManager(null, "TestASD"))
+                    fixture2.SetProcessAppUserModelId();
+            }
+
             [Theory]
             [InlineData(0, 0, 25, 0)]
             [InlineData(12, 0, 25, 3)]