Update project for Package/SummaryInformation change (and others).
Bob Arnson committed
Oct 27, 2020 at 16:01 UTC
e6c98d58a9044a74ba6590a9a04ad42881db12a4
5 files changed
+8
-17
global.json
+1
-1
@@ -1,5 +1,5 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0143"
3
+ "WixToolset.Sdk": "4.0.0-build-0162"
4
}
5
}
src/ca/directxca.vcxproj
-8
@@ -21,14 +21,6 @@
21
<Configuration>Release</Configuration>
22
<Platform>x64</Platform>
23
</ProjectConfiguration>
24
- <ProjectConfiguration Include="Debug|ARM">
25
- <Configuration>Debug</Configuration>
26
- <Platform>ARM</Platform>
27
- </ProjectConfiguration>
28
- <ProjectConfiguration Include="Release|ARM">
29
- <Configuration>Release</Configuration>
30
- <Platform>ARM</Platform>
31
- </ProjectConfiguration>
24
<ProjectConfiguration Include="Debug|ARM64">
25
<Configuration>Debug</Configuration>
26
<Platform>ARM64</Platform>
src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs
+5
-6
@@ -1,16 +1,15 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3
- <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
4
- <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
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">
3
+
4
5
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7
- <MediaTemplate />
6
+
7
8
<Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
9
<ComponentGroupRef Id="ProductComponents" />
10
</Feature>
11
13
- </Product>
12
+ </Package>
13
14
<Fragment>
15
<Directory Id="TARGETDIR" Name="SourceDir">
src/wixlib/DirectXExtension.wxs
+1
-1
@@ -10,7 +10,7 @@
10
</Fragment>
11
12
<Fragment>
13
- <CustomAction Id="WixQueryDirectXCaps" BinaryKey="DirectXCA" DllEntry="WixQueryDirectXCaps" Return="ignore" />
13
+ <CustomAction Id="WixQueryDirectXCaps" DllEntry="WixQueryDirectXCaps" Return="ignore" BinaryRef="DirectXCA" />
14
15
<InstallUISequence>
16
<Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes" Condition="VersionNT > 400" />
src/wixlib/caerr.wxi
+1
-1
@@ -1,4 +1,4 @@
1
-<Include>
1
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
2
<?define msierrSecureObjectsFailedCreateSD = 25520?>
3
<?define msierrSecureObjectsFailedSet = 25521?>
4
<?define msierrSecureObjectsUnknownType = 25522?>