aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.CoreIntegration/TestData/Media
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-04-05 12:55:26 -0700
committerRob Mensching <rob@firegiant.com>2021-04-06 16:10:05 -0700
commit860f77f7c9d522074dc7e44cfe11281efd20687f (patch)
tree49527e82264f2dac88247885e937f935ae2ac658 /src/test/WixToolsetTest.CoreIntegration/TestData/Media
parent94db5671e85ce63487e3a415251cad0eb6abe3d1 (diff)
downloadwix-860f77f7c9d522074dc7e44cfe11281efd20687f.tar.gz
wix-860f77f7c9d522074dc7e44cfe11281efd20687f.tar.bz2
wix-860f77f7c9d522074dc7e44cfe11281efd20687f.zip
Introduce "Subdirectory" which simplifies inline directory syntax
Completes wixtoolset/issues#4727
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/TestData/Media')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Media/MultiMedia.wxs8
1 files changed, 4 insertions, 4 deletions
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 @@
8 <Media Id="2" Cabinet="cab2.cab" /> 8 <Media Id="2" Cabinet="cab2.cab" />
9 9
10 <Feature Id="ProductFeature" Title="MsiPackageTitle"> 10 <Feature Id="ProductFeature" Title="MsiPackageTitle">
11 <Component Directory="ProgramFilesFolder:\~MultiMedia" DiskId="1"> 11 <Component Directory="ProgramFilesFolder" Subdirectory="~MultiMedia" DiskId="1">
12 <File Source="a1.txt" /> 12 <File Source="a1.txt" />
13 </Component> 13 </Component>
14 14
15 <Component Directory="ProgramFilesFolder:\~MultiMedia" DiskId="1"> 15 <Component Directory="ProgramFilesFolder" Subdirectory="~MultiMedia" DiskId="1">
16 <File Source="a2.txt" /> 16 <File Source="a2.txt" />
17 </Component> 17 </Component>
18 18
19 <Component Directory="ProgramFilesFolder:\~MultiMedia" DiskId="2"> 19 <Component Directory="ProgramFilesFolder" Subdirectory="~MultiMedia" DiskId="2">
20 <File Source="b2.txt" /> 20 <File Source="b2.txt" />
21 </Component> 21 </Component>
22 22
23 <Component Directory="ProgramFilesFolder:\~MultiMedia" DiskId="2"> 23 <Component Directory="ProgramFilesFolder" Subdirectory="~MultiMedia" DiskId="2">
24 <File Source="b1.txt" /> 24 <File Source="b1.txt" />
25 </Component> 25 </Component>
26 </Feature> 26 </Feature>