diff options
author | Bob Arnson <bob@firegiant.com> | 2021-04-06 20:30:51 -0400 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2021-04-06 20:33:36 -0400 |
commit | 0f0f825506753e889938a3e0b6bd5177fbbb43ab (patch) | |
tree | 465b638cc7f7dc18b582c43f5d66a942e3ae6010 /src/test | |
parent | d545a15acaa24ef9e071144d645e51c2cef1d53a (diff) | |
download | wix-0f0f825506753e889938a3e0b6bd5177fbbb43ab.tar.gz wix-0f0f825506753e889938a3e0b6bd5177fbbb43ab.tar.bz2 wix-0f0f825506753e889938a3e0b6bd5177fbbb43ab.zip |
Update dependencies.
Diffstat (limited to 'src/test')
20 files changed, 53 insertions, 109 deletions
diff --git a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl index bc1dee83..f50a5386 100644 --- a/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl | |||
@@ -1,6 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <!-- |
2 | |||
3 | <!-- | ||
4 | This file contains the declaration of all the localizable strings. | 2 | This file contains the declaration of all the localizable strings. |
5 | --> | 3 | --> |
6 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> | 4 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> |
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl index 38c12ac1..5301bb1a 100644 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl | |||
@@ -1,6 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <!-- |
2 | |||
3 | <!-- | ||
4 | This file contains the declaration of all the localizable strings. | 2 | This file contains the declaration of all the localizable strings. |
5 | --> | 3 | --> |
6 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> | 4 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> |
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs index 410b151d..8e054256 100644 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs | |||
@@ -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"> | ||
15 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 14 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
16 | </Directory> | 15 | </StandardDirectory> |
17 | </Directory> | 16 | </Fragment> |
18 | </Fragment> | ||
19 | </Wix> | 17 | </Wix> |
diff --git a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs index 49f29600..e27b3c43 100644 --- a/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs | |||
@@ -1,4 +1,4 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
2 | <Fragment> | 2 | <Fragment> |
3 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> | 3 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> |
4 | <Component> | 4 | <Component> |
diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl index 38c12ac1..5301bb1a 100644 --- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl | |||
@@ -1,6 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <!-- |
2 | |||
3 | <!-- | ||
4 | This file contains the declaration of all the localizable strings. | 2 | This file contains the declaration of all the localizable strings. |
5 | --> | 3 | --> |
6 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> | 4 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> |
diff --git a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs index 09d2c46e..daae573a 100644 --- a/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs | |||
@@ -1,4 +1,4 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 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"> | 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> |
3 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> | 3 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> |
4 | 4 | ||
@@ -8,10 +8,8 @@ | |||
8 | </Package> | 8 | </Package> |
9 | 9 | ||
10 | <Fragment> | 10 | <Fragment> |
11 | <Directory Id="TARGETDIR" Name="SourceDir"> | 11 | <StandardDirectory Id="ProgramFilesFolder"> |
12 | <Directory Id="ProgramFilesFolder"> | ||
13 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 12 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
14 | </Directory> | 13 | </StandardDirectory> |
15 | </Directory> | 14 | </Fragment> |
16 | </Fragment> | ||
17 | </Wix> | 15 | </Wix> |
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl index 38c12ac1..5301bb1a 100644 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl | |||
@@ -1,6 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <!-- |
2 | |||
3 | <!-- | ||
4 | This file contains the declaration of all the localizable strings. | 2 | This file contains the declaration of all the localizable strings. |
5 | --> | 3 | --> |
6 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> | 4 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> |
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs index 09d2c46e..daae573a 100644 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs | |||
@@ -1,4 +1,4 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 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"> | 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> |
3 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> | 3 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> |
4 | 4 | ||
@@ -8,10 +8,8 @@ | |||
8 | </Package> | 8 | </Package> |
9 | 9 | ||
10 | <Fragment> | 10 | <Fragment> |
11 | <Directory Id="TARGETDIR" Name="SourceDir"> | 11 | <StandardDirectory Id="ProgramFilesFolder"> |
12 | <Directory Id="ProgramFilesFolder"> | ||
13 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 12 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
14 | </Directory> | 13 | </StandardDirectory> |
15 | </Directory> | 14 | </Fragment> |
16 | </Fragment> | ||
17 | </Wix> | 15 | </Wix> |
diff --git a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs index 2a9daa1c..1355d42e 100644 --- a/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs +++ b/src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs | |||
@@ -1,4 +1,4 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
2 | <Module Language="1033" Version="1.0.0.0" Id="InternetShortcutModule" Guid="047730a5-30fe-4a62-a520-da9381b8226a"> | 2 | <Module Language="1033" Version="1.0.0.0" Id="InternetShortcutModule" Guid="047730a5-30fe-4a62-a520-da9381b8226a"> |
3 | <SummaryInformation Manufacturer="Example Corporation" /> | 3 | <SummaryInformation Manufacturer="Example Corporation" /> |
4 | 4 | ||
@@ -6,10 +6,8 @@ | |||
6 | </Module> | 6 | </Module> |
7 | 7 | ||
8 | <Fragment> | 8 | <Fragment> |
9 | <Directory Id="TARGETDIR" Name="SourceDir"> | 9 | <StandardDirectory Id="ProgramFilesFolder"> |
10 | <Directory Id="ProgramFilesFolder"> | ||
11 | <Directory Id="INSTALLFOLDER" Name="MergeModule" /> | 10 | <Directory Id="INSTALLFOLDER" Name="MergeModule" /> |
12 | </Directory> | 11 | </StandardDirectory> |
13 | </Directory> | 12 | </Fragment> |
14 | </Fragment> | ||
15 | </Wix> | 13 | </Wix> |
diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl index 38c12ac1..5301bb1a 100644 --- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl | |||
@@ -1,6 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <!-- |
2 | |||
3 | <!-- | ||
4 | This file contains the declaration of all the localizable strings. | 2 | This file contains the declaration of all the localizable strings. |
5 | --> | 3 | --> |
6 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> | 4 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> |
diff --git a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs index 09d2c46e..daae573a 100644 --- a/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs | |||
@@ -1,4 +1,4 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 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"> | 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> |
3 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> | 3 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> |
4 | 4 | ||
@@ -8,10 +8,8 @@ | |||
8 | </Package> | 8 | </Package> |
9 | 9 | ||
10 | <Fragment> | 10 | <Fragment> |
11 | <Directory Id="TARGETDIR" Name="SourceDir"> | 11 | <StandardDirectory Id="ProgramFilesFolder"> |
12 | <Directory Id="ProgramFilesFolder"> | ||
13 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 12 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
14 | </Directory> | 13 | </StandardDirectory> |
15 | </Directory> | 14 | </Fragment> |
16 | </Fragment> | ||
17 | </Wix> | 15 | </Wix> |
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl index 38c12ac1..5301bb1a 100644 --- a/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl | |||
@@ -1,6 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <!-- |
2 | |||
3 | <!-- | ||
4 | This file contains the declaration of all the localizable strings. | 2 | This file contains the declaration of all the localizable strings. |
5 | --> | 3 | --> |
6 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> | 4 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> |
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs index 43365cc3..abf0dbb4 100644 --- a/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs | |||
@@ -12,13 +12,12 @@ | |||
12 | </Feature> | 12 | </Feature> |
13 | </Package> | 13 | </Package> |
14 | 14 | ||
15 | <Fragment> | 15 | <Fragment><util:BroadcastSettingChange /> |
16 | <util:BroadcastSettingChange /> | ||
17 | 16 | ||
18 | <Directory Id="TARGETDIR" Name="SourceDir"> | 17 | |
19 | <Directory Id="ProgramFilesFolder"> | 18 | |
19 | <StandardDirectory Id="ProgramFilesFolder"> | ||
20 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 20 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
21 | </Directory> | 21 | </StandardDirectory> |
22 | </Directory> | 22 | </Fragment> |
23 | </Fragment> | ||
24 | </Wix> | 23 | </Wix> |
diff --git a/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs b/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs index e2dce4ae..e27b3c43 100644 --- a/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs +++ b/src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs | |||
@@ -1,4 +1,4 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
2 | <Fragment> | 2 | <Fragment> |
3 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> | 3 | <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> |
4 | <Component> | 4 | <Component> |
diff --git a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs b/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs index 39674278..2c2be584 100644 --- a/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs +++ b/src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs | |||
@@ -1,4 +1,4 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
2 | <Module Language="1033" Version="1.0.0.0" Id="InternetShortcutModule" Guid="047730a5-30fe-4a62-a520-da9381b8226a"> | 2 | <Module Language="1033" Version="1.0.0.0" Id="InternetShortcutModule" Guid="047730a5-30fe-4a62-a520-da9381b8226a"> |
3 | <SummaryInformation Manufacturer="Example Corporation" /> | 3 | <SummaryInformation Manufacturer="Example Corporation" /> |
4 | 4 | ||
@@ -6,10 +6,8 @@ | |||
6 | </Module> | 6 | </Module> |
7 | 7 | ||
8 | <Fragment> | 8 | <Fragment> |
9 | <Directory Id="TARGETDIR" Name="SourceDir"> | 9 | <StandardDirectory Id="ProgramFilesFolder"> |
10 | <Directory Id="ProgramFilesFolder"> | ||
11 | <Directory Id="INSTALLFOLDER" Name="MergeModule" /> | 10 | <Directory Id="INSTALLFOLDER" Name="MergeModule" /> |
12 | </Directory> | 11 | </StandardDirectory> |
13 | </Directory> | 12 | </Fragment> |
14 | </Fragment> | ||
15 | </Wix> | 13 | </Wix> |
diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl index 38c12ac1..5301bb1a 100644 --- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl | |||
@@ -1,6 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <!-- |
2 | |||
3 | <!-- | ||
4 | This file contains the declaration of all the localizable strings. | 2 | This file contains the declaration of all the localizable strings. |
5 | --> | 3 | --> |
6 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> | 4 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> |
diff --git a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs index 873b137e..daae573a 100644 --- a/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs | |||
@@ -8,10 +8,8 @@ | |||
8 | </Package> | 8 | </Package> |
9 | 9 | ||
10 | <Fragment> | 10 | <Fragment> |
11 | <Directory Id="TARGETDIR" Name="SourceDir"> | 11 | <StandardDirectory Id="ProgramFilesFolder"> |
12 | <Directory Id="ProgramFilesFolder"> | ||
13 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 12 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
14 | </Directory> | 13 | </StandardDirectory> |
15 | </Directory> | 14 | </Fragment> |
16 | </Fragment> | ||
17 | </Wix> | 15 | </Wix> |
diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl index 38c12ac1..5301bb1a 100644 --- a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl +++ b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl | |||
@@ -1,6 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <!-- |
2 | |||
3 | <!-- | ||
4 | This file contains the declaration of all the localizable strings. | 2 | This file contains the declaration of all the localizable strings. |
5 | --> | 3 | --> |
6 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> | 4 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> |
diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs index 21f75f8f..a2002634 100644 --- a/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs +++ b/src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs | |||
@@ -1,27 +1,17 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> |
2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | 2 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> |
3 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> | 3 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> |
4 | 4 | ||
5 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> | 5 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> |
6 | <Component Id="Del" Directory="INSTALLFOLDER" Guid="3613414c-11f5-40fa-a1f1-a0ba722a6895"> | 6 | <Component Id="Del" Directory="INSTALLFOLDER" Guid="3613414c-11f5-40fa-a1f1-a0ba722a6895"> |
7 | <util:XmlConfig | 7 | <util:XmlConfig Id="DelElement" File="[INSTALLFOLDER]my.xml" Action="delete" Node="element" VerifyPath="xxx" ElementPath="//root/sub" On="install" Sequence="1" /> |
8 | Id="DelElement" | ||
9 | File="[INSTALLFOLDER]my.xml" | ||
10 | Action="delete" | ||
11 | Node="element" | ||
12 | VerifyPath="xxx" | ||
13 | ElementPath="//root/sub" | ||
14 | On="install" | ||
15 | Sequence="1" /> | ||
16 | </Component> | 8 | </Component> |
17 | </Feature> | 9 | </Feature> |
18 | </Package> | 10 | </Package> |
19 | 11 | ||
20 | <Fragment> | 12 | <Fragment> |
21 | <Directory Id="TARGETDIR" Name="SourceDir"> | 13 | <StandardDirectory Id="ProgramFilesFolder"> |
22 | <Directory Id="ProgramFilesFolder"> | ||
23 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 14 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
24 | </Directory> | 15 | </StandardDirectory> |
25 | </Directory> | 16 | </Fragment> |
26 | </Fragment> | ||
27 | </Wix> | 17 | </Wix> |
diff --git a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs b/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs index 93f5eeb1..29e8555b 100644 --- a/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs +++ b/src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs | |||
@@ -1,34 +1,19 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> |
2 | <Module Id="XmlConfigModule" Language="1033" Version="1.0.0.0" Guid="047730a5-30fe-4a62-a520-da9381b8226a"> | 2 | <Module Id="XmlConfigModule" Language="1033" Version="1.0.0.0" Guid="047730a5-30fe-4a62-a520-da9381b8226a"> |
3 | 3 | ||
4 | <Component Id="Parent" Directory="INSTALLFOLDER"> | 4 | <Component Id="Parent" Directory="INSTALLFOLDER"> |
5 | <File Id="my.xml" Source="my.xml" /> | 5 | <File Id="my.xml" Source="my.xml" /> |
6 | <util:XmlConfig | 6 | <util:XmlConfig Id="AddElement" File="[my.xml]" Action="create" Node="element" VerifyPath="xxx" ElementPath="//root/sub" On="install" Sequence="1" /> |
7 | Id="AddElement" | ||
8 | File="[my.xml]" | ||
9 | Action="create" | ||
10 | Node="element" | ||
11 | VerifyPath="xxx" | ||
12 | ElementPath="//root/sub" | ||
13 | On="install" | ||
14 | Sequence="1" /> | ||
15 | </Component> | 7 | </Component> |
16 | 8 | ||
17 | <Component Id="Child" Directory="INSTALLFOLDER" Guid="4613414c-11f5-40fa-a1f1-a0ba722a6895"> | 9 | <Component Id="Child" Directory="INSTALLFOLDER" Guid="4613414c-11f5-40fa-a1f1-a0ba722a6895"> |
18 | <util:XmlConfig | 10 | <util:XmlConfig Id="ChildElement" File="[my.xml]" VerifyPath="xxx" ElementId="AddElement" Sequence="1" /> |
19 | Id="ChildElement" | ||
20 | File="[my.xml]" | ||
21 | VerifyPath="xxx" | ||
22 | ElementId="AddElement" | ||
23 | Sequence="1" /> | ||
24 | </Component> | 11 | </Component> |
25 | </Module> | 12 | </Module> |
26 | 13 | ||
27 | <Fragment> | 14 | <Fragment> |
28 | <Directory Id="TARGETDIR" Name="SourceDir"> | 15 | <StandardDirectory Id="ProgramFilesFolder"> |
29 | <Directory Id="ProgramFilesFolder"> | ||
30 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 16 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
31 | </Directory> | 17 | </StandardDirectory> |
32 | </Directory> | 18 | </Fragment> |
33 | </Fragment> | ||
34 | </Wix> | 19 | </Wix> |