From bfe5ab76b5ecc1a21078534e6fba90d12cfd3c00 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 30 Jan 2022 17:02:13 -0500
Subject: Add platform-specific CAs and compiler extension.

https://github.com/wixtoolset/issues/issues/5933
---
 .../DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs   | 5 +++--
 .../TestData/UsingPixelShaderVersion/Package.wxs                     | 2 +-
 .../TestData/UsingPixelShaderVersion/PackageComponents.wxs           | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/ext/DirectX/test/WixToolsetTest.DirectX')

diff --git a/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs b/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs
index ae8bbbf0..f936cdfe 100644
--- a/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs
+++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs
@@ -16,10 +16,11 @@ namespace WixToolsetTest.DirectX
             var folder = TestData.Get(@"TestData\UsingPixelShaderVersion");
             var build = new Builder(folder, typeof(DirectXExtensionFactory), new[] { folder });
 
-            var results = build.BuildAndQuery(Build, "CustomAction");
+            var results = build.BuildAndQuery(Build, "CustomAction", "Binary");
             WixAssert.CompareLineByLine(new[]
             {
-                "CustomAction:WixQueryDirectXCaps\t65\tDirectXCA\tWixQueryDirectXCaps\t",
+                "Binary:Wix4DXCA_X86\t[Binary data]",
+                "CustomAction:Wix4QueryDirectXCaps_X86\t65\tWix4DXCA_X86\tWixQueryDirectXCaps\t",
             }, results);
         }
 
diff --git a/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs b/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs
index bd31e81f..411893bc 100644
--- a/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs
+++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/Package.wxs
@@ -1,5 +1,5 @@
 <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">
+  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
     <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
diff --git a/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/PackageComponents.wxs b/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/PackageComponents.wxs
index f3a2ae92..de1288b3 100644
--- a/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/PackageComponents.wxs
+++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/TestData/UsingPixelShaderVersion/PackageComponents.wxs
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:directx="http://wixtoolset.org/schemas/v4/wxs/directx">
   <Fragment>
-    <PropertyRef Id="WIX_DIRECTX_PIXELSHADERVERSION" />
+    <directx:GetCapabilities />
+
     <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
         <Component>
             <File Source="example.txt" />
-- 
cgit v1.2.3-55-g6feb