Skip to content

[release/10.0.4xx] Backport #7761: update WiX toolset to v6 - #7765

Merged
joeloff merged 4 commits into
release/10.0.4xxfrom
copilot/release-100-4xx-backport-7761
Jul 22, 2026
Merged

joeloff merged 4 commits into
release/10.0.4xxfrom
copilot/release-100-4xx-backport-7761

Conversation

Copilot AI commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

Backports the intent of #7761 onto release/10.0.4xx: move installer/tooling integration to WiX v6 and align branch-local SDK/package wiring.
This applies the same effective updates where files still exist on this branch, with conservative conflict resolution for branch-specific deletions.

  • Arcade WiX version + installer task updates

    • src/arcade/Directory.Packages.props: MicrosoftWixToolsetSdkVersion6.0.3-dotnet.4
    • src/arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props: same version bump
    • src/arcade/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix5/wix.targets
      • WixExtensionsDir: wixext5wixext6
      • harvest args include -sw5149
    • src/arcade/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix5/bundle/bundle.wxs
      • RelatedBundle attribute updated from Id to Code (WiX v6 schema)
  • SDK-side alignment

    • src/sdk/global.json: Microsoft.WixToolset.Sdk6.0.3-dotnet.4
    • src/sdk/src/Layout/pkg/windows/Directory.Build.props: set HarvestDirectorySuppressSpecificWarnings=5149
  • Branch adaptation during backport

    • The following paths from source PR are deleted on release/10.0.4xx and were intentionally kept deleted:
      • src/aspnetcore/global.json
      • src/runtime/eng/Versions.props
      • src/windowsdesktop/eng/Versions.props
      • src/windowsdesktop/global.json
      • src/windowsdesktop/src/windowsdesktop/src/bundle/bundle.wxs
<!-- wix.targets -->
<WixExtensionsDir>wixext6</WixExtensionsDir>
...
AdditionalOptions="$(AdditionalHeatArgs) -sw5149"

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
Successfully started running 1 pipeline(s).
1 pipeline(s) were filtered out due to trigger conditions.
There may be pipelines that require an authorized user to comment /azp run to run.

(cherry picked from commit b9ee87e)
Copilot AI changed the title [WIP] Backport PR #7761: Update WiX toolset to v6 [release/10.0.4xx] Backport #7761: update WiX toolset to v6 Jul 15, 2026
@joeloff joeloff added the Servicing-approved Approved for servicing release label Jul 15, 2026
@joeloff

joeloff commented Jul 15, 2026

Copy link
Copy Markdown
Member

Approved over email, waiting on internal build to verify before merging

@joeloff
joeloff marked this pull request as ready for review July 16, 2026 17:02
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
Successfully started running 1 pipeline(s).
1 pipeline(s) were filtered out due to trigger conditions.
There may be pipelines that require an authorized user to comment /azp run to run.

@joeloff joeloff added NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) and removed Servicing-approved Approved for servicing release labels Jul 16, 2026
@joeloff joeloff added Servicing-approved Approved for servicing release and removed NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) labels Jul 21, 2026
@joeloff
joeloff enabled auto-merge July 22, 2026 15:38
@joeloff
joeloff merged commit fd21370 into release/10.0.4xx Jul 22, 2026
8 checks passed
@joeloff
joeloff deleted the copilot/release-100-4xx-backport-7761 branch July 22, 2026 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Servicing-approved Approved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants