From 7331d04fc505a091d99bfa48695cabab0d2db80c Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 20 May 2026 09:30:32 -0700 Subject: Start WiX Toolset v8 --- .github/workflows/build.yml | 4 ++-- src/Directory.csproj.props | 2 +- src/Directory.wixproj.targets | 2 +- src/ext/Bal/README.md | 4 ++-- src/ext/ComPlus/README.md | 4 ++-- src/ext/Dependency/README.md | 4 ++-- src/ext/DirectX/README.md | 4 ++-- src/ext/Firewall/README.md | 4 ++-- src/ext/Http/README.md | 4 ++-- src/ext/Iis/README.md | 4 ++-- src/ext/Msmq/README.md | 4 ++-- src/ext/NetFx/README.md | 4 ++-- src/ext/PowerShell/README.md | 4 ++-- src/ext/Sql/README.md | 4 ++-- src/ext/UI/README.md | 4 ++-- src/ext/Util/README.md | 4 ++-- src/ext/VisualStudio/README.md | 4 ++-- src/ext/WixExt.props | 2 +- src/internal/targets/CheckLicenseAcceptance.targets | 12 ++++++------ src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj | 2 +- src/test/wix/TestData/Directory.Build.props | 2 +- .../WixprojPackageVcxprojWindowsApp.wixproj | 2 +- .../ExtensibilityServices/ExtensionManager.cs | 2 +- src/wix/WixToolset.Sdk/README.md | 2 +- src/wix/WixToolset.Sdk/tools/wix.props | 2 +- src/wix/pack-wix/README.md | 2 +- .../PackageUsingExplicitProperties.wixproj | 2 +- .../PackageUsingExplicitTfmAndRids.wixproj | 2 +- 28 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 800749cf..37ab1fb8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build WiX Toolset v7 +name: Build WiX Toolset v8 on: push: @@ -63,7 +63,7 @@ jobs: client-id: ${{ secrets.WIX_SIGNING_CLIENTID }} tenant-id: ${{ secrets.WIX_SIGNING_TENANTID }} - - name: Build wix7 + - name: Build wix8 shell: cmd run: ./src/build_official.cmd env: diff --git a/src/Directory.csproj.props b/src/Directory.csproj.props index 6891ef2f..44a41a6e 100644 --- a/src/Directory.csproj.props +++ b/src/Directory.csproj.props @@ -12,6 +12,6 @@ - abc;wix7;xyz;123 + abc;wix8;xyz;123 diff --git a/src/Directory.wixproj.targets b/src/Directory.wixproj.targets index 3f6b6385..f026320c 100644 --- a/src/Directory.wixproj.targets +++ b/src/Directory.wixproj.targets @@ -3,7 +3,7 @@ - wix7 + wix8 + - + ``` diff --git a/src/ext/ComPlus/README.md b/src/ext/ComPlus/README.md index 01f60df4..e108a3a6 100644 --- a/src/ext/ComPlus/README.md +++ b/src/ext/ComPlus/README.md @@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto Add the WiX Extension as a PackageReference to your .wixproj: ``` - + - + ``` diff --git a/src/ext/Dependency/README.md b/src/ext/Dependency/README.md index 2ed031f2..fe4c27b1 100644 --- a/src/ext/Dependency/README.md +++ b/src/ext/Dependency/README.md @@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto Add the WiX Extension as a PackageReference to your .wixproj: ``` - + - + ``` diff --git a/src/ext/DirectX/README.md b/src/ext/DirectX/README.md index cceaa105..02a46b47 100644 --- a/src/ext/DirectX/README.md +++ b/src/ext/DirectX/README.md @@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto Add the WiX Extension as a PackageReference to your .wixproj: ``` - + - + ``` diff --git a/src/ext/Firewall/README.md b/src/ext/Firewall/README.md index eac3acf9..b0f1e242 100644 --- a/src/ext/Firewall/README.md +++ b/src/ext/Firewall/README.md @@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto Add the WiX Extension as a PackageReference to your .wixproj: ``` - + - + ``` diff --git a/src/ext/Http/README.md b/src/ext/Http/README.md index 35c80c68..23ae1557 100644 --- a/src/ext/Http/README.md +++ b/src/ext/Http/README.md @@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto Add the WiX Extension as a PackageReference to your .wixproj: ``` - + - + ``` diff --git a/src/ext/Iis/README.md b/src/ext/Iis/README.md index f9fb96c3..6a85743f 100644 --- a/src/ext/Iis/README.md +++ b/src/ext/Iis/README.md @@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto Add the WiX Extension as a PackageReference to your .wixproj: ``` - + - + ``` diff --git a/src/ext/Msmq/README.md b/src/ext/Msmq/README.md index 46491349..c1da6a8b 100644 --- a/src/ext/Msmq/README.md +++ b/src/ext/Msmq/README.md @@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto Add the WiX Extension as a PackageReference to your .wixproj: ``` - + - + ``` diff --git a/src/ext/NetFx/README.md b/src/ext/NetFx/README.md index dcc79786..626f2d9c 100644 --- a/src/ext/NetFx/README.md +++ b/src/ext/NetFx/README.md @@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto Add the WiX Extension as a PackageReference to your .wixproj: ``` - + - + ``` diff --git a/src/ext/PowerShell/README.md b/src/ext/PowerShell/README.md index 9cea557f..5993a91e 100644 --- a/src/ext/PowerShell/README.md +++ b/src/ext/PowerShell/README.md @@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto Add the WiX Extension as a PackageReference to your .wixproj: ``` - + - + ``` diff --git a/src/ext/Sql/README.md b/src/ext/Sql/README.md index 156c7761..c0af8924 100644 --- a/src/ext/Sql/README.md +++ b/src/ext/Sql/README.md @@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto Add the WiX Extension as a PackageReference to your .wixproj: ``` - + - + ``` diff --git a/src/ext/UI/README.md b/src/ext/UI/README.md index 5b040f13..071bd213 100644 --- a/src/ext/UI/README.md +++ b/src/ext/UI/README.md @@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto Add the WiX Extension as a PackageReference to your .wixproj: ``` - + - + ``` diff --git a/src/ext/Util/README.md b/src/ext/Util/README.md index 2bbf17ce..e221bd9f 100644 --- a/src/ext/Util/README.md +++ b/src/ext/Util/README.md @@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto Add the WiX Extension as a PackageReference to your .wixproj: ``` - + - + ``` diff --git a/src/ext/VisualStudio/README.md b/src/ext/VisualStudio/README.md index bf48670c..55f5d1df 100644 --- a/src/ext/VisualStudio/README.md +++ b/src/ext/VisualStudio/README.md @@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto Add the WiX Extension as a PackageReference to your .wixproj: ``` - + - + ``` diff --git a/src/ext/WixExt.props b/src/ext/WixExt.props index d2c4929a..08551de7 100644 --- a/src/ext/WixExt.props +++ b/src/ext/WixExt.props @@ -6,7 +6,7 @@ false true NU5100 - wixext7 + wixext8 $(PackageTags) wixext CustomActions true diff --git a/src/internal/targets/CheckLicenseAcceptance.targets b/src/internal/targets/CheckLicenseAcceptance.targets index 61155827..4ab17016 100644 --- a/src/internal/targets/CheckLicenseAcceptance.targets +++ b/src/internal/targets/CheckLicenseAcceptance.targets @@ -4,7 +4,7 @@ @@ -12,19 +12,19 @@ - <_Wix7EulaFile>$(USERPROFILE)\.wix\wix7-osmf-eula.txt + <_Wix8EulaFile>$(USERPROFILE)\.wix\wix8-osmf-eula.txt - - + + + Condition=" '@(_Wix8LicenseAccepted)' == '' and !Exists('$(_Wix8EulaFile)')" /> diff --git a/src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj b/src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj index 00fb5a41..957ebcb2 100644 --- a/src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj +++ b/src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj @@ -5,7 +5,7 @@ net472 - foo;wix7;bar + foo;wix8;bar diff --git a/src/test/wix/TestData/Directory.Build.props b/src/test/wix/TestData/Directory.Build.props index 1a791cf9..a7b78346 100644 --- a/src/test/wix/TestData/Directory.Build.props +++ b/src/test/wix/TestData/Directory.Build.props @@ -8,6 +8,6 @@ --> - wix7 + wix8 diff --git a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj index 1e137761..2723d180 100644 --- a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj +++ b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj @@ -6,7 +6,7 @@ true - abc;xyz;123;wix7 + abc;xyz;123;wix8 diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs b/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs index 970928f5..10811d85 100644 --- a/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs +++ b/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs @@ -17,7 +17,7 @@ namespace WixToolset.Core.ExtensibilityServices internal class ExtensionManager : IExtensionManager { // This value needs to stay in sync with the Property in "wix.props" with the same name. - private const string WixToolsetExtensionPackageFolder = "wixext7"; + private const string WixToolsetExtensionPackageFolder = "wixext8"; private const string UserWixFolderName = ".wix"; private const string MachineWixFolderName = "WixToolset"; diff --git a/src/wix/WixToolset.Sdk/README.md b/src/wix/WixToolset.Sdk/README.md index 101a0b52..8082023c 100644 --- a/src/wix/WixToolset.Sdk/README.md +++ b/src/wix/WixToolset.Sdk/README.md @@ -18,7 +18,7 @@ Here's a minimal .wixproj that builds an MSI from the .wxs source files in the p Example project file: `QuickStart.wixproj` ``` - + ``` diff --git a/src/wix/WixToolset.Sdk/tools/wix.props b/src/wix/WixToolset.Sdk/tools/wix.props index dde51e8a..fa5a1efd 100644 --- a/src/wix/WixToolset.Sdk/tools/wix.props +++ b/src/wix/WixToolset.Sdk/tools/wix.props @@ -9,7 +9,7 @@ $$WixToolsetPatchVersion$$ $$WixToolsetMajorMinorVersion$$ $$WixToolsetVersion$$ - wixext7 + wixext8 diff --git a/src/wix/pack-wix/README.md b/src/wix/pack-wix/README.md index dc3a9b9e..ca6ff833 100644 --- a/src/wix/pack-wix/README.md +++ b/src/wix/pack-wix/README.md @@ -18,7 +18,7 @@ For most users, we recommend using the [WixToolset.Sdk][sdk] to build your insta Example project file: `QuickStart.wixproj` ``` - + ``` diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitProperties/PackageUsingExplicitProperties.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitProperties/PackageUsingExplicitProperties.wixproj index 84d0db4d..ba07f6ad 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitProperties/PackageUsingExplicitProperties.wixproj +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitProperties/PackageUsingExplicitProperties.wixproj @@ -4,7 +4,7 @@ - foo;wix7;bar + foo;wix8;bar diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitTfmAndRids/PackageUsingExplicitTfmAndRids.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitTfmAndRids/PackageUsingExplicitTfmAndRids.wixproj index 796c4557..bb7a08ed 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitTfmAndRids/PackageUsingExplicitTfmAndRids.wixproj +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitTfmAndRids/PackageUsingExplicitTfmAndRids.wixproj @@ -3,7 +3,7 @@ - wix7 + wix8 -- cgit v1.2.3-55-g6feb