From 4b381c0e5080109b7a219258ad91d89a00dc225b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 9 May 2026 14:20:19 +0000
Subject: [PATCH 01/17] Upgrade WiX package integration to WixToolset.Sdk 4.0.6

Agent-Logs-Url: https://github.com/Waffle/waffle/sessions/3cb268b0-9ab6-43b6-9c75-fac2bd82780b

Co-authored-by: hazendaz <975267+hazendaz@users.noreply.github.com>
---
 Docs/SettingUpDevelopmentEnvironment.md                | 10 +++++-----
 .../WindowsAuthProviderMergeModule.wixproj             |  5 ++---
 Source/WindowsAuthProviderMergeModule/packages.config  |  2 +-
 bootstrap.cmd                                          |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Docs/SettingUpDevelopmentEnvironment.md b/Docs/SettingUpDevelopmentEnvironment.md
index 0e3fc45b58..3484dd117f 100644
--- a/Docs/SettingUpDevelopmentEnvironment.md
+++ b/Docs/SettingUpDevelopmentEnvironment.md
@@ -49,9 +49,9 @@ Download NUnit from [here](https://nunit.org).
 
 Download and install MSBuild Community Tasks from [here](https://github.com/loresoft/msbuildtasks/releases).
 
-### Wix Toolset 3.10.3
+### Wix Toolset (4.0.6)
 
-Download and install the Wix toolset from [here](https://wix.codeplex.com/releases/view/624906).
+WiX is restored as a NuGet package by running `bootstrap.cmd` (or `build.cmd` which calls bootstrap).
 
 Building the Project the First Time
 -----------------------------------
@@ -123,12 +123,12 @@ MSBuild Community Tasks are missing.
 ```
 "E:\waffle\Waffle.proj" (all target) (1) ->
 "E:\waffle\Waffle.sln" (Clean target) (2) ->
-(Clean target) ->  E:\waffle\Source\WindowsAuthProviderMergeModule\WindowsAuthProviderMergeModule.wixproj(107,11):
-error MSB4019: The imported project "C:\Program Files\MSBuild\Microsoft\WiX\v3.x\Wix.targets" was not found.
+(Clean target) ->  E:\waffle\Source\WindowsAuthProviderMergeModule\WindowsAuthProviderMergeModule.wixproj(3,3):
+error MSB4019: The imported project "..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.props" was not found.
 Confirm that the path in the <Import> declaration is correct, and that the file exists on disk.
 ```
 
-Wix is missing.
+WiX package restore is missing. Re-run `bootstrap.cmd`.
 
 ### Product Version
 
diff --git a/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj b/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj
index e3a692be09..d597de0b57 100644
--- a/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj
+++ b/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="..\..\.nuget\packages\WiX.4.0.0.5512-pre\build\wix.props" Condition="Exists('..\..\.nuget\packages\WiX.4.0.0.5512-pre\build\wix.props')" />
+  <Import Project="..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.props" Condition="Exists('..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <ProductVersion>3.0</ProductVersion>
@@ -8,7 +8,6 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>Waffle.Windows.AuthProvider</OutputName>
     <OutputType>Module</OutputType>
-    <WixToolPath>..\..\.nuget\packages\WiX.4.0.0.5512-pre\tools</WixToolPath>
     <RunWixToolsOutOfProc>true</RunWixToolsOutOfProc>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -115,7 +114,7 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\.nuget\packages\WiX.4.0.0.5512-pre\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\.nuget\packages\WiX.4.0.0.5512-pre\build\wix.props'))" />
+    <Error Condition="!Exists('..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.props'))" />
   </Target>
   <!--
     To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Source/WindowsAuthProviderMergeModule/packages.config b/Source/WindowsAuthProviderMergeModule/packages.config
index 3944f00667..964cc956f4 100644
--- a/Source/WindowsAuthProviderMergeModule/packages.config
+++ b/Source/WindowsAuthProviderMergeModule/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="WiX" version="4.0.0.4506-pre" />
+  <package id="WixToolset.Sdk" version="4.0.6" />
 </packages>
diff --git a/bootstrap.cmd b/bootstrap.cmd
index 1be738cff3..aa5269f205 100644
--- a/bootstrap.cmd
+++ b/bootstrap.cmd
@@ -3,4 +3,4 @@ Rmdir .nuget\packages\ /s /q
 NuGet.exe install MSBuildTasks        -OutputDirectory .nuget\packages\ -NonInteractive -Version 1.5.0.235
 NuGet.exe install NUnit               -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.14.0
 NuGet.exe install NUnit.ConsoleRunner -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.17.0
-NuGet.exe install WiX                 -OutputDirectory .nuget\packages\ -NonInteractive -Version 4.0.0.5512-pre -Pre
+NuGet.exe install WixToolset.Sdk      -OutputDirectory .nuget\packages\ -NonInteractive -Version 4.0.6

From 18aa4392b049bdd89cccdd0775a24ee829a98106 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 9 May 2026 14:28:57 +0000
Subject: [PATCH 02/17] Fix WiX SDK restore in bootstrap for MSBuildSdk package
 type

Agent-Logs-Url: https://github.com/Waffle/waffle/sessions/b03b7b10-d65b-4b4a-9ba5-d9c34aefe756

Co-authored-by: hazendaz <975267+hazendaz@users.noreply.github.com>
---
 bootstrap.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.cmd b/bootstrap.cmd
index aa5269f205..e9fdcc6ca9 100644
--- a/bootstrap.cmd
+++ b/bootstrap.cmd
@@ -3,4 +3,4 @@ Rmdir .nuget\packages\ /s /q
 NuGet.exe install MSBuildTasks        -OutputDirectory .nuget\packages\ -NonInteractive -Version 1.5.0.235
 NuGet.exe install NUnit               -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.14.0
 NuGet.exe install NUnit.ConsoleRunner -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.17.0
-NuGet.exe install WixToolset.Sdk      -OutputDirectory .nuget\packages\ -NonInteractive -Version 4.0.6
+powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/wixtoolset.sdk/' + $pkgVersion + '/wixtoolset.sdk.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; Remove-Item -Path $pkgFile -Force"

From 5b07fc4b3b1e95dd52760f74541092e066f5a722 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 9 May 2026 14:29:31 +0000
Subject: [PATCH 03/17] Reduce duplication in WixToolset.Sdk bootstrap download
 URL

Agent-Logs-Url: https://github.com/Waffle/waffle/sessions/b03b7b10-d65b-4b4a-9ba5-d9c34aefe756

Co-authored-by: hazendaz <975267+hazendaz@users.noreply.github.com>
---
 bootstrap.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.cmd b/bootstrap.cmd
index e9fdcc6ca9..4c3aa3019e 100644
--- a/bootstrap.cmd
+++ b/bootstrap.cmd
@@ -3,4 +3,4 @@ Rmdir .nuget\packages\ /s /q
 NuGet.exe install MSBuildTasks        -OutputDirectory .nuget\packages\ -NonInteractive -Version 1.5.0.235
 NuGet.exe install NUnit               -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.14.0
 NuGet.exe install NUnit.ConsoleRunner -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.17.0
-powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/wixtoolset.sdk/' + $pkgVersion + '/wixtoolset.sdk.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; Remove-Item -Path $pkgFile -Force"
+powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; Remove-Item -Path $pkgFile -Force"

From 6847e3bc486149abfad24e29ef7e7ceeca212535 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 9 May 2026 15:36:24 +0000
Subject: [PATCH 04/17] Patch wix.props NormalizePath for older MSBuild
 compatibility

Agent-Logs-Url: https://github.com/Waffle/waffle/sessions/6d462113-5bce-4e42-8bc8-275fee92bc47

Co-authored-by: hazendaz <975267+hazendaz@users.noreply.github.com>
---
 bootstrap.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.cmd b/bootstrap.cmd
index 4c3aa3019e..b2481fc981 100644
--- a/bootstrap.cmd
+++ b/bootstrap.cmd
@@ -3,4 +3,4 @@ Rmdir .nuget\packages\ /s /q
 NuGet.exe install MSBuildTasks        -OutputDirectory .nuget\packages\ -NonInteractive -Version 1.5.0.235
 NuGet.exe install NUnit               -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.14.0
 NuGet.exe install NUnit.ConsoleRunner -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.17.0
-powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; Remove-Item -Path $pkgFile -Force"
+powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; (Get-Content -Raw $wixPropsFile).Replace('$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))', '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))') | Set-Content -NoNewline $wixPropsFile; Remove-Item -Path $pkgFile -Force"

From 4f0a68d2b2046af4992183a73303199e93a80857 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 9 May 2026 15:36:51 +0000
Subject: [PATCH 05/17] Harden WiX props patch ordering in bootstrap script

Agent-Logs-Url: https://github.com/Waffle/waffle/sessions/6d462113-5bce-4e42-8bc8-275fee92bc47

Co-authored-by: hazendaz <975267+hazendaz@users.noreply.github.com>
---
 bootstrap.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.cmd b/bootstrap.cmd
index b2481fc981..2fcd61048f 100644
--- a/bootstrap.cmd
+++ b/bootstrap.cmd
@@ -3,4 +3,4 @@ Rmdir .nuget\packages\ /s /q
 NuGet.exe install MSBuildTasks        -OutputDirectory .nuget\packages\ -NonInteractive -Version 1.5.0.235
 NuGet.exe install NUnit               -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.14.0
 NuGet.exe install NUnit.ConsoleRunner -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.17.0
-powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; (Get-Content -Raw $wixPropsFile).Replace('$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))', '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))') | Set-Content -NoNewline $wixPropsFile; Remove-Item -Path $pkgFile -Force"
+powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; (Get-Content -Raw $wixPropsFile).Replace('$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))', '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))') | Set-Content -NoNewline $wixPropsFile; Remove-Item -Path $pkgFile -Force"

From ca511695077f467fbe94ded2da0bb52cace4e2ec Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 9 May 2026 15:43:39 +0000
Subject: [PATCH 06/17] Fix empty WixTargetsPath import causing MSB4102

Agent-Logs-Url: https://github.com/Waffle/waffle/sessions/ffe2fce9-4935-4a5f-a2ca-c3bd56f2eb54

Co-authored-by: hazendaz <975267+hazendaz@users.noreply.github.com>
---
 .../WindowsAuthProviderMergeModule.wixproj                    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj b/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj
index d597de0b57..2e9f1dfe52 100644
--- a/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj
+++ b/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj
@@ -9,6 +9,7 @@
     <OutputName>Waffle.Windows.AuthProvider</OutputName>
     <OutputType>Module</OutputType>
     <RunWixToolsOutOfProc>true</RunWixToolsOutOfProc>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.targets</WixTargetsPath>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -109,12 +110,13 @@
   <ItemGroup>
     <Content Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(WixTargetsPath)" />
+  <Import Project="$(WixTargetsPath)" Condition="Exists('$(WixTargetsPath)')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.props'))" />
+    <Error Condition="!Exists('..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.targets'))" />
   </Target>
   <!--
     To modify your build process, add your task inside one of the targets below and uncomment it.

From e1ba96983a20bfb5475e594cd195f509421aa49e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 16:07:33 +0000
Subject: [PATCH 07/17] Fix WiX targets NormalizeDirectory compatibility patch
 in bootstrap

Agent-Logs-Url: https://github.com/Waffle/waffle/sessions/9f4d0ffd-dc09-4521-b42c-da98fd4a636e

Co-authored-by: hazendaz <975267+hazendaz@users.noreply.github.com>
---
 bootstrap.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.cmd b/bootstrap.cmd
index 2fcd61048f..ede2c5a4f3 100644
--- a/bootstrap.cmd
+++ b/bootstrap.cmd
@@ -3,4 +3,4 @@ Rmdir .nuget\packages\ /s /q
 NuGet.exe install MSBuildTasks        -OutputDirectory .nuget\packages\ -NonInteractive -Version 1.5.0.235
 NuGet.exe install NUnit               -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.14.0
 NuGet.exe install NUnit.ConsoleRunner -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.17.0
-powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; (Get-Content -Raw $wixPropsFile).Replace('$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))', '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))') | Set-Content -NoNewline $wixPropsFile; Remove-Item -Path $pkgFile -Force"
+powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixNormalizePathOld = '$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))'; $wixNormalizePathNew = '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))'; $wixNormalizeDirectoryOld = '$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))'; $wixNormalizeDirectoryNew = '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir)))))'; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; (Get-Content -Raw $wixPropsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixPropsFile; $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; (Get-Content -Raw $wixTargetsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixTargetsFile; Remove-Item -Path $pkgFile -Force"

From 6d8a679a057bfa35229f1875cfd4ad6be0bd0f91 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 16:09:21 +0000
Subject: [PATCH 08/17] Preserve trailing slash in NormalizeDirectory
 compatibility replacement

Agent-Logs-Url: https://github.com/Waffle/waffle/sessions/9f4d0ffd-dc09-4521-b42c-da98fd4a636e

Co-authored-by: hazendaz <975267+hazendaz@users.noreply.github.com>
---
 bootstrap.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.cmd b/bootstrap.cmd
index ede2c5a4f3..2bb91407fb 100644
--- a/bootstrap.cmd
+++ b/bootstrap.cmd
@@ -3,4 +3,4 @@ Rmdir .nuget\packages\ /s /q
 NuGet.exe install MSBuildTasks        -OutputDirectory .nuget\packages\ -NonInteractive -Version 1.5.0.235
 NuGet.exe install NUnit               -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.14.0
 NuGet.exe install NUnit.ConsoleRunner -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.17.0
-powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixNormalizePathOld = '$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))'; $wixNormalizePathNew = '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))'; $wixNormalizeDirectoryOld = '$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))'; $wixNormalizeDirectoryNew = '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir)))))'; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; (Get-Content -Raw $wixPropsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixPropsFile; $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; (Get-Content -Raw $wixTargetsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixTargetsFile; Remove-Item -Path $pkgFile -Force"
+powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixNormalizePathOld = '$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))'; $wixNormalizePathNew = '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))'; $wixNormalizeDirectoryOld = '$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))'; $wixNormalizeDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))'; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; (Get-Content -Raw $wixPropsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixPropsFile; $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; (Get-Content -Raw $wixTargetsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixTargetsFile; Remove-Item -Path $pkgFile -Force"

From 8b15f8bb59b6d4c1031966e15c4e559746dbf24f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 16:19:01 +0000
Subject: [PATCH 09/17] Fix WiX build task dependency loading for legacy
 MSBuild in DotNET CI

Agent-Logs-Url: https://github.com/Waffle/waffle/sessions/58352073-503c-4be1-9977-55acfc44999b

Co-authored-by: hazendaz <975267+hazendaz@users.noreply.github.com>
---
 bootstrap.cmd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bootstrap.cmd b/bootstrap.cmd
index 2bb91407fb..f8d1f6040d 100644
--- a/bootstrap.cmd
+++ b/bootstrap.cmd
@@ -3,4 +3,5 @@ Rmdir .nuget\packages\ /s /q
 NuGet.exe install MSBuildTasks        -OutputDirectory .nuget\packages\ -NonInteractive -Version 1.5.0.235
 NuGet.exe install NUnit               -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.14.0
 NuGet.exe install NUnit.ConsoleRunner -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.17.0
-powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixNormalizePathOld = '$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))'; $wixNormalizePathNew = '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))'; $wixNormalizeDirectoryOld = '$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))'; $wixNormalizeDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))'; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; (Get-Content -Raw $wixPropsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixPropsFile; $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; (Get-Content -Raw $wixTargetsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixTargetsFile; Remove-Item -Path $pkgFile -Force"
+NuGet.exe install Microsoft.Build      -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
+powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixNormalizePathOld = '$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))'; $wixNormalizePathNew = '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))'; $wixNormalizeDirectoryOld = '$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))'; $wixNormalizeDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))'; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; (Get-Content -Raw $wixPropsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixPropsFile; $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; (Get-Content -Raw $wixTargetsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixTargetsFile; $wixBuildTaskDir = Join-Path $pkgFolder 'tools\net472'; Copy-Item '.nuget\packages\Microsoft.Build.14.3.0\lib\net45\Microsoft.Build.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Tasks.Core.14.3.0\lib\net45\Microsoft.Build.Tasks.Core.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Utilities.Core.14.3.0\lib\net45\Microsoft.Build.Utilities.Core.dll' $wixBuildTaskDir -Force; Remove-Item -Path $pkgFile -Force"

From 24065c0752fc4174f030d2d392a1ce239bc8c0c5 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 16:19:41 +0000
Subject: [PATCH 10/17] Install explicit MSBuild dependency packages for WiX
 task assembly copy

Agent-Logs-Url: https://github.com/Waffle/waffle/sessions/58352073-503c-4be1-9977-55acfc44999b

Co-authored-by: hazendaz <975267+hazendaz@users.noreply.github.com>
---
 bootstrap.cmd | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bootstrap.cmd b/bootstrap.cmd
index f8d1f6040d..be5b71185a 100644
--- a/bootstrap.cmd
+++ b/bootstrap.cmd
@@ -4,4 +4,7 @@ NuGet.exe install MSBuildTasks        -OutputDirectory .nuget\packages\ -NonInte
 NuGet.exe install NUnit               -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.14.0
 NuGet.exe install NUnit.ConsoleRunner -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.17.0
 NuGet.exe install Microsoft.Build      -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
+NuGet.exe install Microsoft.Build.Framework      -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
+NuGet.exe install Microsoft.Build.Tasks.Core     -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
+NuGet.exe install Microsoft.Build.Utilities.Core -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
 powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixNormalizePathOld = '$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))'; $wixNormalizePathNew = '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))'; $wixNormalizeDirectoryOld = '$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))'; $wixNormalizeDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))'; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; (Get-Content -Raw $wixPropsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixPropsFile; $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; (Get-Content -Raw $wixTargetsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixTargetsFile; $wixBuildTaskDir = Join-Path $pkgFolder 'tools\net472'; Copy-Item '.nuget\packages\Microsoft.Build.14.3.0\lib\net45\Microsoft.Build.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Tasks.Core.14.3.0\lib\net45\Microsoft.Build.Tasks.Core.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Utilities.Core.14.3.0\lib\net45\Microsoft.Build.Utilities.Core.dll' $wixBuildTaskDir -Force; Remove-Item -Path $pkgFile -Force"

From e96b71df5b2900ecf230bd9cc7ea661c660dc330 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 16 May 2026 16:20:02 +0000
Subject: [PATCH 11/17] Normalize NuGet install command formatting in bootstrap

Agent-Logs-Url: https://github.com/Waffle/waffle/sessions/58352073-503c-4be1-9977-55acfc44999b

Co-authored-by: hazendaz <975267+hazendaz@users.noreply.github.com>
---
 bootstrap.cmd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootstrap.cmd b/bootstrap.cmd
index be5b71185a..bc297d65b8 100644
--- a/bootstrap.cmd
+++ b/bootstrap.cmd
@@ -3,8 +3,8 @@ Rmdir .nuget\packages\ /s /q
 NuGet.exe install MSBuildTasks        -OutputDirectory .nuget\packages\ -NonInteractive -Version 1.5.0.235
 NuGet.exe install NUnit               -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.14.0
 NuGet.exe install NUnit.ConsoleRunner -OutputDirectory .nuget\packages\ -NonInteractive -Version 3.17.0
-NuGet.exe install Microsoft.Build      -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
-NuGet.exe install Microsoft.Build.Framework      -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
-NuGet.exe install Microsoft.Build.Tasks.Core     -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
+NuGet.exe install Microsoft.Build -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
+NuGet.exe install Microsoft.Build.Framework -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
+NuGet.exe install Microsoft.Build.Tasks.Core -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
 NuGet.exe install Microsoft.Build.Utilities.Core -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
 powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixNormalizePathOld = '$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))'; $wixNormalizePathNew = '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))'; $wixNormalizeDirectoryOld = '$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))'; $wixNormalizeDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))'; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; (Get-Content -Raw $wixPropsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixPropsFile; $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; (Get-Content -Raw $wixTargetsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixTargetsFile; $wixBuildTaskDir = Join-Path $pkgFolder 'tools\net472'; Copy-Item '.nuget\packages\Microsoft.Build.14.3.0\lib\net45\Microsoft.Build.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Tasks.Core.14.3.0\lib\net45\Microsoft.Build.Tasks.Core.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Utilities.Core.14.3.0\lib\net45\Microsoft.Build.Utilities.Core.dll' $wixBuildTaskDir -Force; Remove-Item -Path $pkgFile -Force"

From 5f57ebab2e7ebe3b020412bc6953f844efe8c529 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 24 May 2026 19:32:00 +0000
Subject: [PATCH 12/17] Add MSBuild 4 compatibility target for WiX project
 references

Agent-Logs-Url: https://github.com/Waffle/waffle/sessions/fc62bcf7-646e-4549-96d4-e31baf24a1a1

Co-authored-by: hazendaz <975267+hazendaz@users.noreply.github.com>
---
 .../WindowsAuthProviderMergeModule.wixproj                       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj b/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj
index 2e9f1dfe52..503386780a 100644
--- a/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj
+++ b/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj
@@ -111,6 +111,7 @@
     <Content Include="packages.config" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition="Exists('$(WixTargetsPath)')" />
+  <Target Name="FindInvalidProjectReferences" Condition="'$(MSBuildToolsVersion)' == '4.0'" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

From 2455110b3f4bbdb9d06b3188f21fb45e032af74b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 31 May 2026 15:53:39 +0000
Subject: [PATCH 13/17] Fix WiX v4 module metadata for merge module build

---
 .../WindowsAuthProviderMergeModule.wxs                         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wxs b/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wxs
index 943b4d5f37..6cf2180eb3 100644
--- a/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wxs
+++ b/Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wxs
@@ -8,8 +8,7 @@
  <?endif ?>
 <?endif ?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Module Id="WindowsAuthProviderMSM" Language="1033" Version="$(var.ProductVersion)">
-        <Package Id="80101f8b-1c44-4c7d-969b-0731b162d54b" Manufacturer="$(var.CompanyName)" InstallerVersion="200" />
+    <Module Id="WindowsAuthProviderMSM" Guid="80101f8b-1c44-4c7d-969b-0731b162d54b" Language="1033" Version="$(var.ProductVersion)">
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="MergeRedirectFolder">
                 <Component Id="WindowsAuthProvider" Guid="74ad70ef-aa1a-4d8f-a31c-dda1716b7dd1">

From 605ed23cab2a5d6f2c39d93c6be99e981f56416c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 31 May 2026 16:38:19 +0000
Subject: [PATCH 14/17] Patch remaining WiX NormalizeDirectory rewrites

---
 bootstrap.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.cmd b/bootstrap.cmd
index bc297d65b8..5ab04abe1c 100644
--- a/bootstrap.cmd
+++ b/bootstrap.cmd
@@ -7,4 +7,4 @@ NuGet.exe install Microsoft.Build -OutputDirectory .nuget\packages\ -NonInteract
 NuGet.exe install Microsoft.Build.Framework -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
 NuGet.exe install Microsoft.Build.Tasks.Core -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
 NuGet.exe install Microsoft.Build.Utilities.Core -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
-powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixNormalizePathOld = '$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))'; $wixNormalizePathNew = '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))'; $wixNormalizeDirectoryOld = '$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))'; $wixNormalizeDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))'; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; (Get-Content -Raw $wixPropsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixPropsFile; $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; (Get-Content -Raw $wixTargetsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizeDirectoryOld, $wixNormalizeDirectoryNew) | Set-Content -NoNewline $wixTargetsFile; $wixBuildTaskDir = Join-Path $pkgFolder 'tools\net472'; Copy-Item '.nuget\packages\Microsoft.Build.14.3.0\lib\net45\Microsoft.Build.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Tasks.Core.14.3.0\lib\net45\Microsoft.Build.Tasks.Core.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Utilities.Core.14.3.0\lib\net45\Microsoft.Build.Utilities.Core.dll' $wixBuildTaskDir -Force; Remove-Item -Path $pkgFile -Force"
+powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixNormalizePathOld = '$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))'; $wixNormalizePathNew = '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))'; $wixNormalizePdbDirectoryOld = '$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))'; $wixNormalizePdbDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))'; $wixNormalizeCabinetDirectoryOld = '$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %(CultureGroup.OutputFolder)))'; $wixNormalizeCabinetDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(CabinetCachePath), %(CultureGroup.OutputFolder))))), ''\''))'; $wixNormalizeIntermediateDirectoryOld = '$([MSBuild]::NormalizeDirectory($(IntermediateOutputPath)))'; $wixNormalizeIntermediateDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($(IntermediateOutputPath))), ''\''))'; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; (Get-Content -Raw $wixPropsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizePdbDirectoryOld, $wixNormalizePdbDirectoryNew) | Set-Content -NoNewline $wixPropsFile; $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; (Get-Content -Raw $wixTargetsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizePdbDirectoryOld, $wixNormalizePdbDirectoryNew).Replace($wixNormalizeCabinetDirectoryOld, $wixNormalizeCabinetDirectoryNew).Replace($wixNormalizeIntermediateDirectoryOld, $wixNormalizeIntermediateDirectoryNew) | Set-Content -NoNewline $wixTargetsFile; $wixBuildTaskDir = Join-Path $pkgFolder 'tools\net472'; Copy-Item '.nuget\packages\Microsoft.Build.14.3.0\lib\net45\Microsoft.Build.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Tasks.Core.14.3.0\lib\net45\Microsoft.Build.Tasks.Core.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Utilities.Core.14.3.0\lib\net45\Microsoft.Build.Utilities.Core.dll' $wixBuildTaskDir -Force; Remove-Item -Path $pkgFile -Force"

From 0ebf41559c59155996e208cadb5c83f213d3417f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 31 May 2026 16:52:38 +0000
Subject: [PATCH 15/17] Fix PowerShell Replace overload in bootstrap WiX
 patching

---
 bootstrap.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.cmd b/bootstrap.cmd
index 5ab04abe1c..de7f6d5de2 100644
--- a/bootstrap.cmd
+++ b/bootstrap.cmd
@@ -7,4 +7,4 @@ NuGet.exe install Microsoft.Build -OutputDirectory .nuget\packages\ -NonInteract
 NuGet.exe install Microsoft.Build.Framework -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
 NuGet.exe install Microsoft.Build.Tasks.Core -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
 NuGet.exe install Microsoft.Build.Utilities.Core -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
-powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixNormalizePathOld = '$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))'; $wixNormalizePathNew = '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))'; $wixNormalizePdbDirectoryOld = '$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))'; $wixNormalizePdbDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))'; $wixNormalizeCabinetDirectoryOld = '$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %(CultureGroup.OutputFolder)))'; $wixNormalizeCabinetDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(CabinetCachePath), %(CultureGroup.OutputFolder))))), ''\''))'; $wixNormalizeIntermediateDirectoryOld = '$([MSBuild]::NormalizeDirectory($(IntermediateOutputPath)))'; $wixNormalizeIntermediateDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($(IntermediateOutputPath))), ''\''))'; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; (Get-Content -Raw $wixPropsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizePdbDirectoryOld, $wixNormalizePdbDirectoryNew) | Set-Content -NoNewline $wixPropsFile; $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; (Get-Content -Raw $wixTargetsFile).Replace($wixNormalizePathOld, $wixNormalizePathNew).Replace($wixNormalizePdbDirectoryOld, $wixNormalizePdbDirectoryNew).Replace($wixNormalizeCabinetDirectoryOld, $wixNormalizeCabinetDirectoryNew).Replace($wixNormalizeIntermediateDirectoryOld, $wixNormalizeIntermediateDirectoryNew) | Set-Content -NoNewline $wixTargetsFile; $wixBuildTaskDir = Join-Path $pkgFolder 'tools\net472'; Copy-Item '.nuget\packages\Microsoft.Build.14.3.0\lib\net45\Microsoft.Build.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Tasks.Core.14.3.0\lib\net45\Microsoft.Build.Tasks.Core.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Utilities.Core.14.3.0\lib\net45\Microsoft.Build.Utilities.Core.dll' $wixBuildTaskDir -Force; Remove-Item -Path $pkgFile -Force"
+powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixNormalizePathOld = '$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))'; $wixNormalizePathNew = '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))'; $wixNormalizePdbDirectoryOld = '$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))'; $wixNormalizePdbDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))'; $wixNormalizeCabinetDirectoryOld = '$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %(CultureGroup.OutputFolder)))'; $wixNormalizeCabinetDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(CabinetCachePath), %(CultureGroup.OutputFolder))))), ''\''))'; $wixNormalizeIntermediateDirectoryOld = '$([MSBuild]::NormalizeDirectory($(IntermediateOutputPath)))'; $wixNormalizeIntermediateDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($(IntermediateOutputPath))), ''\''))'; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; (Get-Content -Raw $wixPropsFile).Replace([string]$wixNormalizePathOld, [string]$wixNormalizePathNew).Replace([string]$wixNormalizePdbDirectoryOld, [string]$wixNormalizePdbDirectoryNew) | Set-Content -NoNewline $wixPropsFile; $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; (Get-Content -Raw $wixTargetsFile).Replace([string]$wixNormalizePathOld, [string]$wixNormalizePathNew).Replace([string]$wixNormalizePdbDirectoryOld, [string]$wixNormalizePdbDirectoryNew).Replace([string]$wixNormalizeCabinetDirectoryOld, [string]$wixNormalizeCabinetDirectoryNew).Replace([string]$wixNormalizeIntermediateDirectoryOld, [string]$wixNormalizeIntermediateDirectoryNew) | Set-Content -NoNewline $wixTargetsFile; $wixBuildTaskDir = Join-Path $pkgFolder 'tools\net472'; Copy-Item '.nuget\packages\Microsoft.Build.14.3.0\lib\net45\Microsoft.Build.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Tasks.Core.14.3.0\lib\net45\Microsoft.Build.Tasks.Core.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Utilities.Core.14.3.0\lib\net45\Microsoft.Build.Utilities.Core.dll' $wixBuildTaskDir -Force; Remove-Item -Path $pkgFile -Force"

From b9e92852ca99cbc8d95657b6e74edb59db6dc483 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 31 May 2026 17:01:22 +0000
Subject: [PATCH 16/17] Rewrite WiX patch replacements to use literals in
 bootstrap

---
 bootstrap.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.cmd b/bootstrap.cmd
index de7f6d5de2..cc7951e01d 100644
--- a/bootstrap.cmd
+++ b/bootstrap.cmd
@@ -7,4 +7,4 @@ NuGet.exe install Microsoft.Build -OutputDirectory .nuget\packages\ -NonInteract
 NuGet.exe install Microsoft.Build.Framework -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
 NuGet.exe install Microsoft.Build.Tasks.Core -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
 NuGet.exe install Microsoft.Build.Utilities.Core -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
-powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixNormalizePathOld = '$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))'; $wixNormalizePathNew = '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))'; $wixNormalizePdbDirectoryOld = '$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))'; $wixNormalizePdbDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))'; $wixNormalizeCabinetDirectoryOld = '$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %(CultureGroup.OutputFolder)))'; $wixNormalizeCabinetDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(CabinetCachePath), %(CultureGroup.OutputFolder))))), ''\''))'; $wixNormalizeIntermediateDirectoryOld = '$([MSBuild]::NormalizeDirectory($(IntermediateOutputPath)))'; $wixNormalizeIntermediateDirectoryNew = '$([System.String]::Concat($([System.IO.Path]::GetFullPath($(IntermediateOutputPath))), ''\''))'; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; (Get-Content -Raw $wixPropsFile).Replace([string]$wixNormalizePathOld, [string]$wixNormalizePathNew).Replace([string]$wixNormalizePdbDirectoryOld, [string]$wixNormalizePdbDirectoryNew) | Set-Content -NoNewline $wixPropsFile; $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; (Get-Content -Raw $wixTargetsFile).Replace([string]$wixNormalizePathOld, [string]$wixNormalizePathNew).Replace([string]$wixNormalizePdbDirectoryOld, [string]$wixNormalizePdbDirectoryNew).Replace([string]$wixNormalizeCabinetDirectoryOld, [string]$wixNormalizeCabinetDirectoryNew).Replace([string]$wixNormalizeIntermediateDirectoryOld, [string]$wixNormalizeIntermediateDirectoryNew) | Set-Content -NoNewline $wixTargetsFile; $wixBuildTaskDir = Join-Path $pkgFolder 'tools\net472'; Copy-Item '.nuget\packages\Microsoft.Build.14.3.0\lib\net45\Microsoft.Build.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Tasks.Core.14.3.0\lib\net45\Microsoft.Build.Tasks.Core.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Utilities.Core.14.3.0\lib\net45\Microsoft.Build.Utilities.Core.dll' $wixBuildTaskDir -Force; Remove-Item -Path $pkgFile -Force"
+powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; $wixPropsContent = Get-Content -Raw $wixPropsFile; $wixPropsContent = $wixPropsContent.Replace('$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))', '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))').Replace('$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))'); Set-Content -NoNewline $wixPropsFile $wixPropsContent; $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; $wixTargetsContent = Get-Content -Raw $wixTargetsFile; $wixTargetsContent = $wixTargetsContent.Replace('$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))', '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))').Replace('$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))').Replace('$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %%(CultureGroup.OutputFolder)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(CabinetCachePath), %%(CultureGroup.OutputFolder))))), ''\''))').Replace('$([MSBuild]::NormalizeDirectory($(IntermediateOutputPath)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($(IntermediateOutputPath))), ''\''))'); Set-Content -NoNewline $wixTargetsFile $wixTargetsContent; $wixBuildTaskDir = Join-Path $pkgFolder 'tools\net472'; Copy-Item '.nuget\packages\Microsoft.Build.14.3.0\lib\net45\Microsoft.Build.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Tasks.Core.14.3.0\lib\net45\Microsoft.Build.Tasks.Core.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Utilities.Core.14.3.0\lib\net45\Microsoft.Build.Utilities.Core.dll' $wixBuildTaskDir -Force; Remove-Item -Path $pkgFile -Force"

From 0003e062e232f266568ff7017c6cc142f7b00844 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 31 May 2026 17:14:22 +0000
Subject: [PATCH 17/17] Fix bootstrap PowerShell write for Windows PowerShell
 compatibility

---
 bootstrap.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.cmd b/bootstrap.cmd
index cc7951e01d..1a858bbf3a 100644
--- a/bootstrap.cmd
+++ b/bootstrap.cmd
@@ -7,4 +7,4 @@ NuGet.exe install Microsoft.Build -OutputDirectory .nuget\packages\ -NonInteract
 NuGet.exe install Microsoft.Build.Framework -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
 NuGet.exe install Microsoft.Build.Tasks.Core -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
 NuGet.exe install Microsoft.Build.Utilities.Core -OutputDirectory .nuget\packages\ -NonInteractive -Version 14.3.0
-powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; $wixPropsContent = Get-Content -Raw $wixPropsFile; $wixPropsContent = $wixPropsContent.Replace('$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))', '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))').Replace('$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))'); Set-Content -NoNewline $wixPropsFile $wixPropsContent; $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; $wixTargetsContent = Get-Content -Raw $wixTargetsFile; $wixTargetsContent = $wixTargetsContent.Replace('$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))', '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))').Replace('$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))').Replace('$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %%(CultureGroup.OutputFolder)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(CabinetCachePath), %%(CultureGroup.OutputFolder))))), ''\''))').Replace('$([MSBuild]::NormalizeDirectory($(IntermediateOutputPath)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($(IntermediateOutputPath))), ''\''))'); Set-Content -NoNewline $wixTargetsFile $wixTargetsContent; $wixBuildTaskDir = Join-Path $pkgFolder 'tools\net472'; Copy-Item '.nuget\packages\Microsoft.Build.14.3.0\lib\net45\Microsoft.Build.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Tasks.Core.14.3.0\lib\net45\Microsoft.Build.Tasks.Core.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Utilities.Core.14.3.0\lib\net45\Microsoft.Build.Utilities.Core.dll' $wixBuildTaskDir -Force; Remove-Item -Path $pkgFile -Force"
+powershell -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference = 'Stop'; $pkgId = 'WixToolset.Sdk'; $pkgIdLower = $pkgId.ToLowerInvariant(); $pkgVersion = '4.0.6'; $pkgFolder = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion); $pkgFile = Join-Path '.nuget\packages' ($pkgId + '.' + $pkgVersion + '.nupkg'); Invoke-WebRequest -UseBasicParsing -Uri ('https://api.nuget.org/v3-flatcontainer/' + $pkgIdLower + '/' + $pkgVersion + '/' + $pkgIdLower + '.' + $pkgVersion + '.nupkg') -OutFile $pkgFile; Expand-Archive -Path $pkgFile -DestinationPath $pkgFolder -Force; $wixPropsFile = Join-Path $pkgFolder 'tools\wix.props'; $wixPropsContent = Get-Content -Raw $wixPropsFile; $wixPropsContent = $wixPropsContent.Replace('$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))', '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))').Replace('$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))'); [System.IO.File]::WriteAllText($wixPropsFile, $wixPropsContent); $wixTargetsFile = Join-Path $pkgFolder 'tools\wix.targets'; $wixTargetsContent = Get-Content -Raw $wixTargetsFile; $wixTargetsContent = $wixTargetsContent.Replace('$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile)))', '$([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(ProjectAssetsFile)))))').Replace('$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(PdbOutputDir))))), ''\''))').Replace('$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %%(CultureGroup.OutputFolder)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($([System.IO.Path]::Combine($(CabinetCachePath), %%(CultureGroup.OutputFolder))))), ''\''))').Replace('$([MSBuild]::NormalizeDirectory($(IntermediateOutputPath)))', '$([System.String]::Concat($([System.IO.Path]::GetFullPath($(IntermediateOutputPath))), ''\''))'); [System.IO.File]::WriteAllText($wixTargetsFile, $wixTargetsContent); $wixBuildTaskDir = Join-Path $pkgFolder 'tools\net472'; Copy-Item '.nuget\packages\Microsoft.Build.14.3.0\lib\net45\Microsoft.Build.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Tasks.Core.14.3.0\lib\net45\Microsoft.Build.Tasks.Core.dll' $wixBuildTaskDir -Force; Copy-Item '.nuget\packages\Microsoft.Build.Utilities.Core.14.3.0\lib\net45\Microsoft.Build.Utilities.Core.dll' $wixBuildTaskDir -Force; Remove-Item -Path $pkgFile -Force"