From 7ce477c6863c74ef0a50d117d8c28b2f19971b42 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sat, 29 Jan 2022 23:44:11 -0500
Subject: 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.
---
 src/test/burn/TestData/FilesInUseTests/PackageA/PackageA.wxs          | 4 ++--
 src/test/wix/TestData/WixprojLibraryVcxprojDll/Library.wxs            | 4 +---
 .../TestData/WixprojPackageCsprojWebApplicationNetCore/Package.wxs    | 2 --
 .../WixprojPackageCsprojWebApplicationNetCore.wixproj                 | 1 -
 src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs     | 2 --
 .../WixprojPackageVcxprojWindowsApp.wixproj                           | 2 --
 6 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'src/test')

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 @@
 <!-- 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. -->
 
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
   <Fragment>
     <ComponentGroup Id="ProductComponents" />
 
-    <UIRef Id="WixUI_Minimal" />
+    <ui:WixUI Id="WixUI_Minimal" />
     <WixVariable Id="WixUILicenseRtf" Value="license.txt" />
   </Fragment>
 </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 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
   <Fragment>
     <ComponentGroup Id='VcxprojDllComponentGroup' Directory='ApplicationFolder'>
       <Component>
         <File Source='VcxprojDll.dll' />
       </Component>
     </ComponentGroup>
-
-    <UIRef Id="WixUI_Minimal" />
   </Fragment>
 </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 @@
         <File Source='web.config' />
       </Component>
     </Feature>
-
-    <UIRef Id="WixUI_Minimal" />
   </Package>
 </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 @@
   <ItemGroup>
     <!-- SkipPublish="true" BindPath="$(MSBuildProjectDirectory)\does\not\exist" BindName="Xxx" Publish="true" -->
     <ProjectReference Include="..\CsprojWebApplicationNetCore\CsprojWebApplicationNetCore.csproj" Publish="true" />
-    <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0-preview.0" />
   </ItemGroup>
 
   <!-- <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 @@
 
       <MergeRef Id='WinFormsModule' />
     </Feature>
-
-    <UIRef Id="WixUI_Minimal" />
   </Package>
 </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 @@
     <ProjectReference Include="..\VcxprojWindowsApp\VcxprojWindowsApp.vcxproj" />
     <ProjectReference Include="..\WixprojLibraryVcxprojDll\WixprojLibraryVcxprojDll.wixproj" />
     <ProjectReference Include="..\WixprojModuleCsprojWinFormsNetFx\WixprojModuleCsprojWinFormsNetFx.wixproj" />
-
-    <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0-preview.0" />
   </ItemGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb