From 413660d8e47aebb875762db9530862690507cac7 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 26 Jul 2020 23:22:10 -0400
Subject: Fix WixUI_Advanced test and update VC++.

---
 UI.wixext.sln                                                  | 4 ++--
 src/ca/uica.vcxproj                                            | 2 +-
 src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs | 6 +++++-
 src/test/WixToolsetTest.UI/UIExtensionFixture.cs               | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/UI.wixext.sln b/UI.wixext.sln
index 02e8c77b..bab6232e 100644
--- a/UI.wixext.sln
+++ b/UI.wixext.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2003
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30320.27
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uica", "src\ca\uica.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}"
 EndProject
diff --git a/src/ca/uica.vcxproj b/src/ca/uica.vcxproj
index e55494f2..b9d015e4 100644
--- a/src/ca/uica.vcxproj
+++ b/src/ca/uica.vcxproj
@@ -21,7 +21,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <TargetName>uica</TargetName>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <ProjectModuleDefinitionFile>uica.def</ProjectModuleDefinitionFile>
     <Description>WiX Toolset UI CustomAction</Description>
   </PropertyGroup>
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
index 2c3ca0a0..2d383f70 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
@@ -16,12 +16,16 @@
         </ComponentGroup>
 
         <UIRef Id="WixUI_Advanced" />
+        <Property Id="ApplicationFolderName" Value="MyProgram"/>
+        <Property Id="WixAppFolder" Value="WixPerMachineFolder"/>
     </Product>
 
     <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+                <Directory Id="INSTALLFOLDER" Name="MsiPackage">
+                    <Directory Id="APPLICATIONFOLDER" Name="." />
+                </Directory>
             </Directory>
         </Directory>
     </Fragment>
diff --git a/src/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/test/WixToolsetTest.UI/UIExtensionFixture.cs
index 09cc26f9..5c63587a 100644
--- a/src/test/WixToolsetTest.UI/UIExtensionFixture.cs
+++ b/src/test/WixToolsetTest.UI/UIExtensionFixture.cs
@@ -10,7 +10,7 @@ namespace WixToolsetTest.UI
 
     public class UIExtensionFixture
     {
-        [Fact(Skip = "WixUI_Advanced is missing because it can't currently compile in v4")]
+        [Fact]
         public void CanBuildUsingWixUIAdvanced()
         {
             var folder = TestData.Get(@"TestData\WixUI_Advanced");
-- 
cgit v1.2.3-55-g6feb