Update dependencies.
Bob Arnson committed
Apr 6, 2021 at 20:30 UTC
0f0f825506753e889938a3e0b6bd5177fbbb43ab
21 files changed
+54
-110
global.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0203"
3
+ "WixToolset.Sdk": "4.0.0-build-0205"
4
},
5
"sdk": {
6
"allowPrerelease": false
src/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.en-us.wxl
+1
-3
@@ -1,6 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-
3
-<!--
1
+<!--
2
This file contains the declaration of all the localizable strings.
3
-->
4
<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.en-us.wxl
+1
-3
@@ -1,6 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-
3
-<!--
1
+<!--
2
This file contains the declaration of all the localizable strings.
3
-->
4
<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
src/test/WixToolsetTest.Util/TestData/CloseApplication/Package.wxs
+3
-5
@@ -10,10 +10,8 @@
10
</Package>
11
12
<Fragment>
13
- <Directory Id="TARGETDIR" Name="SourceDir">
14
- <Directory Id="ProgramFilesFolder">
13
+ <StandardDirectory Id="ProgramFilesFolder">
14
<Directory Id="INSTALLFOLDER" Name="MsiPackage" />
16
- </Directory>
17
- </Directory>
18
- </Fragment>
15
+ </StandardDirectory>
16
+ </Fragment>
17
</Wix>
src/test/WixToolsetTest.Util/TestData/CloseApplication/PackageComponents.wxs
+1
-1
@@ -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>
3
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
4
<Component>
src/test/WixToolsetTest.Util/TestData/EventManifest/Package.en-us.wxl
+1
-3
@@ -1,6 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-
3
-<!--
1
+<!--
2
This file contains the declaration of all the localizable strings.
3
-->
4
<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
src/test/WixToolsetTest.Util/TestData/EventManifest/Package.wxs
+4
-6
@@ -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">
3
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
4
@@ -8,10 +8,8 @@
8
</Package>
9
10
<Fragment>
11
- <Directory Id="TARGETDIR" Name="SourceDir">
12
- <Directory Id="ProgramFilesFolder">
11
+ <StandardDirectory Id="ProgramFilesFolder">
12
<Directory Id="INSTALLFOLDER" Name="MsiPackage" />
14
- </Directory>
15
- </Directory>
16
- </Fragment>
13
+ </StandardDirectory>
14
+ </Fragment>
15
</Wix>
src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.en-us.wxl
+1
-3
@@ -1,6 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-
3
-<!--
1
+<!--
2
This file contains the declaration of all the localizable strings.
3
-->
4
<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
src/test/WixToolsetTest.Util/TestData/InternetShortcut/Package.wxs
+4
-6
@@ -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">
3
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
4
@@ -8,10 +8,8 @@
8
</Package>
9
10
<Fragment>
11
- <Directory Id="TARGETDIR" Name="SourceDir">
12
- <Directory Id="ProgramFilesFolder">
11
+ <StandardDirectory Id="ProgramFilesFolder">
12
<Directory Id="INSTALLFOLDER" Name="MsiPackage" />
14
- </Directory>
15
- </Directory>
16
- </Fragment>
13
+ </StandardDirectory>
14
+ </Fragment>
15
</Wix>
src/test/WixToolsetTest.Util/TestData/InternetShortcutModule/Module.wxs
+4
-6
@@ -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">
3
<SummaryInformation Manufacturer="Example Corporation" />
4
@@ -6,10 +6,8 @@
6
</Module>
7
8
<Fragment>
9
- <Directory Id="TARGETDIR" Name="SourceDir">
10
- <Directory Id="ProgramFilesFolder">
9
+ <StandardDirectory Id="ProgramFilesFolder">
10
<Directory Id="INSTALLFOLDER" Name="MergeModule" />
12
- </Directory>
13
- </Directory>
14
- </Fragment>
11
+ </StandardDirectory>
12
+ </Fragment>
13
</Wix>
src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.en-us.wxl
+1
-3
@@ -1,6 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-
3
-<!--
1
+<!--
2
This file contains the declaration of all the localizable strings.
3
-->
4
<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
src/test/WixToolsetTest.Util/TestData/PermissionEx/Package.wxs
+4
-6
@@ -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">
3
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
4
@@ -8,10 +8,8 @@
8
</Package>
9
10
<Fragment>
11
- <Directory Id="TARGETDIR" Name="SourceDir">
12
- <Directory Id="ProgramFilesFolder">
11
+ <StandardDirectory Id="ProgramFilesFolder">
12
<Directory Id="INSTALLFOLDER" Name="MsiPackage" />
14
- </Directory>
15
- </Directory>
16
- </Fragment>
13
+ </StandardDirectory>
14
+ </Fragment>
15
</Wix>
src/test/WixToolsetTest.Util/TestData/Queries/Package.en-us.wxl
+1
-3
@@ -1,6 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-
3
-<!--
1
+<!--
2
This file contains the declaration of all the localizable strings.
3
-->
4
<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
src/test/WixToolsetTest.Util/TestData/Queries/Package.wxs
+6
-7
@@ -12,13 +12,12 @@
12
</Feature>
13
</Package>
14
15
- <Fragment>
16
- <util:BroadcastSettingChange />
15
+ <Fragment><util:BroadcastSettingChange />
16
18
- <Directory Id="TARGETDIR" Name="SourceDir">
19
- <Directory Id="ProgramFilesFolder">
17
+
18
+
19
+ <StandardDirectory Id="ProgramFilesFolder">
20
<Directory Id="INSTALLFOLDER" Name="MsiPackage" />
21
- </Directory>
22
- </Directory>
23
- </Fragment>
21
+ </StandardDirectory>
22
+ </Fragment>
23
</Wix>
src/test/WixToolsetTest.Util/TestData/Queries/PackageComponents.wxs
+1
-1
@@ -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>
3
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
4
<Component>
src/test/WixToolsetTest.Util/TestData/RemoveFolderEx/Module.wxs
+4
-6
@@ -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">
3
<SummaryInformation Manufacturer="Example Corporation" />
4
@@ -6,10 +6,8 @@
6
</Module>
7
8
<Fragment>
9
- <Directory Id="TARGETDIR" Name="SourceDir">
10
- <Directory Id="ProgramFilesFolder">
9
+ <StandardDirectory Id="ProgramFilesFolder">
10
<Directory Id="INSTALLFOLDER" Name="MergeModule" />
12
- </Directory>
13
- </Directory>
14
- </Fragment>
11
+ </StandardDirectory>
12
+ </Fragment>
13
</Wix>
src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.en-us.wxl
+1
-3
@@ -1,6 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-
3
-<!--
1
+<!--
2
This file contains the declaration of all the localizable strings.
3
-->
4
<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
src/test/WixToolsetTest.Util/TestData/UsingFileShare/Package.wxs
+3
-5
@@ -8,10 +8,8 @@
8
</Package>
9
10
<Fragment>
11
- <Directory Id="TARGETDIR" Name="SourceDir">
12
- <Directory Id="ProgramFilesFolder">
11
+ <StandardDirectory Id="ProgramFilesFolder">
12
<Directory Id="INSTALLFOLDER" Name="MsiPackage" />
14
- </Directory>
15
- </Directory>
16
- </Fragment>
13
+ </StandardDirectory>
14
+ </Fragment>
15
</Wix>
src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.en-us.wxl
+1
-3
@@ -1,6 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-
3
-<!--
1
+<!--
2
This file contains the declaration of all the localizable strings.
3
-->
4
<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
src/test/WixToolsetTest.Util/TestData/XmlConfig/Package.wxs
+5
-15
@@ -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">
3
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
4
5
<Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
6
<Component Id="Del" Directory="INSTALLFOLDER" Guid="3613414c-11f5-40fa-a1f1-a0ba722a6895">
7
- <util:XmlConfig
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" />
7
+ <util:XmlConfig Id="DelElement" File="[INSTALLFOLDER]my.xml" Action="delete" Node="element" VerifyPath="xxx" ElementPath="//root/sub" On="install" Sequence="1" />
8
</Component>
9
</Feature>
10
</Package>
11
12
<Fragment>
21
- <Directory Id="TARGETDIR" Name="SourceDir">
22
- <Directory Id="ProgramFilesFolder">
13
+ <StandardDirectory Id="ProgramFilesFolder">
14
<Directory Id="INSTALLFOLDER" Name="MsiPackage" />
24
- </Directory>
25
- </Directory>
26
- </Fragment>
15
+ </StandardDirectory>
16
+ </Fragment>
17
</Wix>
src/test/WixToolsetTest.Util/TestData/XmlConfigModule/Module.wxs
+6
-21
@@ -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">
3
4
<Component Id="Parent" Directory="INSTALLFOLDER">
5
<File Id="my.xml" Source="my.xml" />
6
- <util:XmlConfig
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" />
6
+ <util:XmlConfig Id="AddElement" File="[my.xml]" Action="create" Node="element" VerifyPath="xxx" ElementPath="//root/sub" On="install" Sequence="1" />
7
</Component>
8
9
<Component Id="Child" Directory="INSTALLFOLDER" Guid="4613414c-11f5-40fa-a1f1-a0ba722a6895">
18
- <util:XmlConfig
19
- Id="ChildElement"
20
- File="[my.xml]"
21
- VerifyPath="xxx"
22
- ElementId="AddElement"
23
- Sequence="1" />
10
+ <util:XmlConfig Id="ChildElement" File="[my.xml]" VerifyPath="xxx" ElementId="AddElement" Sequence="1" />
11
</Component>
12
</Module>
13
14
<Fragment>
28
- <Directory Id="TARGETDIR" Name="SourceDir">
29
- <Directory Id="ProgramFilesFolder">
15
+ <StandardDirectory Id="ProgramFilesFolder">
16
<Directory Id="INSTALLFOLDER" Name="MsiPackage" />
31
- </Directory>
32
- </Directory>
33
- </Fragment>
17
+ </StandardDirectory>
18
+ </Fragment>
19
</Wix>