diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-04-06 09:34:57 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-04-06 16:10:05 -0700 |
| commit | 86e59fdbc94ae661ca682f04cddb60d7830ae8a8 (patch) | |
| tree | 227b19100f4f116abdd4b4996688a86d58ad3d32 /src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable | |
| parent | 860f77f7c9d522074dc7e44cfe11281efd20687f (diff) | |
| download | wix-86e59fdbc94ae661ca682f04cddb60d7830ae8a8.tar.gz wix-86e59fdbc94ae661ca682f04cddb60d7830ae8a8.tar.bz2 wix-86e59fdbc94ae661ca682f04cddb60d7830ae8a8.zip | |
Introduce StandardDirectory for referencing standard directories
Completes wixtoolset/issues#6416
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs index 935cc8b3..d7d86008 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable-Expected.wxs | |||
| @@ -12,17 +12,14 @@ | |||
| 12 | <Data Column="Component_" Value="test.txt" /> | 12 | <Data Column="Component_" Value="test.txt" /> |
| 13 | </Row> | 13 | </Row> |
| 14 | </CustomTable> | 14 | </CustomTable> |
| 15 | <Directory Id="TARGETDIR" Name="SourceDir"> | 15 | <StandardDirectory Id="ProgramFiles6432Folder"> |
| 16 | <Directory Id="ProgramFilesFolder" Name="PFiles"> | 16 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="1egc1laj"> |
| 17 | <Directory Id="ProgramFiles6432Folder"> | 17 | <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32"> |
| 18 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" ShortName="1egc1laj"> | 18 | <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="MsiPackage\test.txt" /> |
| 19 | <Component Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Guid="{E597A58A-03CB-50D8-93E3-DABA263F233A}" Bitness="always32"> | 19 | </Component> |
| 20 | <File Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" Name="test.txt" KeyPath="yes" Source="SourceDir\PFiles\\MsiPackage\test.txt" /> | ||
| 21 | </Component> | ||
| 22 | </Directory> | ||
| 23 | </Directory> | ||
| 24 | </Directory> | 20 | </Directory> |
| 25 | </Directory> | 21 | </StandardDirectory> |
| 22 | <StandardDirectory Id="ProgramFilesFolder" /> | ||
| 26 | <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle"> | 23 | <Feature Id="ProductFeature" Level="1" Title="MsiPackageTitle"> |
| 27 | <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" /> | 24 | <ComponentRef Id="filcV1yrx0x8wJWj4qMzcH21jwkPko" /> |
| 28 | </Feature> | 25 | </Feature> |