diff options
author | Rob Mensching <rob@firegiant.com> | 2021-04-08 07:29:26 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-04-08 07:33:08 -0700 |
commit | a3fcca48e4258f37ce2f51502f7863942e8b23fe (patch) | |
tree | 7dad7afa711251fb30e3ebb035570bdce0898957 /src/test | |
parent | 660671d107d44965856ba8d40106c6565521bcdc (diff) | |
download | wix-a3fcca48e4258f37ce2f51502f7863942e8b23fe.tar.gz wix-a3fcca48e4258f37ce2f51502f7863942e8b23fe.tar.bz2 wix-a3fcca48e4258f37ce2f51502f7863942e8b23fe.zip |
Update dependencies
Diffstat (limited to 'src/test')
5 files changed, 16 insertions, 41 deletions
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs index 2e416f0f..5ce4b00f 100644 --- a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs +++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs | |||
@@ -1,9 +1,6 @@ | |||
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" InstallerVersion="200"> | 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200"> |
3 | |||
4 | |||
5 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 3 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
6 | |||
7 | 4 | ||
8 | <Feature Id="ProductFeature" Title="MsiPackage"> | 5 | <Feature Id="ProductFeature" Title="MsiPackage"> |
9 | <ComponentGroupRef Id="ProductComponents" /> | 6 | <ComponentGroupRef Id="ProductComponents" /> |
@@ -21,12 +18,10 @@ | |||
21 | </Package> | 18 | </Package> |
22 | 19 | ||
23 | <Fragment> | 20 | <Fragment> |
24 | <Directory Id="TARGETDIR" Name="SourceDir"> | 21 | <StandardDirectory Id="ProgramFilesFolder"> |
25 | <Directory Id="ProgramFilesFolder"> | 22 | <Directory Id="INSTALLFOLDER" Name="MsiPackage"> |
26 | <Directory Id="INSTALLFOLDER" Name="MsiPackage"> | 23 | <Directory Id="APPLICATIONFOLDER" /> |
27 | <Directory Id="APPLICATIONFOLDER" Name="." /> | ||
28 | </Directory> | ||
29 | </Directory> | 24 | </Directory> |
30 | </Directory> | 25 | </StandardDirectory> |
31 | </Fragment> | 26 | </Fragment> |
32 | </Wix> | 27 | </Wix> |
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs index 5f8cd07d..aff1c077 100644 --- a/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs +++ b/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs | |||
@@ -1,9 +1,6 @@ | |||
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" InstallerVersion="200"> | 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200"> |
3 | |||
4 | |||
5 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 3 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
6 | |||
7 | 4 | ||
8 | <Feature Id="ProductFeature" Title="MsiPackage"> | 5 | <Feature Id="ProductFeature" Title="MsiPackage"> |
9 | <ComponentGroupRef Id="ProductComponents" /> | 6 | <ComponentGroupRef Id="ProductComponents" /> |
@@ -19,10 +16,8 @@ | |||
19 | </Package> | 16 | </Package> |
20 | 17 | ||
21 | <Fragment> | 18 | <Fragment> |
22 | <Directory Id="TARGETDIR" Name="SourceDir"> | 19 | <StandardDirectory Id="ProgramFilesFolder"> |
23 | <Directory Id="ProgramFilesFolder"> | 20 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
24 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 21 | </StandardDirectory> |
25 | </Directory> | ||
26 | </Directory> | ||
27 | </Fragment> | 22 | </Fragment> |
28 | </Wix> | 23 | </Wix> |
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs index 4e873add..7c2ceae0 100644 --- a/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs +++ b/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs | |||
@@ -1,9 +1,6 @@ | |||
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" InstallerVersion="200"> | 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200"> |
3 | |||
4 | |||
5 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 3 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
6 | |||
7 | 4 | ||
8 | <Feature Id="ProductFeature" Title="MsiPackage"> | 5 | <Feature Id="ProductFeature" Title="MsiPackage"> |
9 | <ComponentGroupRef Id="ProductComponents" /> | 6 | <ComponentGroupRef Id="ProductComponents" /> |
@@ -19,10 +16,8 @@ | |||
19 | </Package> | 16 | </Package> |
20 | 17 | ||
21 | <Fragment> | 18 | <Fragment> |
22 | <Directory Id="TARGETDIR" Name="SourceDir"> | 19 | <StandardDirectory Id="ProgramFilesFolder"> |
23 | <Directory Id="ProgramFilesFolder"> | 20 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
24 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 21 | </StandardDirectory> |
25 | </Directory> | ||
26 | </Directory> | ||
27 | </Fragment> | 22 | </Fragment> |
28 | </Wix> | 23 | </Wix> |
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs index 96ab46ff..d2ff256c 100644 --- a/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs +++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs | |||
@@ -1,9 +1,6 @@ | |||
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" InstallerVersion="200"> | 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200"> |
3 | |||
4 | |||
5 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 3 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
6 | |||
7 | 4 | ||
8 | <Feature Id="ProductFeature" Title="MsiPackage"> | 5 | <Feature Id="ProductFeature" Title="MsiPackage"> |
9 | <ComponentGroupRef Id="ProductComponents" /> | 6 | <ComponentGroupRef Id="ProductComponents" /> |
@@ -19,10 +16,8 @@ | |||
19 | </Package> | 16 | </Package> |
20 | 17 | ||
21 | <Fragment> | 18 | <Fragment> |
22 | <Directory Id="TARGETDIR" Name="SourceDir"> | 19 | <StandardDirectory Id="ProgramFilesFolder"> |
23 | <Directory Id="ProgramFilesFolder"> | 20 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
24 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 21 | </StandardDirectory> |
25 | </Directory> | ||
26 | </Directory> | ||
27 | </Fragment> | 22 | </Fragment> |
28 | </Wix> | 23 | </Wix> |
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs index 9bbc4ba0..8d5a856a 100644 --- a/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs +++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs | |||
@@ -1,9 +1,6 @@ | |||
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" InstallerVersion="200"> | 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200"> |
3 | |||
4 | |||
5 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 3 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
6 | |||
7 | 4 | ||
8 | <Feature Id="ProductFeature" Title="MsiPackage"> | 5 | <Feature Id="ProductFeature" Title="MsiPackage"> |
9 | <ComponentGroupRef Id="ProductComponents" /> | 6 | <ComponentGroupRef Id="ProductComponents" /> |
@@ -19,10 +16,8 @@ | |||
19 | </Package> | 16 | </Package> |
20 | 17 | ||
21 | <Fragment> | 18 | <Fragment> |
22 | <Directory Id="TARGETDIR" Name="SourceDir"> | 19 | <StandardDirectory Id="ProgramFilesFolder"> |
23 | <Directory Id="ProgramFilesFolder"> | 20 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
24 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 21 | </StandardDirectory> |
25 | </Directory> | ||
26 | </Directory> | ||
27 | </Fragment> | 22 | </Fragment> |
28 | </Wix> | 23 | </Wix> |