diff options
author | Rob Mensching <rob@firegiant.com> | 2020-07-14 13:44:25 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2020-07-19 10:09:05 -0700 |
commit | cfb65eedf737462489e03fd80a4805a4d7ec1316 (patch) | |
tree | a4022ac9a9d15721caa08f60b4895e3bea956bd6 /src/test | |
parent | a6b77f7e7f1a36a1fe8fdee6ba1e78c994e100e7 (diff) | |
download | wix-cfb65eedf737462489e03fd80a4805a4d7ec1316.tar.gz wix-cfb65eedf737462489e03fd80a4805a4d7ec1316.tar.bz2 wix-cfb65eedf737462489e03fd80a4805a4d7ec1316.zip |
Run latest conversions on .wxs code
Diffstat (limited to 'src/test')
5 files changed, 110 insertions, 115 deletions
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs index bbc54ac6..2c3ca0a0 100644 --- a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs +++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs | |||
@@ -1,29 +1,28 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 2 | <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> |
3 | <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | 3 | <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> |
4 | <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> | ||
5 | 4 | ||
6 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 5 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
7 | <MediaTemplate /> | 6 | <MediaTemplate /> |
8 | 7 | ||
9 | <Feature Id="ProductFeature" Title="MsiPackage"> | 8 | <Feature Id="ProductFeature" Title="MsiPackage"> |
10 | <ComponentGroupRef Id="ProductComponents" /> | 9 | <ComponentGroupRef Id="ProductComponents" /> |
11 | </Feature> | 10 | </Feature> |
12 | 11 | ||
13 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> | 12 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> |
14 | <Component> | 13 | <Component> |
15 | <File Source="example.txt" /> | 14 | <File Source="example.txt" /> |
16 | </Component> | 15 | </Component> |
17 | </ComponentGroup> | 16 | </ComponentGroup> |
18 | 17 | ||
19 | <UIRef Id="WixUI_Advanced" /> | 18 | <UIRef Id="WixUI_Advanced" /> |
20 | </Product> | 19 | </Product> |
21 | 20 | ||
22 | <Fragment> | 21 | <Fragment> |
23 | <Directory Id="TARGETDIR" Name="SourceDir"> | 22 | <Directory Id="TARGETDIR" Name="SourceDir"> |
24 | <Directory Id="ProgramFilesFolder"> | 23 | <Directory Id="ProgramFilesFolder"> |
25 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 24 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
26 | </Directory> | 25 | </Directory> |
27 | </Directory> | 26 | </Directory> |
28 | </Fragment> | 27 | </Fragment> |
29 | </Wix> | 28 | </Wix> |
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs index 9f630f99..dc0e990d 100644 --- a/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs +++ b/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs | |||
@@ -1,29 +1,28 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 2 | <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> |
3 | <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | 3 | <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> |
4 | <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> | ||
5 | 4 | ||
6 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 5 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
7 | <MediaTemplate /> | 6 | <MediaTemplate /> |
8 | 7 | ||
9 | <Feature Id="ProductFeature" Title="MsiPackage"> | 8 | <Feature Id="ProductFeature" Title="MsiPackage"> |
10 | <ComponentGroupRef Id="ProductComponents" /> | 9 | <ComponentGroupRef Id="ProductComponents" /> |
11 | </Feature> | 10 | </Feature> |
12 | 11 | ||
13 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> | 12 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> |
14 | <Component> | 13 | <Component> |
15 | <File Source="example.txt" /> | 14 | <File Source="example.txt" /> |
16 | </Component> | 15 | </Component> |
17 | </ComponentGroup> | 16 | </ComponentGroup> |
18 | 17 | ||
19 | <UIRef Id="WixUI_FeatureTree" /> | 18 | <UIRef Id="WixUI_FeatureTree" /> |
20 | </Product> | 19 | </Product> |
21 | 20 | ||
22 | <Fragment> | 21 | <Fragment> |
23 | <Directory Id="TARGETDIR" Name="SourceDir"> | 22 | <Directory Id="TARGETDIR" Name="SourceDir"> |
24 | <Directory Id="ProgramFilesFolder"> | 23 | <Directory Id="ProgramFilesFolder"> |
25 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 24 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
26 | </Directory> | 25 | </Directory> |
27 | </Directory> | 26 | </Directory> |
28 | </Fragment> | 27 | </Fragment> |
29 | </Wix> | 28 | </Wix> |
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs index 6239c7ab..8ed3866e 100644 --- a/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs +++ b/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs | |||
@@ -1,29 +1,28 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 2 | <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> |
3 | <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | 3 | <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> |
4 | <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> | ||
5 | 4 | ||
6 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 5 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
7 | <MediaTemplate /> | 6 | <MediaTemplate /> |
8 | 7 | ||
9 | <Feature Id="ProductFeature" Title="MsiPackage"> | 8 | <Feature Id="ProductFeature" Title="MsiPackage"> |
10 | <ComponentGroupRef Id="ProductComponents" /> | 9 | <ComponentGroupRef Id="ProductComponents" /> |
11 | </Feature> | 10 | </Feature> |
12 | 11 | ||
13 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> | 12 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> |
14 | <Component> | 13 | <Component> |
15 | <File Source="example.txt" /> | 14 | <File Source="example.txt" /> |
16 | </Component> | 15 | </Component> |
17 | </ComponentGroup> | 16 | </ComponentGroup> |
18 | 17 | ||
19 | <UIRef Id="WixUI_InstallDir" /> | 18 | <UIRef Id="WixUI_InstallDir" /> |
20 | </Product> | 19 | </Product> |
21 | 20 | ||
22 | <Fragment> | 21 | <Fragment> |
23 | <Directory Id="TARGETDIR" Name="SourceDir"> | 22 | <Directory Id="TARGETDIR" Name="SourceDir"> |
24 | <Directory Id="ProgramFilesFolder"> | 23 | <Directory Id="ProgramFilesFolder"> |
25 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 24 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
26 | </Directory> | 25 | </Directory> |
27 | </Directory> | 26 | </Directory> |
28 | </Fragment> | 27 | </Fragment> |
29 | </Wix> | 28 | </Wix> |
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs index 9f84785f..a1e9ed60 100644 --- a/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs +++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs | |||
@@ -1,29 +1,28 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 2 | <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> |
3 | <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | 3 | <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> |
4 | <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> | ||
5 | 4 | ||
6 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 5 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
7 | <MediaTemplate /> | 6 | <MediaTemplate /> |
8 | 7 | ||
9 | <Feature Id="ProductFeature" Title="MsiPackage"> | 8 | <Feature Id="ProductFeature" Title="MsiPackage"> |
10 | <ComponentGroupRef Id="ProductComponents" /> | 9 | <ComponentGroupRef Id="ProductComponents" /> |
11 | </Feature> | 10 | </Feature> |
12 | 11 | ||
13 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> | 12 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> |
14 | <Component> | 13 | <Component> |
15 | <File Source="example.txt" /> | 14 | <File Source="example.txt" /> |
16 | </Component> | 15 | </Component> |
17 | </ComponentGroup> | 16 | </ComponentGroup> |
18 | 17 | ||
19 | <UIRef Id="WixUI_Minimal" /> | 18 | <UIRef Id="WixUI_Minimal" /> |
20 | </Product> | 19 | </Product> |
21 | 20 | ||
22 | <Fragment> | 21 | <Fragment> |
23 | <Directory Id="TARGETDIR" Name="SourceDir"> | 22 | <Directory Id="TARGETDIR" Name="SourceDir"> |
24 | <Directory Id="ProgramFilesFolder"> | 23 | <Directory Id="ProgramFilesFolder"> |
25 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 24 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
26 | </Directory> | 25 | </Directory> |
27 | </Directory> | 26 | </Directory> |
28 | </Fragment> | 27 | </Fragment> |
29 | </Wix> | 28 | </Wix> |
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs index a670cae9..03e4173d 100644 --- a/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs +++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs | |||
@@ -1,29 +1,28 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 2 | <Product Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> |
3 | <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | 3 | <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> |
4 | <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> | ||
5 | 4 | ||
6 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 5 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
7 | <MediaTemplate /> | 6 | <MediaTemplate /> |
8 | 7 | ||
9 | <Feature Id="ProductFeature" Title="MsiPackage"> | 8 | <Feature Id="ProductFeature" Title="MsiPackage"> |
10 | <ComponentGroupRef Id="ProductComponents" /> | 9 | <ComponentGroupRef Id="ProductComponents" /> |
11 | </Feature> | 10 | </Feature> |
12 | 11 | ||
13 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> | 12 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> |
14 | <Component> | 13 | <Component> |
15 | <File Source="example.txt" /> | 14 | <File Source="example.txt" /> |
16 | </Component> | 15 | </Component> |
17 | </ComponentGroup> | 16 | </ComponentGroup> |
18 | 17 | ||
19 | <UIRef Id="WixUI_Mondo" /> | 18 | <UIRef Id="WixUI_Mondo" /> |
20 | </Product> | 19 | </Product> |
21 | 20 | ||
22 | <Fragment> | 21 | <Fragment> |
23 | <Directory Id="TARGETDIR" Name="SourceDir"> | 22 | <Directory Id="TARGETDIR" Name="SourceDir"> |
24 | <Directory Id="ProgramFilesFolder"> | 23 | <Directory Id="ProgramFilesFolder"> |
25 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 24 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
26 | </Directory> | 25 | </Directory> |
27 | </Directory> | 26 | </Directory> |
28 | </Fragment> | 27 | </Fragment> |
29 | </Wix> | 28 | </Wix> |