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/OverridableActions | |
| 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/OverridableActions')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs index 6d9e854d..0bf0e963 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/OverridableActions/Package.wxs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine"> | 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="no" InstallerVersion="200" Scope="perMachine"> |
| 3 | 3 | ||
| 4 | 4 | ||
| @@ -41,10 +41,8 @@ | |||
| 41 | </Fragment> | 41 | </Fragment> |
| 42 | 42 | ||
| 43 | <Fragment Id="Directories"> | 43 | <Fragment Id="Directories"> |
| 44 | <Directory Id="TARGETDIR" Name="SourceDir"> | 44 | <StandardDirectory Id="ProgramFilesFolder"> |
| 45 | <Directory Id="ProgramFilesFolder"> | 45 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
| 46 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 46 | </StandardDirectory> |
| 47 | </Directory> | ||
| 48 | </Directory> | ||
| 49 | </Fragment> | 47 | </Fragment> |
| 50 | </Wix> | 48 | </Wix> |