From 29eedea286efda066935c153c8a4ec0c7bd0c7fa Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 09:43:05 -0800
Subject: [PATCH] [release/7.0.4xx] Update WiX to latest release (#18602)

Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com>
---
 eng/Versions.props                       | 3 ++-
 src/finalizer_shim/finalizer_shim.csproj | 3 ++-
 src/redist/targets/GenerateMSIs.targets  | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 6b0a73c43..76e4258e3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,8 @@
     <SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <WixPackageVersion>1.0.0-v3.14.0.5722</WixPackageVersion>
+    <!-- This is the version of the zip archive for the WiX toolset and is different from the NuGet package version format. -->
+    <WixVersion>3.14.0.8606</WixVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- 7.0 Template versions -->
diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj
index ad9af2548..e6cd301f7 100644
--- a/src/finalizer_shim/finalizer_shim.csproj
+++ b/src/finalizer_shim/finalizer_shim.csproj
@@ -12,7 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Signed.Wix" Version="$(WixPackageVersion)" GeneratePathProperty="true" />
+    <!-- The MicrosoftSignedWixVersion property comes from the Arcade SDK DefaultVersions.props -->
+    <PackageReference Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" GeneratePathProperty="true" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index 1f8682d3a..3e7be6bec 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -11,7 +11,6 @@
   <Target Name="SetupWixProperties" DependsOnTargets="GetCurrentRuntimeInformation">
     <!-- AcquireWix Properties -->
     <PropertyGroup>
-      <WixVersion>$(WixPackageVersion)</WixVersion>
       <WixDownloadUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip</WixDownloadUrl>
       <WixRoot>$(ArtifactsDir)Tools/WixTools/$(WixVersion)</WixRoot>
       <WixDestinationPath>$(WixRoot)/WixTools.$(WixVersion).zip</WixDestinationPath>