From bfceba63a439478543a52d56c882ffd941b6a008 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 7 Apr 2021 14:58:47 -0700
Subject: Update to StandardDirectory

---
 .../TestData/MergeModule/MergeMsiPackage/Package.wxs       | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage')

diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs
index 71d8fff6..ef62c31b 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs
@@ -1,7 +1,5 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<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" Compressed="yes" InstallerVersion="200">
-    
-
     <MediaTemplate />
 
     <Feature Id="ProductFeature" Title="ATitle">
@@ -10,12 +8,10 @@
   </Package>
 
   <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="MsiPackage">
-          <Merge Id="SimpleMM" Language="1033" SourceFile="$(var.SimpleMergeModule.TargetPath)" DiskId="1" />
-        </Directory>
+    <StandardDirectory Id="ProgramFilesFolder">
+      <Directory Id="INSTALLFOLDER" Name="MsiPackage">
+        <Merge Id="SimpleMM" Language="1033" SourceFile="$(var.SimpleMergeModule.TargetPath)" DiskId="1" />
       </Directory>
-    </Directory>
+    </StandardDirectory>
   </Fragment>
 </Wix>
-- 
cgit v1.2.3-55-g6feb