aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-04-07 14:58:47 -0700
committerRob Mensching <rob@firegiant.com>2021-04-07 15:55:29 -0700
commitbfceba63a439478543a52d56c882ffd941b6a008 (patch)
tree467483dc046fd638c54bbf2b33c1a977bcf5b362
parent04dd968856734d40e20802cd07e89f40ac871191 (diff)
downloadwix-bfceba63a439478543a52d56c882ffd941b6a008.tar.gz
wix-bfceba63a439478543a52d56c882ffd941b6a008.tar.bz2
wix-bfceba63a439478543a52d56c882ffd941b6a008.zip
Update to StandardDirectory
Diffstat
-rw-r--r--src/ThmViewerPackage/Package.wxs18
-rw-r--r--src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs12
-rw-r--r--src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs10
-rw-r--r--src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs14
-rw-r--r--src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs6
-rw-r--r--src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs12
-rw-r--r--src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs6
9 files changed, 37 insertions, 61 deletions
diff --git a/src/ThmViewerPackage/Package.wxs b/src/ThmViewerPackage/Package.wxs
index e2c3c9f8..cb2139cf 100644
--- a/src/ThmViewerPackage/Package.wxs
+++ b/src/ThmViewerPackage/Package.wxs
@@ -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. --> 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"> 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"> 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
6 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 4 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
7 <MediaTemplate EmbedCab="yes" /> 5 <MediaTemplate EmbedCab="yes" />
8 6
@@ -12,7 +10,7 @@
12 </Package> 10 </Package>
13 11
14 <Fragment> 12 <Fragment>
15 <ComponentGroup Id="Components" Directory="INSTALLFOLDER:\bin\"> 13 <ComponentGroup Id="Components" Directory="INSTALLFOLDER" Subdirectory="bin">
16 <Component> 14 <Component>
17 <File Id="ThmViewerFile" Source="thmviewer.exe" /> 15 <File Id="ThmViewerFile" Source="thmviewer.exe" />
18 <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" /> 16 <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" />
@@ -21,14 +19,12 @@
21 </Fragment> 19 </Fragment>
22 20
23 <Fragment> 21 <Fragment>
24 <Directory Id="TARGETDIR" Name="SourceDir"> 22 <StandardDirectory Id="ProgramFilesFolder">
25 <Directory Id="ProgramFilesFolder"> 23 <Directory Id="INSTALLFOLDER" Name="WiX Toolset v4.0" />
26 <Directory Id="INSTALLFOLDER" Name="WiX Toolset v4.0" /> 24 </StandardDirectory>
27 </Directory> 25 <StandardDirectory Id="ProgramMenuFolder">
28 <Directory Id="ProgramMenuFolder"> 26 <Directory Id="ShortcutFolder" Name="WiX Toolset" />
29 <Directory Id="ShortcutFolder" Name="WiX Toolset" /> 27 </StandardDirectory>
30 </Directory>
31 </Directory>
32 </Fragment> 28 </Fragment>
33 29
34</Wix> 30</Wix>
diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs
index 4cdcdf15..5abcee9f 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/Package.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/HeatFileMultipleFilesSameFileName/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="HeatFilePackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200"> 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 3
4 4
@@ -11,10 +11,8 @@
11 </Package> 11 </Package>
12 12
13 <Fragment> 13 <Fragment>
14 <Directory Id="TARGETDIR" Name="SourceDir"> 14 <StandardDirectory Id="ProgramFilesFolder">
15 <Directory Id="ProgramFilesFolder"> 15 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
16 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 16 </StandardDirectory>
17 </Directory>
18 </Directory>
19 </Fragment> 17 </Fragment>
20</Wix> 18</Wix>
diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs
index 8e04a8ce..f5fa8cf6 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/Package.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/HeatFilePackage/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="HeatFilePackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200"> 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 3
4 4
@@ -10,10 +10,8 @@
10 </Package> 10 </Package>
11 11
12 <Fragment> 12 <Fragment>
13 <Directory Id="TARGETDIR" Name="SourceDir"> 13 <StandardDirectory Id="ProgramFilesFolder">
14 <Directory Id="ProgramFilesFolder"> 14 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
15 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 15 </StandardDirectory>
16 </Directory> 16</Fragment>
17 </Directory>
18 </Fragment>
19</Wix> 17</Wix>
diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs
index b2988760..6c12861b 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/Package.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectPreSdkStyle/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="HeatProjectPreSdkStyle" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5622BB42-89F6-4810-A2A3-98AFF28282FE" Compressed="yes" InstallerVersion="200"> 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 3
4 4
@@ -10,10 +10,8 @@
10 </Package> 10 </Package>
11 11
12 <Fragment> 12 <Fragment>
13 <Directory Id="TARGETDIR" Name="SourceDir"> 13 <StandardDirectory Id="ProgramFilesFolder">
14 <Directory Id="ProgramFilesFolder"> 14 <Directory Id="ToolsVersion4Cs.Binaries" Name="MsiPackage" />
15 <Directory Id="ToolsVersion4Cs.Binaries" Name="MsiPackage" /> 15 </StandardDirectory>
16 </Directory>
17 </Directory>
18 </Fragment> 16 </Fragment>
19</Wix> 17</Wix>
diff --git a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs
index fc6e9d29..d30218f3 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/Package.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/HeatProject/HeatProjectSdkStyle/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="HeatProjectSdkStyle" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="D2AF3276-A68E-40DE-85A1-4BCD5B35D432" Compressed="yes" InstallerVersion="200"> 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 3
4 4
@@ -10,10 +10,8 @@
10 </Package> 10 </Package>
11 11
12 <Fragment> 12 <Fragment>
13 <Directory Id="TARGETDIR" Name="SourceDir"> 13 <StandardDirectory Id="ProgramFilesFolder">
14 <Directory Id="ProgramFilesFolder"> 14 <Directory Id="SdkStyleCs.Binaries" Name="MsiPackage" />
15 <Directory Id="SdkStyleCs.Binaries" Name="MsiPackage" /> 15 </StandardDirectory>
16 </Directory>
17 </Directory>
18 </Fragment> 16 </Fragment>
19</Wix> 17</Wix>
diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs
index 71d8fff6..ef62c31b 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/Package.wxs
@@ -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"> 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
5 <MediaTemplate /> 3 <MediaTemplate />
6 4
7 <Feature Id="ProductFeature" Title="ATitle"> 5 <Feature Id="ProductFeature" Title="ATitle">
@@ -10,12 +8,10 @@
10 </Package> 8 </Package>
11 9
12 <Fragment> 10 <Fragment>
13 <Directory Id="TARGETDIR" Name="SourceDir"> 11 <StandardDirectory Id="ProgramFilesFolder">
14 <Directory Id="ProgramFilesFolder"> 12 <Directory Id="INSTALLFOLDER" Name="MsiPackage">
15 <Directory Id="INSTALLFOLDER" Name="MsiPackage"> 13 <Merge Id="SimpleMM" Language="1033" SourceFile="$(var.SimpleMergeModule.TargetPath)" DiskId="1" />
16 <Merge Id="SimpleMM" Language="1033" SourceFile="$(var.SimpleMergeModule.TargetPath)" DiskId="1" />
17 </Directory>
18 </Directory> 14 </Directory>
19 </Directory> 15 </StandardDirectory>
20 </Fragment> 16 </Fragment>
21</Wix> 17</Wix>
diff --git a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs
index 19a7b7e4..b892debd 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/MergeModule.wxs
@@ -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"> 2 <Module Id="SimpleMM" Language="1033" Version="1.0.0.0" Guid="86FB9E91-ACF3-4EDF-B711-72DAF2443692" InstallerVersion="200">
3 <SummaryInformation Manufacturer="Example Corporation" /> 3 <SummaryInformation Manufacturer="Example Corporation" />
4 4
@@ -6,9 +6,7 @@
6 </Module> 6 </Module>
7 7
8 <Fragment> 8 <Fragment>
9 <Directory Id="TARGETDIR" Name="SourceDir"> 9 <Directory Id="MergeRedirectFolder" />
10 <Directory Id="MergeRedirectFolder" />
11 </Directory>
12 </Fragment> 10 </Fragment>
13 11
14 <Fragment> 12 <Fragment>
diff --git a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
index 4bdebbcf..df24aa33 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
@@ -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"> 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
5 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> 3 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
6 <MediaTemplate /> 4 <MediaTemplate />
7 5
@@ -11,10 +9,8 @@
11 </Package> 9 </Package>
12 10
13 <Fragment> 11 <Fragment>
14 <Directory Id="TARGETDIR" Name="SourceDir"> 12 <StandardDirectory Id="ProgramFilesFolder">
15 <Directory Id="ProgramFilesFolder"> 13 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
16 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 14 </StandardDirectory>
17 </Directory>
18 </Directory>
19 </Fragment> 15 </Fragment>
20</Wix> 16</Wix>
diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
index 3fd580db..0a133c7d 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
@@ -12,10 +12,8 @@
12 </Package> 12 </Package>
13 13
14 <Fragment> 14 <Fragment>
15 <Directory Id="TARGETDIR" Name="SourceDir"> 15 <StandardDirectory Id="ProgramFilesFolder">
16 <Directory Id="ProgramFilesFolder">
17 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 16 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
18 </Directory> 17 </StandardDirectory>
19 </Directory>
20 </Fragment> 18 </Fragment>
21</Wix> 19</Wix>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-31 21:01:08 +0000