From 2b98ad3b7870c8b6caa9bd5da4d15db5e44d3a6c Mon Sep 17 00:00:00 2001
From: Malcolm Nixon <Malcolm.Nixon@hiarc.inc>
Date: Mon, 7 Sep 2026 15:04:06 -0400
Subject: [PATCH] Fix MSI version display bugs

- Add ARPDISPLAYVERSION property set to the full semver
  (MsiPackageVersion) so Windows Add/Remove Programs shows e.g.
  '0.1.0-beta.1' instead of the ICE24-stripped numeric-only
  ProductVersion ('0.1.0').
- Pass -p:Version=$(MsiPackageVersion) to the isolated nested
  'dotnet publish' Exec command in the wixproj so the exe embedded
  in the MSI is actually stamped with the release version instead
  of falling back to the csproj's hardcoded default (0.0.0).
- Expose MsiPackageVersion as a WiX preprocessor variable alongside
  ProductVersion via DefineConstants.

Verified locally: built the MSI with ProductVersion=0.1.0 and
MsiPackageVersion=0.1.0-beta.1, confirmed the embedded exe reports
ProductVersion 0.1.0-beta.1+<sha> and the MSI's ARPDISPLAYVERSION
property is 0.1.0-beta.1.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../DemaConsulting.AgentControl.Msi.wixproj              | 8 ++++++--
 src/DemaConsulting.AgentControl.Msi/Package.wxs          | 9 +++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/DemaConsulting.AgentControl.Msi/DemaConsulting.AgentControl.Msi.wixproj b/src/DemaConsulting.AgentControl.Msi/DemaConsulting.AgentControl.Msi.wixproj
index 5774af6..7bc00a3 100644
--- a/src/DemaConsulting.AgentControl.Msi/DemaConsulting.AgentControl.Msi.wixproj
+++ b/src/DemaConsulting.AgentControl.Msi/DemaConsulting.AgentControl.Msi.wixproj
@@ -22,7 +22,6 @@
     <SelfContained>true</SelfContained>
     <Platform>x64</Platform>
     <ProductVersion Condition="'$(ProductVersion)' == ''">0.0.0</ProductVersion>
-    <DefineConstants>ProductVersion=$(ProductVersion)</DefineConstants>
     <!-- Distributed installer file name: "AgentControl-{version}.msi" rather than the
          default project-name-derived "DemaConsulting.AgentControl.Msi.msi". MsiPackageVersion
          is deliberately a custom property name (not the well-known "Version"/"ProductVersion"
@@ -33,6 +32,11 @@
          command-line /property:TargetName=, keeps the rename scoped to this project only). -->
     <MsiPackageVersion Condition="'$(MsiPackageVersion)' == ''">$(ProductVersion)</MsiPackageVersion>
     <TargetName>AgentControl-$(MsiPackageVersion)</TargetName>
+    <!-- Exposes both versions to Package.wxs: ProductVersion (numeric-only, ICE24-safe) drives
+         the MSI's actual Package/@Version, while MsiPackageVersion (the full semver, including
+         any pre-release suffix like "-beta.1") drives the separate ARPDISPLAYVERSION property so
+         Add/Remove Programs shows the real release version rather than the ICE24-stripped one. -->
+    <DefineConstants>ProductVersion=$(ProductVersion);MsiPackageVersion=$(MsiPackageVersion)</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
@@ -107,7 +111,7 @@
          (an even count, which argv parsing resolves to one literal backslash plus a real,
          unescaped closing quote) so BaseIntermediateOutputPath/BaseOutputPath still end in a
          proper path separator for the SDK's own path concatenation. -->
-    <Exec Command="dotnet publish &quot;$(AgentControlProjectDir)DemaConsulting.AgentControl.csproj&quot; --configuration $(Configuration) --runtime win-x64 --self-contained true --output &quot;$(AgentControlPublishDir.TrimEnd('\'))&quot; -p:BaseIntermediateOutputPath=&quot;$(AgentControlIsolatedObj.TrimEnd('\'))\\&quot; -p:BaseOutputPath=&quot;$(AgentControlIsolatedBin.TrimEnd('\'))\\&quot; /nodeReuse:false" />
+    <Exec Command="dotnet publish &quot;$(AgentControlProjectDir)DemaConsulting.AgentControl.csproj&quot; --configuration $(Configuration) --runtime win-x64 --self-contained true --output &quot;$(AgentControlPublishDir.TrimEnd('\'))&quot; -p:BaseIntermediateOutputPath=&quot;$(AgentControlIsolatedObj.TrimEnd('\'))\\&quot; -p:BaseOutputPath=&quot;$(AgentControlIsolatedBin.TrimEnd('\'))\\&quot; -p:Version=$(MsiPackageVersion) /nodeReuse:false" />
   </Target>
 
   <!-- Note: the isolation mechanism above (dedicated obj/bin/publish folders plus
diff --git a/src/DemaConsulting.AgentControl.Msi/Package.wxs b/src/DemaConsulting.AgentControl.Msi/Package.wxs
index a354be9..ee57eb9 100644
--- a/src/DemaConsulting.AgentControl.Msi/Package.wxs
+++ b/src/DemaConsulting.AgentControl.Msi/Package.wxs
@@ -39,6 +39,15 @@
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of AgentControl is already installed." />
 
+    <!-- Windows Installer requires Package/@Version (ProductVersion) to be strictly numeric
+         "major.minor.build" (ICE24), so any semver pre-release suffix (e.g. "-beta.1") is
+         stripped before it reaches here (see build.yaml's "Compute MSI-safe ProductVersion"
+         step). ARPDISPLAYVERSION is the standard MSI property that overrides only the version
+         string shown in "Add or Remove Programs", independent of the numeric ProductVersion, so
+         users see the real release version (including any pre-release suffix) there instead of
+         the silently-stripped one. -->
+    <Property Id="ARPDISPLAYVERSION" Value="$(MsiPackageVersion)" />
+
     <!-- Embed all generated cabinets directly into the .msi so the installer is a single,
          self-contained file - without this, WiX's default splits the published payload into
          external cab1.cab/cab2.cab/... files that must be shipped alongside the .msi for