Introduce "Subdirectory" which simplifies inline directory syntax

Completes wixtoolset/issues#4727

8 files changed, 26 insertions, 16 deletions

diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CopyFile/CopyFile.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CopyFile/CopyFile.wxs
index 66208806..90d66cc3 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CopyFile/CopyFile.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CopyFile/CopyFile.wxs
@@ -10,6 +10,8 @@
     </Fragment>
 
     <Fragment>
-        <Directory Id="OtherFolder" Name="INSTALLFOLDER:\other" />
+        <DirectoryRef Id="INSTALLFOLDER">
+            <Directory Id="OtherFolder" Name="other" />
+        </DirectoryRef>
     </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DuplicateDir/DuplicateDir.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DuplicateDir/DuplicateDir.wxs
index ffee969d..a58b68c8 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/DuplicateDir/DuplicateDir.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/DuplicateDir/DuplicateDir.wxs
@@ -8,7 +8,7 @@
     </Fragment>
 
     <Fragment>
-        <ComponentGroup Id="GroupA" Directory="INSTALLFOLDER:\dupe">
+        <ComponentGroup Id="GroupA" Directory="INSTALLFOLDER" Subdirectory="dupe">
             <Component>
                 <File Name="a.txt" Source="test.txt" />
             </Component>
@@ -16,7 +16,7 @@
     </Fragment>
 
     <Fragment>
-        <ComponentGroup Id="GroupB" Directory="INSTALLFOLDER:\dupe">
+        <ComponentGroup Id="GroupB" Directory="INSTALLFOLDER" Subdirectory="dupe">
             <Component>
                 <File Name="b.txt" Source="test.txt" />
             </Component>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxs
index 2bbc14f9..db15796d 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Language/Package.wxs
@@ -11,6 +11,8 @@
   </Package>
 
   <Fragment>
-    <Directory Id="INSTALLFOLDER" Name="ProgramFilesFolder:\MsiPackage" />
+    <DirectoryRef Id="ProgramFilesFolder">
+      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+    </DirectoryRef>
   </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Media/MultiMedia.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Media/MultiMedia.wxs
index 8a555bda..e7492db4 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Media/MultiMedia.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Media/MultiMedia.wxs
@@ -8,19 +8,19 @@
         <Media Id="2" Cabinet="cab2.cab" />
         
         <Feature Id="ProductFeature" Title="MsiPackageTitle">
-            <Component Directory="ProgramFilesFolder:\~MultiMedia" DiskId="1">
+            <Component Directory="ProgramFilesFolder" Subdirectory="~MultiMedia" DiskId="1">
                 <File Source="a1.txt" />
             </Component>
 
-            <Component Directory="ProgramFilesFolder:\~MultiMedia" DiskId="1">
+            <Component Directory="ProgramFilesFolder" Subdirectory="~MultiMedia" DiskId="1">
                 <File Source="a2.txt" />
             </Component>
 
-            <Component Directory="ProgramFilesFolder:\~MultiMedia" DiskId="2">
+            <Component Directory="ProgramFilesFolder" Subdirectory="~MultiMedia" DiskId="2">
                 <File Source="b2.txt" />
             </Component>
 
-            <Component Directory="ProgramFilesFolder:\~MultiMedia" DiskId="2">
+            <Component Directory="ProgramFilesFolder" Subdirectory="~MultiMedia" DiskId="2">
                 <File Source="b1.txt" />
             </Component>
         </Feature>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Package.wxs
index 9d530376..5ad21a75 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNoFileChanges/Package.wxs
@@ -4,7 +4,9 @@
     <MajorUpgrade DowngradeErrorMessage="Newer version already installed." />
     <MediaTemplate EmbedCab="yes" />
 
-    <Directory Id="INSTALLFOLDER" Name="ProgramFilesFolder:\~Test App" />
+    <DirectoryRef Id="ProgramFilesFolder">
+      <Directory Id="INSTALLFOLDER" Name="~Test App" />
+    </DirectoryRef>
 
     <Feature Id="Main">
       <ComponentGroupRef Id="Components" />
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
index f297c9e9..5a4e2c07 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ProductWithComponentGroupRef/Product.wxs
@@ -1,4 +1,4 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="12E4699F-E774-4D05-8A01-5BDD41BBA127" Compressed="no" Scope="perMachine" ProductCode="83f9c623-26fe-42ab-951e-170022117f54">
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
@@ -9,6 +9,8 @@
     </Package>
 
     <Fragment>
-        <Directory Id="INSTALLFOLDER" Name="ProgramFiles6432Folder:\MsiPackage" />
+        <DirectoryRef Id="ProgramFiles6432Folder">
+            <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+        </DirectoryRef>
     </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/TestComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/TestComponents.wxs
index 765e6778..bbad63e6 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/TestComponents.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SameFileFolders/TestComponents.wxs
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <ComponentGroup Id="ProductComponents">
-      <Component  Directory="INSTALLFOLDER:\a">
+    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+      <Component Subdirectory="a">
         <File Source="a\test.txt" />
       </Component>
-      <Component  Directory="INSTALLFOLDER:\b">
+      <Component Subdirectory="b">
         <File Source="b\test.txt" />
       </Component>
-      <Component  Directory="INSTALLFOLDER:\c">
+      <Component Subdirectory="c">
         <File Source="c\test.txt" />
       </Component>
     </ComponentGroup>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.wxs
index 9ddcdc90..70fdbb46 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/UsingProvides/Package.wxs
@@ -9,6 +9,8 @@
   </Package>
 
   <Fragment>
-    <Directory Id="INSTALLFOLDER" Name="ProgramFilesFolder:\MsiPackage" />
+    <DirectoryRef Id="ProgramFilesFolder">
+      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+    </DirectoryRef>
   </Fragment>
 </Wix>