diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-04-15 18:48:32 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-04-15 18:56:53 -0500 |
| commit | 9cec24c6bf89c9174ca712c6a89ab7e231fa672c (patch) | |
| tree | c70e8e193ef5632938eece80105b9e5a5e7e19fc | |
| parent | f47c295739251a47bd95a51b4e80e887b0c5ed4a (diff) | |
| download | wix-9cec24c6bf89c9174ca712c6a89ab7e231fa672c.tar.gz wix-9cec24c6bf89c9174ca712c6a89ab7e231fa672c.tar.bz2 wix-9cec24c6bf89c9174ca712c6a89ab7e231fa672c.zip | |
Fix StandardDirectory warnings.
| -rw-r--r-- | src/TestData/DependencyTests/PackageDv1/Package.wxs | 13 | ||||
| -rw-r--r-- | src/TestData/Templates/Package.wxs | 13 | ||||
| -rw-r--r-- | src/TestData/Templates/PackageFail.wxs | 12 | ||||
| -rw-r--r-- | src/TestData/Templates/PackagePerUser.wxs | 12 |
4 files changed, 20 insertions, 30 deletions
diff --git a/src/TestData/DependencyTests/PackageDv1/Package.wxs b/src/TestData/DependencyTests/PackageDv1/Package.wxs index 348f8ebb..e3089c7c 100644 --- a/src/TestData/DependencyTests/PackageDv1/Package.wxs +++ b/src/TestData/DependencyTests/PackageDv1/Package.wxs | |||
| @@ -35,16 +35,13 @@ | |||
| 35 | </Package> | 35 | </Package> |
| 36 | 36 | ||
| 37 | <Fragment> | 37 | <Fragment> |
| 38 | <Directory Id="TARGETDIR" Name="SourceDir"> | 38 | <StandardDirectory Id="ProgramFilesFolder"> |
| 39 | <Directory Id="LocalAppDataFolder" /> | 39 | <Directory Id="WixDir" Name="~Test WiX"> |
| 40 | <Directory Id="ProgramFilesFolder"> | 40 | <Directory Id="TestDir" Name="$(var.TestGroupName)"> |
| 41 | <Directory Id="WixDir" Name="~Test WiX"> | 41 | <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" /> |
| 42 | <Directory Id="TestDir" Name="$(var.TestGroupName)"> | ||
| 43 | <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" /> | ||
| 44 | </Directory> | ||
| 45 | </Directory> | 42 | </Directory> |
| 46 | </Directory> | 43 | </Directory> |
| 47 | </Directory> | 44 | </StandardDirectory> |
| 48 | </Fragment> | 45 | </Fragment> |
| 49 | 46 | ||
| 50 | <Fragment> | 47 | <Fragment> |
diff --git a/src/TestData/Templates/Package.wxs b/src/TestData/Templates/Package.wxs index caf28a92..e2aaa079 100644 --- a/src/TestData/Templates/Package.wxs +++ b/src/TestData/Templates/Package.wxs | |||
| @@ -35,16 +35,13 @@ | |||
| 35 | </Package> | 35 | </Package> |
| 36 | 36 | ||
| 37 | <Fragment> | 37 | <Fragment> |
| 38 | <Directory Id="TARGETDIR" Name="SourceDir"> | 38 | <StandardDirectory Id="ProgramFilesFolder"> |
| 39 | <Directory Id="CommonAppDataFolder" /> | 39 | <Directory Id="WixDir" Name="~Test WiX"> |
| 40 | <Directory Id="ProgramFilesFolder"> | 40 | <Directory Id="TestDir" Name="$(var.TestGroupName)"> |
| 41 | <Directory Id="WixDir" Name="~Test WiX"> | 41 | <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" /> |
| 42 | <Directory Id="TestDir" Name="$(var.TestGroupName)"> | ||
| 43 | <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" /> | ||
| 44 | </Directory> | ||
| 45 | </Directory> | 42 | </Directory> |
| 46 | </Directory> | 43 | </Directory> |
| 47 | </Directory> | 44 | </StandardDirectory> |
| 48 | </Fragment> | 45 | </Fragment> |
| 49 | 46 | ||
| 50 | <Fragment> | 47 | <Fragment> |
diff --git a/src/TestData/Templates/PackageFail.wxs b/src/TestData/Templates/PackageFail.wxs index 54921ec6..0139c22b 100644 --- a/src/TestData/Templates/PackageFail.wxs +++ b/src/TestData/Templates/PackageFail.wxs | |||
| @@ -23,15 +23,13 @@ | |||
| 23 | </Package> | 23 | </Package> |
| 24 | 24 | ||
| 25 | <Fragment> | 25 | <Fragment> |
| 26 | <Directory Id="TARGETDIR" Name="SourceDir"> | 26 | <StandardDirectory Id="ProgramFilesFolder"> |
| 27 | <Directory Id="ProgramFilesFolder"> | 27 | <Directory Id="WixDir" Name="~Test WiX"> |
| 28 | <Directory Id="WixDir" Name="~Test WiX"> | 28 | <Directory Id="TestDir" Name="$(var.TestGroupName)"> |
| 29 | <Directory Id="TestDir" Name="$(var.TestGroupName)"> | 29 | <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" /> |
| 30 | <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" /> | ||
| 31 | </Directory> | ||
| 32 | </Directory> | 30 | </Directory> |
| 33 | </Directory> | 31 | </Directory> |
| 34 | </Directory> | 32 | </StandardDirectory> |
| 35 | </Fragment> | 33 | </Fragment> |
| 36 | 34 | ||
| 37 | <Fragment> | 35 | <Fragment> |
diff --git a/src/TestData/Templates/PackagePerUser.wxs b/src/TestData/Templates/PackagePerUser.wxs index 25133fb4..5e18fefd 100644 --- a/src/TestData/Templates/PackagePerUser.wxs +++ b/src/TestData/Templates/PackagePerUser.wxs | |||
| @@ -35,15 +35,13 @@ | |||
| 35 | </Package> | 35 | </Package> |
| 36 | 36 | ||
| 37 | <Fragment> | 37 | <Fragment> |
| 38 | <Directory Id="TARGETDIR" Name="SourceDir"> | 38 | <StandardDirectory Id="LocalAppDataFolder"> |
| 39 | <Directory Id="LocalAppDataFolder"> | 39 | <Directory Id="WixDir" Name="~Test WiX"> |
| 40 | <Directory Id="WixDir" Name="~Test WiX"> | 40 | <Directory Id="TestDir" Name="$(var.TestGroupName)"> |
| 41 | <Directory Id="TestDir" Name="$(var.TestGroupName)"> | 41 | <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" /> |
| 42 | <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" /> | ||
| 43 | </Directory> | ||
| 44 | </Directory> | 42 | </Directory> |
| 45 | </Directory> | 43 | </Directory> |
| 46 | </Directory> | 44 | </StandardDirectory> |
| 47 | </Fragment> | 45 | </Fragment> |
| 48 | 46 | ||
| 49 | <Fragment> | 47 | <Fragment> |