From f797dbfe395e3e339b05bcc6f375ee36a983fe3c Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 4 Mar 2026 21:12:51 -0800
Subject: [PATCH 1/2] Fix WiX v7 package dependencies

Fixes 9253
---
 .../Directory.Packages.props.pp               | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index 6c01a4da1..b18342507 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -3,11 +3,6 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
 
-  <!-- Pinned versions to address security vulnerabilities in transitive dependencies. Review as dependencies update. -->
-  <ItemGroup>
-    <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageVersion Include="WixToolset.Dtf.Compression" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.Dtf.Compression.Cab" Version="{packageversion}" />
@@ -52,31 +47,39 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
     <PackageVersion Include="System.DirectoryServices" Version="8.0.0" />
-    <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="8.0.1" />
+    <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="8.0.0" />
     <PackageVersion Include="System.Management" Version="8.0.0" />
+    <PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.6" />
+
     <PackageVersion Include="System.IO.Compression" Version="4.3.0" />
     <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
     <PackageVersion Include="System.Net.NetworkInformation" Version="4.3.0" />
-    <PackageVersion Include="System.Reflection.Metadata" Version="8.0.1" />
     <PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.6" />
-    <PackageVersion Include="System.Memory" Version="4.6.3" />
 
     <PackageVersion Include="Microsoft.AspNetCore.Owin" Version="8.0.21" />
     <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="3.14.2075" />
     <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
+
+    <!-- Pin System.Private.Uri address security vulnerabilities in transitive dependencies. Review as dependencies update. -->
+    <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
+
+    <!-- Use System.Memory v4.5.5 as it is compatible with VS2022 -->
+    <PackageVersion Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
 
+  <!-- NuGet stack -->
   <ItemGroup>
     <PackageVersion Include="NuGet.Credentials" Version="6.13.2" />
     <PackageVersion Include="NuGet.Protocol" Version="6.13.2" />
     <PackageVersion Include="NuGet.Versioning" Version="6.13.2" />
   </ItemGroup>
 
+  <!-- MSBuild (aligned with VS 17.13 toolset) -->
   <ItemGroup>
     <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.13.26" />
   </ItemGroup>

From f58fdfb8002e2a7c3be0b582467684331af33a37 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 4 Mar 2026 21:13:05 -0800
Subject: [PATCH 2/2] Fix typo

---
 src/wix/WixToolset.BuildTasks/ResolveWixReferences.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wix/WixToolset.BuildTasks/ResolveWixReferences.cs b/src/wix/WixToolset.BuildTasks/ResolveWixReferences.cs
index d11b03998..03547fd12 100644
--- a/src/wix/WixToolset.BuildTasks/ResolveWixReferences.cs
+++ b/src/wix/WixToolset.BuildTasks/ResolveWixReferences.cs
@@ -106,7 +106,7 @@ public override bool Execute()
         }
 
         /// <summary>
-        /// Resolves a single reference item by searcheing for referenced items using the specified SearchPaths.
+        /// Resolves a single reference item by searching for referenced items using the specified SearchPaths.
         /// This method is made public so the resolution logic can be reused by other tasks.
         /// </summary>
         /// <param name="reference">The referenced item.</param>