- #1739: Detection of upgrading in events (2)

oleg-shilo · Feb 21, 2025 · 21316db · 21316db
1 parent 6cda49f
commit 21316db
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 3 deletions.
diff --git a/Source/src/WixSharp.Samples/Wix# Samples/testpad/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/testpad/setup.cs
@@ -1,10 +1,13 @@
 //using Test1Library;
 using System;
 using System.Collections.Generic;
+using static System.Collections.Specialized.BitVector32;
 using System.Diagnostics;
 using static System.Net.Mime.MediaTypeNames;
 using System.Security.Cryptography;
+using System.Windows.Forms;
 using WixSharp;
+using WixSharp.CommonTasks;
 using WixToolset.Dtf.WindowsInstaller;
 
 class Constants
@@ -28,7 +31,43 @@ class Program
 
         static void Main()
         {
-            issue_1727();
+            issue_1739();
+        }
+
+        static void issue_1739()
+        {
+            void build(string version)
+            {
+                var project =
+                    new ManagedProject("My Product",
+                        new Dir(@"%ProgramFiles%\My Company\My Product",
+                            new File(
+                                @"D:\dev\wixsharp4\Source\src\WixSharp.Samples\Wix# Samples\testpad\setup.cs")));
+
+                project.GUID = new Guid("6f330b47-2577-43ad-9095-1361ba25889b");
+
+                project.UI = WUI.WixUI_ProgressOnly;
+                project.MajorUpgradeStrategy = MajorUpgradeStrategy.Default;
+
+                project.Version = new Version(version);
+
+                project.AfterInstall += (e) =>
+                {
+                    if (e.Session.MyIsUpgradingInstalledVersion())
+                    {
+                        var isUpgrading = e.Session.IsUpgradingInstalledVersion();
+                        MessageBox.Show(isUpgrading.ToString(), "");
+                    }
+                    // e.Result = ActionResult.Failure;
+                };
+
+                project.OutFileName = $"MyProduct.{project.Version}";
+                project.DefaultDeferredProperties += ";REMOVE;REINSTALL;Installed";
+
+                project.BuildMsi();
+            }
+            build("1.0.1");
+            build("1.0.2");
         }
 
         static void Main2()

diff --git a/Source/src/WixSharp/Extensions.cs b/Source/src/WixSharp/Extensions.cs
@@ -3152,7 +3152,14 @@ public static bool IsCancelledRaw(this Session session)
         /// <returns></returns>
         public static string QueryProperty(this Session session, string name)
         {
-            return (string)session.Database.ExecuteScalar($"SELECT `Value` FROM `Property` WHERE `Property` = '{name}'");
+            try
+            {
+                return (string)session.Database.ExecuteScalar($"SELECT `Value` FROM `Property` WHERE `Property` = '{name}'");
+            }
+            catch (Exception)
+            {
+                return session.Property(name); // in case the db is disposed already
+            }
         }
 
         /// <summary>

diff --git a/Source/src/WixSharp/ManagedProject/ManagedProject.cs b/Source/src/WixSharp/ManagedProject/ManagedProject.cs
@@ -376,7 +376,7 @@ public string DefaultDeferredProperties
             }
         }
 
-        string defaultDeferredProperties = "INSTALLDIR,UILevel,ProductName,FOUNDPREVIOUSVERSION,UpgradeCode,ManagedProjectElevatedEvents";
+        string defaultDeferredProperties = "INSTALLDIR,UILevel,ProductName,FOUNDPREVIOUSVERSION,UpgradeCode,ManagedProjectElevatedEvents;REMOVE;REINSTALL;Installed";
 
         /// <summary>
         /// Flags that indicates if <c>WixSharp_InitRuntime_Action</c> custom action should be