From 2d71bd9f4379a1605347581c7cdd271315cd94f7 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Wed, 2 Sep 2020 14:36:37 -0400
Subject: Fix Condition authoring.

---
 src/wixlib/DirectXExtension.wxs | 7 +++----
 src/wixlib/directx.wixproj      | 8 ++------
 2 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/wixlib')

diff --git a/src/wixlib/DirectXExtension.wxs b/src/wixlib/DirectXExtension.wxs
index 12a8bbb6..2e7ff31a 100644
--- a/src/wixlib/DirectXExtension.wxs
+++ b/src/wixlib/DirectXExtension.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -14,11 +13,11 @@
         <CustomAction Id="WixQueryDirectXCaps" BinaryKey="DirectXCA" DllEntry="WixQueryDirectXCaps" Return="ignore" />
         
         <InstallUISequence>
-            <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes">VersionNT &gt; 400</Custom>
+            <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes" Condition="VersionNT &gt; 400" />
         </InstallUISequence>
 
         <InstallExecuteSequence>
-            <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes">VersionNT &gt; 400</Custom>
+            <Custom Action="WixQueryDirectXCaps" Before="LaunchConditions" Overridable="yes" Condition="VersionNT &gt; 400" />
         </InstallExecuteSequence>
     </Fragment>
 
diff --git a/src/wixlib/directx.wixproj b/src/wixlib/directx.wixproj
index 60e3215a..bdad24a4 100644
--- a/src/wixlib/directx.wixproj
+++ b/src/wixlib/directx.wixproj
@@ -1,17 +1,13 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-<Project Sdk="WixToolset.Sdk">
-
+<Project Sdk="WixToolset.Sdk" ToolsVersion="4.0">
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <BindFiles>true</BindFiles>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\ca\directxca.vcxproj" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
   </ItemGroup>
-
-</Project>
+</Project>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb