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

[Copilot]

The Windows merge module build was pinned to a transitional pre-release WiX package layout (WiX.4.0.0.5512-pre), which no longer matches current WiX packaging expectations. This update moves the repository to stable WiX 4.0.6 package wiring while preserving the existing MSBuild-based build flow.

• WiX package source and version

  • bootstrap.cmd now restores WixToolset.Sdk 4.0.6 instead of the deprecated pre-release WiX package.

• Merge-module project import path alignment

  • Source/WindowsAuthProviderMergeModule/WindowsAuthProviderMergeModule.wixproj now imports WiX props from the 4.0.6 SDK package path.
  • Removed the legacy WixToolPath override tied to the old package structure.
  • Updated the missing-package guard to check the new SDK path.

• Package metadata update

  • Source/WindowsAuthProviderMergeModule/packages.config now references:
    • WixToolset.Sdk 4.0.6

• Developer setup docs

  • Docs/SettingUpDevelopmentEnvironment.md now describes WiX as NuGet-restored tooling and updates troubleshooting text to the new missing-import path.

<!-- before -->
<Import Project="..\..\.nuget\packages\WiX.4.0.0.5512-pre\build\wix.props" ... />

<!-- after -->
<Import Project="..\..\.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.props" ... />

[hazendaz]

@copilot The dotnet build fails with these changes stating 'Package 'WixToolset.Sdk 4.0.6' has a package type 'MSBuildSdk' that is not supported by project '.nuget\packages'.', can you look into what else needs fixed for that to work?

[Copilot]

@copilot The dotnet build fails with these changes stating 'Package 'WixToolset.Sdk 4.0.6' has a package type 'MSBuildSdk' that is not supported by project '.nuget\packages'.', can you look into what...

Fixed in 5b07fc4 (with the restore mechanism introduced in 18aa439). bootstrap.cmd no longer uses NuGet.exe install WixToolset.Sdk (which rejects MSBuildSdk package type); it now downloads WixToolset.Sdk 4.0.6 from NuGet’s flat-container feed and extracts it into .nuget\packages\WixToolset.Sdk.4.0.6, which matches the .wixproj import path. UI screenshot: N/A (no UI changes).

[coveralls]

coverage: 58.281%. remained the same — copilot/update-wix-to-7-0-0 into master

[hazendaz]

@copilot dot net still failing, see Build FAILED.

"D:\a\waffle\waffle\Waffle.proj" (all target) (1) ->
"D:\a\waffle\waffle\Waffle.sln" (Clean target) (2) ->
"D:\a\waffle\waffle\Source\WindowsAuthProviderMergeModule\WindowsAuthProviderMergeModule.wixproj.metaproj" (Clean target) (3) ->
"D:\a\waffle\waffle\Source\WindowsAuthProviderMergeModule\WindowsAuthProviderMergeModule.wixproj" (Clean target) (7) ->
D:\a\waffle\waffle.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.props(30,5): error MSB4186: Invalid static method invocation syntax: "[MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile))". Method '[MSBuild]::NormalizePath' not found. Static method invocation should be of the form: $([FullTypeName]::Method()), e.g. $([System.IO.Path]::Combine(a, b)). [D:\a\waffle\waffle\Source\WindowsAuthProviderMergeModule\WindowsAuthProviderMergeModule.wixproj]

0 Warning(s)
1 Error(s)

[Copilot]

@copilot dot net still failing, see Build FAILED.

"D:\a\waffle\waffle\Waffle.proj" (all target) (1) ->
...

Addressed in 4f0a68d (fix introduced in 6847e3b). bootstrap.cmd now patches WixToolset.Sdk.4.0.6\tools\wix.props after extraction, replacing ([MSBuild]::NormalizePath(...)) with a System.IO.Path equivalent so the project can load under the MSBuild used in this workflow. UI screenshot: N/A (no UI changes).

[hazendaz]

@copilot Now this error Build FAILED.

"D:\a\waffle\waffle\Waffle.proj" (all target) (1) ->
"D:\a\waffle\waffle\Waffle.sln" (Clean target) (2) ->
"D:\a\waffle\waffle\Source\WindowsAuthProviderMergeModule\WindowsAuthProviderMergeModule.wixproj.metaproj" (Clean target) (3) ->
"D:\a\waffle\waffle\Source\WindowsAuthProviderMergeModule\WindowsAuthProviderMergeModule.wixproj" (Clean target) (7) ->
D:\a\waffle\waffle\Source\WindowsAuthProviderMergeModule\WindowsAuthProviderMergeModule.wixproj(112,3): error MSB4102: The value "" of the "Project" attribute in element is invalid. Parameter "path" cannot have zero length.

0 Warning(s)
1 Error(s)

[Copilot]

@copilot Now this error Build FAILED.

"D:\a\waffle\waffle\Waffle.proj" (all target) (1) ->
...

Fixed in ca51169. WindowsAuthProviderMergeModule.wixproj now sets a default WixTargetsPath to the restored WixToolset.Sdk 4.0.6 tools\wix.targets, makes the Import conditional on existence, and adds a missing-package guard for wix.targets, which resolves the empty Project import failure. UI screenshot: N/A (no UI changes).

[hazendaz]

@copilot issues persist Build FAILED.

"D:\a\waffle\waffle\Waffle.proj" (all target) (1) ->
"D:\a\waffle\waffle\Waffle.sln" (Clean target) (2) ->
"D:\a\waffle\waffle\Source\WindowsAuthProviderMergeModule\WindowsAuthProviderMergeModule.wixproj.metaproj" (Clean target) (3) ->
"D:\a\waffle\waffle\Source\WindowsAuthProviderMergeModule\WindowsAuthProviderMergeModule.wixproj" (Clean target) (7) ->
D:\a\waffle\waffle.nuget\packages\WixToolset.Sdk.4.0.6\tools\wix.targets(146,5): error MSB4186: Invalid static method invocation syntax: "[MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir))". Method '[MSBuild]::NormalizeDirectory' not found. Static method invocation should be of the form: $([FullTypeName]::Method()), e.g. $([System.IO.Path]::Combine(a, b)). [D:\a\waffle\waffle\Source\WindowsAuthProviderMergeModule\WindowsAuthProviderMergeModule.wixproj]

. Can you make sure you actually run the build.cmd file as intended so you can understand things are fixed?