From 9cec24c6bf89c9174ca712c6a89ab7e231fa672c Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Thu, 15 Apr 2021 18:48:32 -0500
Subject: Fix StandardDirectory warnings.

---
 src/TestData/DependencyTests/PackageDv1/Package.wxs | 13 +++++--------
 src/TestData/Templates/Package.wxs                  | 13 +++++--------
 src/TestData/Templates/PackageFail.wxs              | 12 +++++-------
 src/TestData/Templates/PackagePerUser.wxs           | 12 +++++-------
 4 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/src/TestData/DependencyTests/PackageDv1/Package.wxs b/src/TestData/DependencyTests/PackageDv1/Package.wxs
index 348f8ebb..e3089c7c 100644
--- a/src/TestData/DependencyTests/PackageDv1/Package.wxs
+++ b/src/TestData/DependencyTests/PackageDv1/Package.wxs
@@ -35,16 +35,13 @@
   </Package>
 
   <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="LocalAppDataFolder" />
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="WixDir" Name="~Test WiX">
-          <Directory Id="TestDir" Name="$(var.TestGroupName)">
-            <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
-          </Directory>
+    <StandardDirectory Id="ProgramFilesFolder">
+      <Directory Id="WixDir" Name="~Test WiX">
+        <Directory Id="TestDir" Name="$(var.TestGroupName)">
+          <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
         </Directory>
       </Directory>
-    </Directory>
+    </StandardDirectory>
   </Fragment>
 
   <Fragment>
diff --git a/src/TestData/Templates/Package.wxs b/src/TestData/Templates/Package.wxs
index caf28a92..e2aaa079 100644
--- a/src/TestData/Templates/Package.wxs
+++ b/src/TestData/Templates/Package.wxs
@@ -35,16 +35,13 @@
   </Package>
 
   <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="CommonAppDataFolder" />
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="WixDir" Name="~Test WiX">
-          <Directory Id="TestDir" Name="$(var.TestGroupName)">
-            <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
-          </Directory>
+    <StandardDirectory Id="ProgramFilesFolder">
+      <Directory Id="WixDir" Name="~Test WiX">
+        <Directory Id="TestDir" Name="$(var.TestGroupName)">
+          <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
         </Directory>
       </Directory>
-    </Directory>
+    </StandardDirectory>
   </Fragment>
 
   <Fragment>
diff --git a/src/TestData/Templates/PackageFail.wxs b/src/TestData/Templates/PackageFail.wxs
index 54921ec6..0139c22b 100644
--- a/src/TestData/Templates/PackageFail.wxs
+++ b/src/TestData/Templates/PackageFail.wxs
@@ -23,15 +23,13 @@
   </Package>
 
   <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="WixDir" Name="~Test WiX">
-          <Directory Id="TestDir" Name="$(var.TestGroupName)">
-            <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
-          </Directory>
+    <StandardDirectory Id="ProgramFilesFolder">
+      <Directory Id="WixDir" Name="~Test WiX">
+        <Directory Id="TestDir" Name="$(var.TestGroupName)">
+          <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
         </Directory>
       </Directory>
-    </Directory>
+    </StandardDirectory>
   </Fragment>
 
   <Fragment>
diff --git a/src/TestData/Templates/PackagePerUser.wxs b/src/TestData/Templates/PackagePerUser.wxs
index 25133fb4..5e18fefd 100644
--- a/src/TestData/Templates/PackagePerUser.wxs
+++ b/src/TestData/Templates/PackagePerUser.wxs
@@ -35,15 +35,13 @@
   </Package>
 
   <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="LocalAppDataFolder">
-        <Directory Id="WixDir" Name="~Test WiX">
-          <Directory Id="TestDir" Name="$(var.TestGroupName)">
-            <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
-          </Directory>
+    <StandardDirectory Id="LocalAppDataFolder">
+      <Directory Id="WixDir" Name="~Test WiX">
+        <Directory Id="TestDir" Name="$(var.TestGroupName)">
+          <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
         </Directory>
       </Directory>
-    </Directory>
+    </StandardDirectory>
   </Fragment>
 
   <Fragment>
-- 
cgit v1.2.3-55-g6feb