diff options
| author | Rob Mensching <rob@firegiant.com> | 2026-05-20 09:30:32 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2026-05-20 10:17:21 -0700 |
| commit | 7331d04fc505a091d99bfa48695cabab0d2db80c (patch) | |
| tree | b967b627a025d97827c37a4d81441b07cdd30c9c /src/internal | |
| parent | b8977d6f88e7b68e000bac226a2814f236770570 (diff) | |
| download | wix-7331d04fc505a091d99bfa48695cabab0d2db80c.tar.gz wix-7331d04fc505a091d99bfa48695cabab0d2db80c.tar.bz2 wix-7331d04fc505a091d99bfa48695cabab0d2db80c.zip | |
Start WiX Toolset v8
Diffstat (limited to 'src/internal')
| -rw-r--r-- | src/internal/targets/CheckLicenseAcceptance.targets | 12 |
1 files changed, 6 insertions, 6 deletions
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> |