From e6c98d58a9044a74ba6590a9a04ad42881db12a4 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Tue, 27 Oct 2020 16:01:25 -0400
Subject: Update project for Package/SummaryInformation change (and others).
---
src/ca/directxca.vcxproj | 8 --------
.../TestData/UsingPixelShaderVersion/Package.wxs | 11 +++++------
src/wixlib/DirectXExtension.wxs | 2 +-
src/wixlib/caerr.wxi | 2 +-
4 files changed, 7 insertions(+), 16 deletions(-)
(limited to 'src')
diff --git a/src/ca/directxca.vcxproj b/src/ca/directxca.vcxproj
index a9d0c168..e772009a 100644
--- a/src/ca/directxca.vcxproj
+++ b/src/ca/directxca.vcxproj
@@ -21,14 +21,6 @@
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Debug|ARM">
- <Configuration>Debug</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|ARM">
- <Configuration>Release</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
diff --git a/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs b/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs
index 68ff98fd..44820bdd 100644
--- a/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs
+++ b/src/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
- <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
- <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+ <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
+
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
- <MediaTemplate />
+
<Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
<ComponentGroupRef Id="ProductComponents" />
</Feature>
- </Product>
+ </Package>
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
diff --git a/src/wixlib/DirectXExtension.wxs b/src/wixlib/DirectXExtension.wxs
index 2e7ff31a..b83dc98d 100644
--- a/src/wixlib/DirectXExtension.wxs
+++ b/src/wixlib/DirectXExtension.wxs
@@ -10,7 +10,7 @@
</Fragment>
<Fragment>
- <CustomAction Id="WixQueryDirectXCaps" BinaryKey="DirectXCA" DllEntry="WixQueryDirectXCaps" Return="ignore" />
+ <CustomAction Id="WixQueryDirectXCaps" DllEntry="WixQueryDirectXCaps" Return="ignore" BinaryRef="DirectXCA" />
<InstallUISequence>
<Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes" Condition="VersionNT > 400" />
diff --git a/src/wixlib/caerr.wxi b/src/wixlib/caerr.wxi
index 141942f2..ff7ec121 100644
--- a/src/wixlib/caerr.wxi
+++ b/src/wixlib/caerr.wxi
@@ -1,4 +1,4 @@
-<Include>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
<?define msierrSecureObjectsFailedCreateSD = 25520?>
<?define msierrSecureObjectsFailedSet = 25521?>
<?define msierrSecureObjectsUnknownType = 25522?>
--
cgit v1.2.3-55-g6feb