@joebigelow / wix-1 / commits / bfceba63

Update to StandardDirectory

Rob Mensching committed Apr 7, 2021 at 14:58 UTC bfceba63a439478543a52d56c882ffd941b6a008
9 files changed +37 -61
src/ThmViewerPackage/Package.wxs
+7 -11
@@ -1,8 +1,6 @@
1 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3 <Package Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)" UpgradeCode="59c4b122-5167-445b-8fc4-09dcd4eced89" Compressed="yes" InstallerVersion="200">
4 -
5 -
4 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
5 <MediaTemplate EmbedCab="yes" />
6
@@ -12,7 +10,7 @@
10 </Package>
11
12 <Fragment>
15 - <ComponentGroup Id="Components" Directory="INSTALLFOLDER:\bin\">
13 + <ComponentGroup Id="Components" Directory="INSTALLFOLDER" Subdirectory="bin">
14 <Component>
15 <File Id="ThmViewerFile" Source="thmviewer.exe" />
16 <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" />
@@ -21,14 +19,12 @@
19 </Fragment>
20
21 <Fragment>
24 - <Directory Id="TARGETDIR" Name="SourceDir">
25 - <Directory Id="ProgramFilesFolder">
26 - <Directory Id="INSTALLFOLDER" Name="WiX Toolset v4.0" />
27 - </Directory>
28 - <Directory Id="ProgramMenuFolder">
29 - <Directory Id="ShortcutFolder" Name="WiX Toolset" />
30 - </Directory>
31 - </Directory>
22 + <StandardDirectory Id="ProgramFilesFolder">
23 + <Directory Id="INSTALLFOLDER" Name="WiX Toolset v4.0" />
24 + </StandardDirectory>
25 + <StandardDirectory Id="ProgramMenuFolder">
26 + <Directory Id="ShortcutFolder" Name="WiX Toolset" />
27 + </StandardDirectory>
28 </Fragment>
29
30 </Wix>
src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs
+4 -6
@@ -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="HeatFilePackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200">
3
4
@@ -11,10 +11,8 @@
11 </Package>
12
13 <Fragment>
14 - <Directory Id="TARGETDIR" Name="SourceDir">
15 - <Directory Id="ProgramFilesFolder">
16 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
17 - </Directory>
18 - </Directory>
14 + <StandardDirectory Id="ProgramFilesFolder">
15 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
16 + </StandardDirectory>
17 </Fragment>
18 </Wix>
src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs
+5 -7
@@ -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="HeatFilePackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200">
3
4
@@ -10,10 +10,8 @@
10 </Package>
11
12 <Fragment>
13 - <Directory Id="TARGETDIR" Name="SourceDir">
14 - <Directory Id="ProgramFilesFolder">
15 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
16 - </Directory>
17 - </Directory>
18 - </Fragment>
13 + <StandardDirectory Id="ProgramFilesFolder">
14 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
15 + </StandardDirectory>
16 +</Fragment>
17 </Wix>
src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs
+4 -6
@@ -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="HeatProjectPreSdkStyle" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5622BB42-89F6-4810-A2A3-98AFF28282FE" Compressed="yes" InstallerVersion="200">
3
4
@@ -10,10 +10,8 @@
10 </Package>
11
12 <Fragment>
13 - <Directory Id="TARGETDIR" Name="SourceDir">
14 - <Directory Id="ProgramFilesFolder">
15 - <Directory Id="ToolsVersion4Cs.Binaries" Name="MsiPackage" />
16 - </Directory>
17 - </Directory>
13 + <StandardDirectory Id="ProgramFilesFolder">
14 + <Directory Id="ToolsVersion4Cs.Binaries" Name="MsiPackage" />
15 + </StandardDirectory>
16 </Fragment>
17 </Wix>
src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs
+4 -6
@@ -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="HeatProjectSdkStyle" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="D2AF3276-A68E-40DE-85A1-4BCD5B35D432" Compressed="yes" InstallerVersion="200">
3
4
@@ -10,10 +10,8 @@
10 </Package>
11
12 <Fragment>
13 - <Directory Id="TARGETDIR" Name="SourceDir">
14 - <Directory Id="ProgramFilesFolder">
15 - <Directory Id="SdkStyleCs.Binaries" Name="MsiPackage" />
16 - </Directory>
17 - </Directory>
13 + <StandardDirectory Id="ProgramFilesFolder">
14 + <Directory Id="SdkStyleCs.Binaries" Name="MsiPackage" />
15 + </StandardDirectory>
16 </Fragment>
17 </Wix>
src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs
+5 -9
@@ -1,7 +1,5 @@
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="yes" InstallerVersion="200">
3 -
4 -
3 <MediaTemplate />
4
5 <Feature Id="ProductFeature" Title="ATitle">
@@ -10,12 +8,10 @@
8 </Package>
9
10 <Fragment>
13 - <Directory Id="TARGETDIR" Name="SourceDir">
14 - <Directory Id="ProgramFilesFolder">
15 - <Directory Id="INSTALLFOLDER" Name="MsiPackage">
16 - <Merge Id="SimpleMM" Language="1033" SourceFile="$(var.SimpleMergeModule.TargetPath)" DiskId="1" />
17 - </Directory>
11 + <StandardDirectory Id="ProgramFilesFolder">
12 + <Directory Id="INSTALLFOLDER" Name="MsiPackage">
13 + <Merge Id="SimpleMM" Language="1033" SourceFile="$(var.SimpleMergeModule.TargetPath)" DiskId="1" />
14 </Directory>
19 - </Directory>
15 + </StandardDirectory>
16 </Fragment>
17 </Wix>
src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs
+2 -4
@@ -1,4 +1,4 @@
1 -<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
1 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Module Id="SimpleMM" Language="1033" Version="1.0.0.0" Guid="86FB9E91-ACF3-4EDF-B711-72DAF2443692" InstallerVersion="200">
3 <SummaryInformation Manufacturer="Example Corporation" />
4
@@ -6,9 +6,7 @@
6 </Module>
7
8 <Fragment>
9 - <Directory Id="TARGETDIR" Name="SourceDir">
10 - <Directory Id="MergeRedirectFolder" />
11 - </Directory>
9 + <Directory Id="MergeRedirectFolder" />
10 </Fragment>
11
12 <Fragment>
src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
+4 -8
@@ -1,7 +1,5 @@
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="yes" InstallerVersion="200">
3 -
4 -
3 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
4 <MediaTemplate />
5
@@ -11,10 +9,8 @@
9 </Package>
10
11 <Fragment>
14 - <Directory Id="TARGETDIR" Name="SourceDir">
15 - <Directory Id="ProgramFilesFolder">
16 - <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
17 - </Directory>
18 - </Directory>
12 + <StandardDirectory Id="ProgramFilesFolder">
13 + <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
14 + </StandardDirectory>
15 </Fragment>
16 </Wix>
src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
+2 -4
@@ -12,10 +12,8 @@
12 </Package>
13
14 <Fragment>
15 - <Directory Id="TARGETDIR" Name="SourceDir">
16 - <Directory Id="ProgramFilesFolder">
15 + <StandardDirectory Id="ProgramFilesFolder">
16 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
18 - </Directory>
19 - </Directory>
17 + </StandardDirectory>
18 </Fragment>
19 </Wix>