From a3fcca48e4258f37ce2f51502f7863942e8b23fe Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 8 Apr 2021 07:29:26 -0700
Subject: Update dependencies

---
 .../WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs   | 13 ++++---------
 .../TestData/WixUI_FeatureTree/Package.wxs                  | 11 +++--------
 .../WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs | 11 +++--------
 .../WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs    | 11 +++--------
 src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs | 11 +++--------
 5 files changed, 16 insertions(+), 41 deletions(-)

(limited to 'src/test')

diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
index 2e416f0f..5ce4b00f 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
@@ -1,9 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
-        
-
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-        
 
         <Feature Id="ProductFeature" Title="MsiPackage">
             <ComponentGroupRef Id="ProductComponents" />
@@ -21,12 +18,10 @@
     </Package>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage">
-                    <Directory Id="APPLICATIONFOLDER" Name="." />
-                </Directory>
+        <StandardDirectory Id="ProgramFilesFolder">
+            <Directory Id="INSTALLFOLDER" Name="MsiPackage">
+                <Directory Id="APPLICATIONFOLDER" />
             </Directory>
-        </Directory>
+        </StandardDirectory>
     </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs
index 5f8cd07d..aff1c077 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs
@@ -1,9 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
-        
-
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-        
 
         <Feature Id="ProductFeature" Title="MsiPackage">
             <ComponentGroupRef Id="ProductComponents" />
@@ -19,10 +16,8 @@
     </Package>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </Directory>
-        </Directory>
+        <StandardDirectory Id="ProgramFilesFolder">
+          <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+        </StandardDirectory>
     </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs
index 4e873add..7c2ceae0 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs
@@ -1,9 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
-        
-
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-        
 
         <Feature Id="ProductFeature" Title="MsiPackage">
             <ComponentGroupRef Id="ProductComponents" />
@@ -19,10 +16,8 @@
     </Package>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </Directory>
-        </Directory>
+        <StandardDirectory Id="ProgramFilesFolder">
+            <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+        </StandardDirectory>
     </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs
index 96ab46ff..d2ff256c 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs
@@ -1,9 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
-        
-
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-        
 
         <Feature Id="ProductFeature" Title="MsiPackage">
             <ComponentGroupRef Id="ProductComponents" />
@@ -19,10 +16,8 @@
     </Package>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </Directory>
-        </Directory>
+        <StandardDirectory Id="ProgramFilesFolder">
+            <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+        </StandardDirectory>
     </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs
index 9bbc4ba0..8d5a856a 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs
@@ -1,9 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
-        
-
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-        
 
         <Feature Id="ProductFeature" Title="MsiPackage">
             <ComponentGroupRef Id="ProductComponents" />
@@ -19,10 +16,8 @@
     </Package>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
-                <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </Directory>
-        </Directory>
+        <StandardDirectory Id="ProgramFilesFolder">
+            <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+        </StandardDirectory>
     </Fragment>
 </Wix>
-- 
cgit v1.2.3-55-g6feb