diff options
| author | Rob Mensching <rob@firegiant.com> | 2026-01-29 21:03:31 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2026-01-30 11:14:58 -0800 |
| commit | 405b90740e33d109c34cef3adda0c0664bacdd28 (patch) | |
| tree | 26b97c82ff157a20a7005503c7076146d33a7d1c /src/dtf | |
| parent | a389a98c4dbed77cb658167badad79836e566887 (diff) | |
| download | wix-405b90740e33d109c34cef3adda0c0664bacdd28.tar.gz wix-405b90740e33d109c34cef3adda0c0664bacdd28.tar.bz2 wix-405b90740e33d109c34cef3adda0c0664bacdd28.zip | |
Require "accept EULA" in .nupkgs plus some "accept EULA" bug fixes
Resolves 9196
Diffstat (limited to 'src/dtf')
| -rw-r--r-- | src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec | 1 | ||||
| -rw-r--r-- | src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.targets | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec index bac680dc..37cc3e86 100644 --- a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec +++ b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | <file src="$iconPng$" /> | 24 | <file src="$iconPng$" /> |
| 25 | <file src="$projectFolder$\README.md" /> | 25 | <file src="$projectFolder$\README.md" /> |
| 26 | <file src="$projectFolder$\$id$.targets" target="build" /> | 26 | <file src="$projectFolder$\$id$.targets" target="build" /> |
| 27 | <file src="$licenseAcceptanceTargets$" target="build" /> | ||
| 27 | <file src="net472\WixToolset.Dtf.MakeSfxCA.exe" target="tools" /> | 28 | <file src="net472\WixToolset.Dtf.MakeSfxCA.exe" target="tools" /> |
| 28 | <file src="net472\WixToolset.Dtf.MakeSfxCA.exe.config" target="tools" /> | 29 | <file src="net472\WixToolset.Dtf.MakeSfxCA.exe.config" target="tools" /> |
| 29 | <file src="net472\WixToolset.Dtf.Compression.dll" target="tools" /> | 30 | <file src="net472\WixToolset.Dtf.Compression.dll" target="tools" /> |
diff --git a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.targets b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.targets index e83272a2..440a1298 100644 --- a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.targets +++ b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.targets | |||
| @@ -5,6 +5,8 @@ | |||
| 5 | 5 | ||
| 6 | <Import Project="$(CustomBeforeWixCATargets)" Condition=" '$(CustomBeforeWixCATargets)' != '' and Exists('$(CustomBeforeWixCATargets)')" /> | 6 | <Import Project="$(CustomBeforeWixCATargets)" Condition=" '$(CustomBeforeWixCATargets)' != '' and Exists('$(CustomBeforeWixCATargets)')" /> |
| 7 | 7 | ||
| 8 | <Import Project="CheckLicenseAcceptance.targets" /> | ||
| 9 | |||
| 8 | <PropertyGroup> | 10 | <PropertyGroup> |
| 9 | <WixCATargetsImported>true</WixCATargetsImported> | 11 | <WixCATargetsImported>true</WixCATargetsImported> |
| 10 | 12 | ||