diff options
Diffstat (limited to 'src')
27 files changed, 46 insertions, 46 deletions
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 @@ | |||
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
| 13 | 13 | ||
| 14 | <PropertyGroup> | 14 | <PropertyGroup> |
| 15 | <AcceptEula>abc;wix7;xyz;123</AcceptEula> | 15 | <AcceptEula>abc;wix8;xyz;123</AcceptEula> |
| 16 | </PropertyGroup> | 16 | </PropertyGroup> |
| 17 | </Project> | 17 | </Project> |
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 @@ | |||
| 3 | 3 | ||
| 4 | <Project> | 4 | <Project> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <AcceptEula>wix7</AcceptEula> | 6 | <AcceptEula>wix8</AcceptEula> |
| 7 | </PropertyGroup> | 7 | </PropertyGroup> |
| 8 | 8 | ||
| 9 | <Target Name="_SetWixVersion" | 9 | <Target Name="_SetWixVersion" |
diff --git a/src/ext/Bal/README.md b/src/ext/Bal/README.md index 009615dd..fad3e9d4 100644 --- a/src/ext/Bal/README.md +++ b/src/ext/Bal/README.md | |||
| @@ -20,9 +20,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto | |||
| 20 | Add the WiX Extension as a PackageReference to your .wixproj: | 20 | Add the WiX Extension as a PackageReference to your .wixproj: |
| 21 | 21 | ||
| 22 | ``` | 22 | ``` |
| 23 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 23 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 24 | <ItemGroup> | 24 | <ItemGroup> |
| 25 | <PackageReference Include="WixToolset.BootstrapperApplications.wixext" Version="7.0.0" /> | 25 | <PackageReference Include="WixToolset.BootstrapperApplications.wixext" Version="8.0.0" /> |
| 26 | </ItemGroup> | 26 | </ItemGroup> |
| 27 | </Project> | 27 | </Project> |
| 28 | ``` | 28 | ``` |
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 | |||
| 17 | Add the WiX Extension as a PackageReference to your .wixproj: | 17 | Add the WiX Extension as a PackageReference to your .wixproj: |
| 18 | 18 | ||
| 19 | ``` | 19 | ``` |
| 20 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 20 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.ComPlus.wixext" Version="7.0.0" /> | 22 | <PackageReference Include="WixToolset.ComPlus.wixext" Version="8.0.0" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> | 24 | </Project> |
| 25 | ``` | 25 | ``` |
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 | |||
| 17 | Add the WiX Extension as a PackageReference to your .wixproj: | 17 | Add the WiX Extension as a PackageReference to your .wixproj: |
| 18 | 18 | ||
| 19 | ``` | 19 | ``` |
| 20 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 20 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.Dependency.wixext" Version="7.0.0" /> | 22 | <PackageReference Include="WixToolset.Dependency.wixext" Version="8.0.0" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> | 24 | </Project> |
| 25 | ``` | 25 | ``` |
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 | |||
| 17 | Add the WiX Extension as a PackageReference to your .wixproj: | 17 | Add the WiX Extension as a PackageReference to your .wixproj: |
| 18 | 18 | ||
| 19 | ``` | 19 | ``` |
| 20 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 20 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.DirectX.wixext" Version="7.0.0" /> | 22 | <PackageReference Include="WixToolset.DirectX.wixext" Version="8.0.0" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> | 24 | </Project> |
| 25 | ``` | 25 | ``` |
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 | |||
| 17 | Add the WiX Extension as a PackageReference to your .wixproj: | 17 | Add the WiX Extension as a PackageReference to your .wixproj: |
| 18 | 18 | ||
| 19 | ``` | 19 | ``` |
| 20 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 20 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.Firewall.wixext" Version="7.0.0" /> | 22 | <PackageReference Include="WixToolset.Firewall.wixext" Version="8.0.0" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> | 24 | </Project> |
| 25 | ``` | 25 | ``` |
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 | |||
| 17 | Add the WiX Extension as a PackageReference to your .wixproj: | 17 | Add the WiX Extension as a PackageReference to your .wixproj: |
| 18 | 18 | ||
| 19 | ``` | 19 | ``` |
| 20 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 20 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.Http.wixext" Version="7.0.0" /> | 22 | <PackageReference Include="WixToolset.Http.wixext" Version="8.0.0" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> | 24 | </Project> |
| 25 | ``` | 25 | ``` |
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 | |||
| 17 | Add the WiX Extension as a PackageReference to your .wixproj: | 17 | Add the WiX Extension as a PackageReference to your .wixproj: |
| 18 | 18 | ||
| 19 | ``` | 19 | ``` |
| 20 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 20 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.Iis.wixext" Version="7.0.0" /> | 22 | <PackageReference Include="WixToolset.Iis.wixext" Version="8.0.0" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> | 24 | </Project> |
| 25 | ``` | 25 | ``` |
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 | |||
| 17 | Add the WiX Extension as a PackageReference to your .wixproj: | 17 | Add the WiX Extension as a PackageReference to your .wixproj: |
| 18 | 18 | ||
| 19 | ``` | 19 | ``` |
| 20 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 20 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.Msmq.wixext" Version="7.0.0" /> | 22 | <PackageReference Include="WixToolset.Msmq.wixext" Version="8.0.0" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> | 24 | </Project> |
| 25 | ``` | 25 | ``` |
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 | |||
| 17 | Add the WiX Extension as a PackageReference to your .wixproj: | 17 | Add the WiX Extension as a PackageReference to your .wixproj: |
| 18 | 18 | ||
| 19 | ``` | 19 | ``` |
| 20 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 20 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.NetFx.wixext" Version="7.0.0" /> | 22 | <PackageReference Include="WixToolset.NetFx.wixext" Version="8.0.0" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> | 24 | </Project> |
| 25 | ``` | 25 | ``` |
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 | |||
| 17 | Add the WiX Extension as a PackageReference to your .wixproj: | 17 | Add the WiX Extension as a PackageReference to your .wixproj: |
| 18 | 18 | ||
| 19 | ``` | 19 | ``` |
| 20 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 20 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.PowerShell.wixext" Version="7.0.0" /> | 22 | <PackageReference Include="WixToolset.PowerShell.wixext" Version="8.0.0" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> | 24 | </Project> |
| 25 | ``` | 25 | ``` |
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 | |||
| 17 | Add the WiX Extension as a PackageReference to your .wixproj: | 17 | Add the WiX Extension as a PackageReference to your .wixproj: |
| 18 | 18 | ||
| 19 | ``` | 19 | ``` |
| 20 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 20 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.Sql.wixext" Version="7.0.0" /> | 22 | <PackageReference Include="WixToolset.Sql.wixext" Version="8.0.0" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> | 24 | </Project> |
| 25 | ``` | 25 | ``` |
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 | |||
| 17 | Add the WiX Extension as a PackageReference to your .wixproj: | 17 | Add the WiX Extension as a PackageReference to your .wixproj: |
| 18 | 18 | ||
| 19 | ``` | 19 | ``` |
| 20 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 20 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.UI.wixext" Version="7.0.0" /> | 22 | <PackageReference Include="WixToolset.UI.wixext" Version="8.0.0" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> | 24 | </Project> |
| 25 | ``` | 25 | ``` |
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 | |||
| 17 | Add the WiX Extension as a PackageReference to your .wixproj: | 17 | Add the WiX Extension as a PackageReference to your .wixproj: |
| 18 | 18 | ||
| 19 | ``` | 19 | ``` |
| 20 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 20 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.Util.wixext" Version="7.0.0" /> | 22 | <PackageReference Include="WixToolset.Util.wixext" Version="8.0.0" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> | 24 | </Project> |
| 25 | ``` | 25 | ``` |
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 | |||
| 17 | Add the WiX Extension as a PackageReference to your .wixproj: | 17 | Add the WiX Extension as a PackageReference to your .wixproj: |
| 18 | 18 | ||
| 19 | ``` | 19 | ``` |
| 20 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 20 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.VisualStudio.wixext" Version="7.0.0" /> | 22 | <PackageReference Include="WixToolset.VisualStudio.wixext" Version="8.0.0" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> | 24 | </Project> |
| 25 | ``` | 25 | ``` |
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 @@ | |||
| 6 | <IncludeBuildOutput>false</IncludeBuildOutput> | 6 | <IncludeBuildOutput>false</IncludeBuildOutput> |
| 7 | <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking> | 7 | <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking> |
| 8 | <NoWarn>NU5100</NoWarn> | 8 | <NoWarn>NU5100</NoWarn> |
| 9 | <WixExtensionPackageFolder>wixext7</WixExtensionPackageFolder> | 9 | <WixExtensionPackageFolder>wixext8</WixExtensionPackageFolder> |
| 10 | <PackageTags>$(PackageTags) wixext CustomActions</PackageTags> | 10 | <PackageTags>$(PackageTags) wixext CustomActions</PackageTags> |
| 11 | <IsWixExtension>true</IsWixExtension> | 11 | <IsWixExtension>true</IsWixExtension> |
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
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 @@ | |||
| 4 | <Project> | 4 | <Project> |
| 5 | 5 | ||
| 6 | <Target | 6 | <Target |
| 7 | Name="CheckWix7LicenseAcceptance" | 7 | Name="CheckWix8LicenseAcceptance" |
| 8 | BeforeTargets="CoreCompile"> | 8 | BeforeTargets="CoreCompile"> |
| 9 | 9 | ||
| 10 | <ItemGroup> | 10 | <ItemGroup> |
| @@ -12,19 +12,19 @@ | |||
| 12 | </ItemGroup> | 12 | </ItemGroup> |
| 13 | 13 | ||
| 14 | <PropertyGroup> | 14 | <PropertyGroup> |
| 15 | <_Wix7EulaFile>$(USERPROFILE)\.wix\wix7-osmf-eula.txt</_Wix7EulaFile> | 15 | <_Wix8EulaFile>$(USERPROFILE)\.wix\wix8-osmf-eula.txt</_Wix8EulaFile> |
| 16 | </PropertyGroup> | 16 | </PropertyGroup> |
| 17 | 17 | ||
| 18 | <FindInList List="@(_AcceptEula)" ItemSpecToFind="wix7"> | 18 | <FindInList List="@(_AcceptEula)" ItemSpecToFind="wix8"> |
| 19 | <Output TaskParameter="ItemFound" ItemName="_Wix7LicenseAccepted" /> | 19 | <Output TaskParameter="ItemFound" ItemName="_Wix8LicenseAccepted" /> |
| 20 | </FindInList> | 20 | </FindInList> |
| 21 | 21 | ||
| 22 | <Error | 22 | <Error |
| 23 | Text="You must accept the Open Source Maintenance Fee (OSMF) EULA to use WiX Toolset v7. For instructions, see https://wixtoolset.org/osmf/" | 23 | Text="You must accept the Open Source Maintenance Fee (OSMF) EULA to use WiX Toolset v8. For instructions, see https://wixtoolset.org/osmf/" |
| 24 | Code="WIX7015" | 24 | Code="WIX7015" |
| 25 | File="$(MSBuildProjectFile)" | 25 | File="$(MSBuildProjectFile)" |
| 26 | HelpLink="https://wixtoolset.org/osmf" | 26 | HelpLink="https://wixtoolset.org/osmf" |
| 27 | Condition=" '@(_Wix7LicenseAccepted)' == '' and !Exists('$(_Wix7EulaFile)')" /> | 27 | Condition=" '@(_Wix8LicenseAccepted)' == '' and !Exists('$(_Wix8EulaFile)')" /> |
| 28 | </Target> | 28 | </Target> |
| 29 | 29 | ||
| 30 | </Project> | 30 | </Project> |
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 @@ | |||
| 5 | <TargetFramework>net472</TargetFramework> | 5 | <TargetFramework>net472</TargetFramework> |
| 6 | 6 | ||
| 7 | <!-- Add some random EULA Ids for testing purposes. --> | 7 | <!-- Add some random EULA Ids for testing purposes. --> |
| 8 | <AcceptEula>foo;wix7;bar</AcceptEula> | 8 | <AcceptEula>foo;wix8;bar</AcceptEula> |
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <ItemGroup> | 11 | <ItemGroup> |
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 @@ | |||
| 8 | --> | 8 | --> |
| 9 | 9 | ||
| 10 | <PropertyGroup> | 10 | <PropertyGroup> |
| 11 | <AcceptEula>wix7</AcceptEula> | 11 | <AcceptEula>wix8</AcceptEula> |
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
| 13 | </Project> | 13 | </Project> |
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 @@ | |||
| 6 | <SignOutput>true</SignOutput> | 6 | <SignOutput>true</SignOutput> |
| 7 | 7 | ||
| 8 | <!-- Add some random EULA Ids for testing purposes. --> | 8 | <!-- Add some random EULA Ids for testing purposes. --> |
| 9 | <AcceptEula>abc;xyz;123;wix7</AcceptEula> | 9 | <AcceptEula>abc;xyz;123;wix8</AcceptEula> |
| 10 | </PropertyGroup> | 10 | </PropertyGroup> |
| 11 | 11 | ||
| 12 | <ItemGroup> | 12 | <ItemGroup> |
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 | |||
| 17 | internal class ExtensionManager : IExtensionManager | 17 | internal class ExtensionManager : IExtensionManager |
| 18 | { | 18 | { |
| 19 | // This value needs to stay in sync with the Property in "wix.props" with the same name. | 19 | // This value needs to stay in sync with the Property in "wix.props" with the same name. |
| 20 | private const string WixToolsetExtensionPackageFolder = "wixext7"; | 20 | private const string WixToolsetExtensionPackageFolder = "wixext8"; |
| 21 | 21 | ||
| 22 | private const string UserWixFolderName = ".wix"; | 22 | private const string UserWixFolderName = ".wix"; |
| 23 | private const string MachineWixFolderName = "WixToolset"; | 23 | 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 | |||
| 18 | 18 | ||
| 19 | Example project file: `QuickStart.wixproj` | 19 | Example project file: `QuickStart.wixproj` |
| 20 | ``` | 20 | ``` |
| 21 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 21 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 22 | </Project> | 22 | </Project> |
| 23 | ``` | 23 | ``` |
| 24 | 24 | ||
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 @@ | |||
| 9 | <WixToolsetPatchVersion>$$WixToolsetPatchVersion$$</WixToolsetPatchVersion> | 9 | <WixToolsetPatchVersion>$$WixToolsetPatchVersion$$</WixToolsetPatchVersion> |
| 10 | <WixToolsetMajorMinorVersion>$$WixToolsetMajorMinorVersion$$</WixToolsetMajorMinorVersion> | 10 | <WixToolsetMajorMinorVersion>$$WixToolsetMajorMinorVersion$$</WixToolsetMajorMinorVersion> |
| 11 | <WixToolsetVersion>$$WixToolsetVersion$$</WixToolsetVersion> | 11 | <WixToolsetVersion>$$WixToolsetVersion$$</WixToolsetVersion> |
| 12 | <WixToolsetExtensionPackageFolder>wixext7</WixToolsetExtensionPackageFolder> | 12 | <WixToolsetExtensionPackageFolder>wixext8</WixToolsetExtensionPackageFolder> |
| 13 | </PropertyGroup> | 13 | </PropertyGroup> |
| 14 | 14 | ||
| 15 | <ImportGroup> | 15 | <ImportGroup> |
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 | |||
| 18 | 18 | ||
| 19 | Example project file: `QuickStart.wixproj` | 19 | Example project file: `QuickStart.wixproj` |
| 20 | ``` | 20 | ``` |
| 21 | <Project Sdk="WixToolset.Sdk/7.0.0"> | 21 | <Project Sdk="WixToolset.Sdk/8.0.0"> |
| 22 | </Project> | 22 | </Project> |
| 23 | ``` | 23 | ``` |
| 24 | 24 | ||
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 @@ | |||
| 4 | 4 | ||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <!-- Add some random EULA Ids for testing purposes. --> | 6 | <!-- Add some random EULA Ids for testing purposes. --> |
| 7 | <AcceptEula>foo;wix7;bar</AcceptEula> | 7 | <AcceptEula>foo;wix8;bar</AcceptEula> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
| 10 | <ItemGroup> | 10 | <ItemGroup> |
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 @@ | |||
| 3 | <Import Project="$(WixMSBuildProps)" /> | 3 | <Import Project="$(WixMSBuildProps)" /> |
| 4 | 4 | ||
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <AcceptEula>wix7</AcceptEula> | 6 | <AcceptEula>wix8</AcceptEula> |
| 7 | </PropertyGroup> | 7 | </PropertyGroup> |
| 8 | 8 | ||
| 9 | <ItemGroup> | 9 | <ItemGroup> |
