@joebigelow / wix / commits / 9cec24c6

Fix StandardDirectory warnings.

Sean Hall committed Apr 15, 2021 at 18:48 UTC 9cec24c6bf89c9174ca712c6a89ab7e231fa672c
4 files changed +20 -30
src/TestData/DependencyTests/PackageDv1/Package.wxs
+5 -8
@@ -35,16 +35,13 @@
35 </Package>
36
37 <Fragment>
38 - <Directory Id="TARGETDIR" Name="SourceDir">
39 - <Directory Id="LocalAppDataFolder" />
40 - <Directory Id="ProgramFilesFolder">
41 - <Directory Id="WixDir" Name="~Test WiX">
42 - <Directory Id="TestDir" Name="$(var.TestGroupName)">
43 - <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
44 - </Directory>
38 + <StandardDirectory Id="ProgramFilesFolder">
39 + <Directory Id="WixDir" Name="~Test WiX">
40 + <Directory Id="TestDir" Name="$(var.TestGroupName)">
41 + <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
42 </Directory>
43 </Directory>
47 - </Directory>
44 + </StandardDirectory>
45 </Fragment>
46
47 <Fragment>
src/TestData/Templates/Package.wxs
+5 -8
@@ -35,16 +35,13 @@
35 </Package>
36
37 <Fragment>
38 - <Directory Id="TARGETDIR" Name="SourceDir">
39 - <Directory Id="CommonAppDataFolder" />
40 - <Directory Id="ProgramFilesFolder">
41 - <Directory Id="WixDir" Name="~Test WiX">
42 - <Directory Id="TestDir" Name="$(var.TestGroupName)">
43 - <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
44 - </Directory>
38 + <StandardDirectory Id="ProgramFilesFolder">
39 + <Directory Id="WixDir" Name="~Test WiX">
40 + <Directory Id="TestDir" Name="$(var.TestGroupName)">
41 + <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
42 </Directory>
43 </Directory>
47 - </Directory>
44 + </StandardDirectory>
45 </Fragment>
46
47 <Fragment>
src/TestData/Templates/PackageFail.wxs
+5 -7
@@ -23,15 +23,13 @@
23 </Package>
24
25 <Fragment>
26 - <Directory Id="TARGETDIR" Name="SourceDir">
27 - <Directory Id="ProgramFilesFolder">
28 - <Directory Id="WixDir" Name="~Test WiX">
29 - <Directory Id="TestDir" Name="$(var.TestGroupName)">
30 - <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
31 - </Directory>
26 + <StandardDirectory Id="ProgramFilesFolder">
27 + <Directory Id="WixDir" Name="~Test WiX">
28 + <Directory Id="TestDir" Name="$(var.TestGroupName)">
29 + <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
30 </Directory>
31 </Directory>
34 - </Directory>
32 + </StandardDirectory>
33 </Fragment>
34
35 <Fragment>
src/TestData/Templates/PackagePerUser.wxs
+5 -7
@@ -35,15 +35,13 @@
35 </Package>
36
37 <Fragment>
38 - <Directory Id="TARGETDIR" Name="SourceDir">
39 - <Directory Id="LocalAppDataFolder">
40 - <Directory Id="WixDir" Name="~Test WiX">
41 - <Directory Id="TestDir" Name="$(var.TestGroupName)">
42 - <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
43 - </Directory>
38 + <StandardDirectory Id="LocalAppDataFolder">
39 + <Directory Id="WixDir" Name="~Test WiX">
40 + <Directory Id="TestDir" Name="$(var.TestGroupName)">
41 + <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
42 </Directory>
43 </Directory>
46 - </Directory>
44 + </StandardDirectory>
45 </Fragment>
46
47 <Fragment>