From df016066100df955d5ff98811e113fb2b1bd4b8a Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 26 Apr 2021 11:31:05 -0700
Subject: Implement integrated build process

---
 src/ext/DirectX/ca/directxca.vcxproj | 31 ++++++++++++++-----------------
 src/ext/DirectX/ca/packages.config   |  2 +-
 2 files changed, 15 insertions(+), 18 deletions(-)

(limited to 'src/ext/DirectX/ca')

diff --git a/src/ext/DirectX/ca/directxca.vcxproj b/src/ext/DirectX/ca/directxca.vcxproj
index e772009a..85ce0828 100644
--- a/src/ext/DirectX/ca/directxca.vcxproj
+++ b/src/ext/DirectX/ca/directxca.vcxproj
@@ -1,9 +1,7 @@
 <?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. -->
+
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
-  <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" />
-  
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -30,7 +28,7 @@
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  
+
   <PropertyGroup Label="Globals">
     <ProjectGuid>{76542B28-0FFD-47D3-AD6A-D0F20FA875AC}</ProjectGuid>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -40,14 +38,14 @@
     <ProjectModuleDefinitionFile>directx.def</ProjectModuleDefinitionFile>
     <Description>WiX Toolset DirectX CustomAction</Description>
   </PropertyGroup>
-  
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  
+
   <PropertyGroup>
     <ProjectAdditionalLinkLibraries>d3d9.lib;msi.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <ClCompile Include="directx.cpp" />
     <ClCompile Include="dllmain.cpp">
@@ -57,14 +55,13 @@
     <None Include="directx.def" />
     <None Include="packages.config" />
   </ItemGroup>
-  
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dutil" />
+    <PackageReference Include="WixToolset.WcaUtil" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" />
+    <PackageReference Include="GitInfo" />
+  </ItemGroup>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props'))" />
-  </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/ext/DirectX/ca/packages.config b/src/ext/DirectX/ca/packages.config
index e3dc0e43..6e8da8cb 100644
--- a/src/ext/DirectX/ca/packages.config
+++ b/src/ext/DirectX/ca/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.0-preview.0-build.1" targetFramework="native" />
   <package id="WixToolset.WcaUtil" version="4.0.16" targetFramework="native" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb