From 0f0f825506753e889938a3e0b6bd5177fbbb43ab Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Tue, 6 Apr 2021 20:30:51 -0400
Subject: Update dependencies.

---
 .../TestData/BundleWithSearches/Bundle.en-us.wxl   |  4 +---
 .../TestData/CloseApplication/Package.en-us.wxl    |  4 +---
 .../TestData/CloseApplication/Package.wxs          |  8 +++----
 .../CloseApplication/PackageComponents.wxs         |  2 +-
 .../TestData/EventManifest/Package.en-us.wxl       |  4 +---
 .../TestData/EventManifest/Package.wxs             | 10 ++++----
 .../TestData/InternetShortcut/Package.en-us.wxl    |  4 +---
 .../TestData/InternetShortcut/Package.wxs          | 10 ++++----
 .../TestData/InternetShortcutModule/Module.wxs     | 10 ++++----
 .../TestData/PermissionEx/Package.en-us.wxl        |  4 +---
 .../TestData/PermissionEx/Package.wxs              | 10 ++++----
 .../TestData/Queries/Package.en-us.wxl             |  4 +---
 .../TestData/Queries/Package.wxs                   | 13 +++++------
 .../TestData/Queries/PackageComponents.wxs         |  2 +-
 .../TestData/RemoveFolderEx/Module.wxs             | 10 ++++----
 .../TestData/UsingFileShare/Package.en-us.wxl      |  4 +---
 .../TestData/UsingFileShare/Package.wxs            |  8 +++----
 .../TestData/XmlConfig/Package.en-us.wxl           |  4 +---
 .../TestData/XmlConfig/Package.wxs                 | 20 ++++------------
 .../TestData/XmlConfigModule/Module.wxs            | 27 +++++-----------------
 20 files changed, 53 insertions(+), 109 deletions(-)

(limited to 'src/test')

diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl
index bc1dee83..f50a5386 100644
--- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl
+++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
+<!--
 This file contains the declaration of all the localizable strings.
 -->
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl
index 38c12ac1..5301bb1a 100644
--- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl
+++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
+<!--
 This file contains the declaration of all the localizable strings.
 -->
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs
index 410b151d..8e054256 100644
--- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs
@@ -10,10 +10,8 @@
     </Package>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
+            <StandardDirectory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </Directory>
-        </Directory>
-    </Fragment>
+            </StandardDirectory>
+        </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs
index 49f29600..e27b3c43 100644
--- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs
@@ -1,4 +1,4 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Fragment>
         <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
             <Component>
diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl
index 38c12ac1..5301bb1a 100644
--- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl
+++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
+<!--
 This file contains the declaration of all the localizable strings.
 -->
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs
index 09d2c46e..daae573a 100644
--- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs
@@ -1,4 +1,4 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<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">
         <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
@@ -8,10 +8,8 @@
     </Package>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
+            <StandardDirectory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </Directory>
-        </Directory>
-    </Fragment>
+            </StandardDirectory>
+        </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl
index 38c12ac1..5301bb1a 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl
+++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
+<!--
 This file contains the declaration of all the localizable strings.
 -->
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
index 09d2c46e..daae573a 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
@@ -1,4 +1,4 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<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">
         <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
@@ -8,10 +8,8 @@
     </Package>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
+            <StandardDirectory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </Directory>
-        </Directory>
-    </Fragment>
+            </StandardDirectory>
+        </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs
index 2a9daa1c..1355d42e 100644
--- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs
@@ -1,4 +1,4 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Module Language="1033" Version="1.0.0.0" Id="InternetShortcutModule" Guid="047730a5-30fe-4a62-a520-da9381b8226a">
         <SummaryInformation Manufacturer="Example Corporation" />
 
@@ -6,10 +6,8 @@
     </Module>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
+            <StandardDirectory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLFOLDER" Name="MergeModule" />
-            </Directory>
-        </Directory>
-    </Fragment>
+            </StandardDirectory>
+        </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl
index 38c12ac1..5301bb1a 100644
--- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl
+++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
+<!--
 This file contains the declaration of all the localizable strings.
 -->
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs
index 09d2c46e..daae573a 100644
--- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs
@@ -1,4 +1,4 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<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">
         <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
@@ -8,10 +8,8 @@
     </Package>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
+            <StandardDirectory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </Directory>
-        </Directory>
-    </Fragment>
+            </StandardDirectory>
+        </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl
index 38c12ac1..5301bb1a 100644
--- a/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl
+++ b/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
+<!--
 This file contains the declaration of all the localizable strings.
 -->
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
index 43365cc3..abf0dbb4 100644
--- a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
@@ -12,13 +12,12 @@
         </Feature>
     </Package>
 
-    <Fragment>
-        <util:BroadcastSettingChange />
+    <Fragment><util:BroadcastSettingChange />
         
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
+        
+    
+            <StandardDirectory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </Directory>
-        </Directory>
-    </Fragment>
+            </StandardDirectory>
+        </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs
index e2dce4ae..e27b3c43 100644
--- a/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs
@@ -1,4 +1,4 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Fragment>
         <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
             <Component>
diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs b/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs
index 39674278..2c2be584 100644
--- a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs
@@ -1,4 +1,4 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Module Language="1033" Version="1.0.0.0" Id="InternetShortcutModule" Guid="047730a5-30fe-4a62-a520-da9381b8226a">
         <SummaryInformation Manufacturer="Example Corporation" />
 
@@ -6,10 +6,8 @@
     </Module>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
+            <StandardDirectory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLFOLDER" Name="MergeModule" />
-            </Directory>
-        </Directory>
-    </Fragment>
+            </StandardDirectory>
+        </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl
index 38c12ac1..5301bb1a 100644
--- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl
+++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
+<!--
 This file contains the declaration of all the localizable strings.
 -->
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs
index 873b137e..daae573a 100644
--- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs
@@ -8,10 +8,8 @@
     </Package>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
+            <StandardDirectory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </Directory>
-        </Directory>
-    </Fragment>
+            </StandardDirectory>
+        </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl
index 38c12ac1..5301bb1a 100644
--- a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl
+++ b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
+<!--
 This file contains the declaration of all the localizable strings.
 -->
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs
index 21f75f8f..a2002634 100644
--- a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs
@@ -1,27 +1,17 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
     <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
         <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
         <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
             <Component Id="Del" Directory="INSTALLFOLDER" Guid="3613414c-11f5-40fa-a1f1-a0ba722a6895">
-                <util:XmlConfig
-                    Id="DelElement"
-                    File="[INSTALLFOLDER]my.xml"
-                    Action="delete"
-                    Node="element"
-                    VerifyPath="xxx"
-                    ElementPath="//root/sub"
-                    On="install"
-                    Sequence="1" />
+                <util:XmlConfig Id="DelElement" File="[INSTALLFOLDER]my.xml" Action="delete" Node="element" VerifyPath="xxx" ElementPath="//root/sub" On="install" Sequence="1" />
             </Component>
         </Feature>
     </Package>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
+            <StandardDirectory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </Directory>
-        </Directory>
-    </Fragment>
+            </StandardDirectory>
+        </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs b/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs
index 93f5eeb1..29e8555b 100644
--- a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs
+++ b/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs
@@ -1,34 +1,19 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
     <Module Id="XmlConfigModule" Language="1033" Version="1.0.0.0" Guid="047730a5-30fe-4a62-a520-da9381b8226a">
 
         <Component Id="Parent" Directory="INSTALLFOLDER">
             <File Id="my.xml" Source="my.xml" />
-            <util:XmlConfig
-                Id="AddElement"
-                File="[my.xml]"
-                Action="create"
-                Node="element"
-                VerifyPath="xxx"
-                ElementPath="//root/sub"
-                On="install"
-                Sequence="1" />
+            <util:XmlConfig Id="AddElement" File="[my.xml]" Action="create" Node="element" VerifyPath="xxx" ElementPath="//root/sub" On="install" Sequence="1" />
         </Component>
 
         <Component Id="Child" Directory="INSTALLFOLDER" Guid="4613414c-11f5-40fa-a1f1-a0ba722a6895">
-            <util:XmlConfig
-                Id="ChildElement"
-                File="[my.xml]"
-                VerifyPath="xxx"
-                ElementId="AddElement"
-                Sequence="1" />
+            <util:XmlConfig Id="ChildElement" File="[my.xml]" VerifyPath="xxx" ElementId="AddElement" Sequence="1" />
         </Component>
     </Module>
 
     <Fragment>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFilesFolder">
+            <StandardDirectory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-            </Directory>
-        </Directory>
-    </Fragment>
+            </StandardDirectory>
+        </Fragment>
 </Wix>
-- 
cgit v1.2.3-55-g6feb