Skip to content

Upgrade merge-module WiX integration from pre-release WiX package to WixToolset.Sdk 4.0.6 #3314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 17 commits into
base: master
Choose a base branch
from
Draft

Upgrade merge-module WiX integration from pre-release WiX package to WixToolset.Sdk 4.0.6 #3314

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4b381c0
Upgrade WiX package integration to WixToolset.Sdk 4.0.6
Copilot May 9, 2026
18aa439
Fix WiX SDK restore in bootstrap for MSBuildSdk package type
Copilot May 9, 2026
5b07fc4
Reduce duplication in WixToolset.Sdk bootstrap download URL
Copilot May 9, 2026
6847e3b
Patch wix.props NormalizePath for older MSBuild compatibility
Copilot May 9, 2026
4f0a68d
Harden WiX props patch ordering in bootstrap script
Copilot May 9, 2026
ca51169
Fix empty WixTargetsPath import causing MSB4102
Copilot May 9, 2026
e1ba969
Fix WiX targets NormalizeDirectory compatibility patch in bootstrap
Copilot May 16, 2026
6d8a679
Preserve trailing slash in NormalizeDirectory compatibility replacement
Copilot May 16, 2026
8b15f8b
Fix WiX build task dependency loading for legacy MSBuild in DotNET CI
Copilot May 16, 2026
24065c0
Install explicit MSBuild dependency packages for WiX task assembly copy
Copilot May 16, 2026
e96b71d
Normalize NuGet install command formatting in bootstrap
Copilot May 16, 2026
5f57eba
Add MSBuild 4 compatibility target for WiX project references
Copilot May 24, 2026
2455110
Fix WiX v4 module metadata for merge module build
Copilot May 31, 2026
605ed23
Patch remaining WiX NormalizeDirectory rewrites
Copilot May 31, 2026
0ebf415
Fix PowerShell Replace overload in bootstrap WiX patching
Copilot May 31, 2026
b9e9285
Rewrite WiX patch replacements to use literals in bootstrap
Copilot May 31, 2026
0003e06
Fix bootstrap PowerShell write for Windows PowerShell compatibility
Copilot May 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Docs/SettingUpDevelopmentEnvironment.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----------------------------------
Expand Down Expand Up @@ -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

Expand Down
5 changes: 2 additions & 3 deletions Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<?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>
<ProjectGuid>{8e2e9431-3fd1-41e9-97cf-cc96dd32386f}</ProjectGuid>
<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>
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Source/WindowsAuthProviderMergeModule/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion bootstrap.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading