diff options
author | Bob Arnson <bob@firegiant.com> | 2022-01-29 23:44:11 -0500 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2022-01-30 13:02:05 -0500 |
commit | 7ce477c6863c74ef0a50d117d8c28b2f19971b42 (patch) | |
tree | b953aae25a04d9ffbf0bd4609055087d96e760dc /src/test | |
parent | 3c1b81ff55975adffdc76f1a184b0f264bd97cd6 (diff) | |
download | wix-7ce477c6863c74ef0a50d117d8c28b2f19971b42.tar.gz wix-7ce477c6863c74ef0a50d117d8c28b2f19971b42.tar.bz2 wix-7ce477c6863c74ef0a50d117d8c28b2f19971b42.zip |
Add compiler extension to handle platforms.
Custom actions to print EULA and validate install directories are
defined in WixUIExtension compiler extension, to handle
platform-specific custom actions referred to from `DoAction` control
events. This is the least-worst solution, given the `DoAction` approach
used in the WixUI authoring and anyone customizing a WixUI set.
Diffstat (limited to 'src/test')
6 files changed, 3 insertions, 12 deletions
diff --git a/src/test/burn/TestData/FilesInUseTests/PackageA/PackageA.wxs b/src/test/burn/TestData/FilesInUseTests/PackageA/PackageA.wxs index a96c2a11..0902ff1a 100644 --- a/src/test/burn/TestData/FilesInUseTests/PackageA/PackageA.wxs +++ b/src/test/burn/TestData/FilesInUseTests/PackageA/PackageA.wxs | |||
@@ -1,10 +1,10 @@ | |||
1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
2 | 2 | ||
3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"> |
4 | <Fragment> | 4 | <Fragment> |
5 | <ComponentGroup Id="ProductComponents" /> | 5 | <ComponentGroup Id="ProductComponents" /> |
6 | 6 | ||
7 | <UIRef Id="WixUI_Minimal" /> | 7 | <ui:WixUI Id="WixUI_Minimal" /> |
8 | <WixVariable Id="WixUILicenseRtf" Value="license.txt" /> | 8 | <WixVariable Id="WixUILicenseRtf" Value="license.txt" /> |
9 | </Fragment> | 9 | </Fragment> |
10 | </Wix> | 10 | </Wix> |
diff --git a/src/test/wix/TestData/WixprojLibraryVcxprojDll/Library.wxs b/src/test/wix/TestData/WixprojLibraryVcxprojDll/Library.wxs index eed46112..f61c0ebe 100644 --- a/src/test/wix/TestData/WixprojLibraryVcxprojDll/Library.wxs +++ b/src/test/wix/TestData/WixprojLibraryVcxprojDll/Library.wxs | |||
@@ -1,11 +1,9 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"> |
2 | <Fragment> | 2 | <Fragment> |
3 | <ComponentGroup Id='VcxprojDllComponentGroup' Directory='ApplicationFolder'> | 3 | <ComponentGroup Id='VcxprojDllComponentGroup' Directory='ApplicationFolder'> |
4 | <Component> | 4 | <Component> |
5 | <File Source='VcxprojDll.dll' /> | 5 | <File Source='VcxprojDll.dll' /> |
6 | </Component> | 6 | </Component> |
7 | </ComponentGroup> | 7 | </ComponentGroup> |
8 | |||
9 | <UIRef Id="WixUI_Minimal" /> | ||
10 | </Fragment> | 8 | </Fragment> |
11 | </Wix> | 9 | </Wix> |
diff --git a/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/Package.wxs b/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/Package.wxs index 17a5b29b..c228bb33 100644 --- a/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/Package.wxs +++ b/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/Package.wxs | |||
@@ -12,7 +12,5 @@ | |||
12 | <File Source='web.config' /> | 12 | <File Source='web.config' /> |
13 | </Component> | 13 | </Component> |
14 | </Feature> | 14 | </Feature> |
15 | |||
16 | <UIRef Id="WixUI_Minimal" /> | ||
17 | </Package> | 15 | </Package> |
18 | </Wix> | 16 | </Wix> |
diff --git a/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj b/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj index f9852465..c9f56d1d 100644 --- a/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj +++ b/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj | |||
@@ -11,7 +11,6 @@ | |||
11 | <ItemGroup> | 11 | <ItemGroup> |
12 | <!-- SkipPublish="true" BindPath="$(MSBuildProjectDirectory)\does\not\exist" BindName="Xxx" Publish="true" --> | 12 | <!-- SkipPublish="true" BindPath="$(MSBuildProjectDirectory)\does\not\exist" BindName="Xxx" Publish="true" --> |
13 | <ProjectReference Include="..\CsprojWebApplicationNetCore\CsprojWebApplicationNetCore.csproj" Publish="true" /> | 13 | <ProjectReference Include="..\CsprojWebApplicationNetCore\CsprojWebApplicationNetCore.csproj" Publish="true" /> |
14 | <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0-preview.0" /> | ||
15 | </ItemGroup> | 14 | </ItemGroup> |
16 | 15 | ||
17 | <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\netcoreapp3.1\Sdk\Sdk.targets' /> --> | 16 | <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\netcoreapp3.1\Sdk\Sdk.targets' /> --> |
diff --git a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs index 00ef4d05..c0370683 100644 --- a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs +++ b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs | |||
@@ -16,7 +16,5 @@ | |||
16 | 16 | ||
17 | <MergeRef Id='WinFormsModule' /> | 17 | <MergeRef Id='WinFormsModule' /> |
18 | </Feature> | 18 | </Feature> |
19 | |||
20 | <UIRef Id="WixUI_Minimal" /> | ||
21 | </Package> | 19 | </Package> |
22 | </Wix> | 20 | </Wix> |
diff --git a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj index 84deecb6..7dc26a2d 100644 --- a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj +++ b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj | |||
@@ -5,7 +5,5 @@ | |||
5 | <ProjectReference Include="..\VcxprojWindowsApp\VcxprojWindowsApp.vcxproj" /> | 5 | <ProjectReference Include="..\VcxprojWindowsApp\VcxprojWindowsApp.vcxproj" /> |
6 | <ProjectReference Include="..\WixprojLibraryVcxprojDll\WixprojLibraryVcxprojDll.wixproj" /> | 6 | <ProjectReference Include="..\WixprojLibraryVcxprojDll\WixprojLibraryVcxprojDll.wixproj" /> |
7 | <ProjectReference Include="..\WixprojModuleCsprojWinFormsNetFx\WixprojModuleCsprojWinFormsNetFx.wixproj" /> | 7 | <ProjectReference Include="..\WixprojModuleCsprojWinFormsNetFx\WixprojModuleCsprojWinFormsNetFx.wixproj" /> |
8 | |||
9 | <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0-preview.0" /> | ||
10 | </ItemGroup> | 8 | </ItemGroup> |
11 | </Project> | 9 | </Project> |