From 44e69b72d820bcebee45b738372117d35d487404 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 18 Oct 2022 11:57:08 -0700
Subject: Update build dependencies and normalize more projects

---
 src/ext/ComPlus/ca/complusca.vcxproj         | 4 ++--
 src/ext/ComPlus/wixlib/complus.wixproj       | 4 ++--
 src/ext/Dependency/ca/dependencyca.vcxproj   | 4 ++--
 src/ext/Dependency/wixlib/dependency.wixproj | 4 ++--
 src/ext/DirectX/ca/directxca.vcxproj         | 5 ++---
 src/ext/DirectX/ca/packages.config           | 5 -----
 src/ext/Firewall/ca/fwca.vcxproj             | 4 ++--
 src/ext/Http/ca/httpca.vcxproj               | 4 ++--
 src/ext/Iis/ca/iisca.vcxproj                 | 4 ++--
 src/ext/Iis/wixlib/iis.wixproj               | 4 ++--
 src/ext/PowerShell/wixlib/powershell.wixproj | 4 ++--
 src/ext/Sql/ca/sqlca.vcxproj                 | 4 ++--
 src/ext/Sql/wixlib/sql.wixproj               | 4 ++--
 src/ext/Util/ca/utilca.vcxproj               | 4 ++--
 src/ext/VisualStudio/ca/vsca.vcxproj         | 4 ++--
 src/ext/VisualStudio/wixlib/vs.wixproj       | 4 ++--
 16 files changed, 30 insertions(+), 36 deletions(-)
 delete mode 100644 src/ext/DirectX/ca/packages.config

(limited to 'src/ext')

diff --git a/src/ext/ComPlus/ca/complusca.vcxproj b/src/ext/ComPlus/ca/complusca.vcxproj
index 39264f98..a5b0622e 100644
--- a/src/ext/ComPlus/ca/complusca.vcxproj
+++ b/src/ext/ComPlus/ca/complusca.vcxproj
@@ -92,8 +92,8 @@
 
   <ItemGroup>
     <PackageReference Include="WixToolset.WcaUtil" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="GitInfo" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/ext/ComPlus/wixlib/complus.wixproj b/src/ext/ComPlus/wixlib/complus.wixproj
index 9a70c17a..41f31a0d 100644
--- a/src/ext/ComPlus/wixlib/complus.wixproj
+++ b/src/ext/ComPlus/wixlib/complus.wixproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="GitInfo" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Dependency/ca/dependencyca.vcxproj b/src/ext/Dependency/ca/dependencyca.vcxproj
index 0913d899..336196bc 100644
--- a/src/ext/Dependency/ca/dependencyca.vcxproj
+++ b/src/ext/Dependency/ca/dependencyca.vcxproj
@@ -62,8 +62,8 @@
 
   <ItemGroup>
     <PackageReference Include="WixToolset.WcaUtil" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="GitInfo" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/ext/Dependency/wixlib/dependency.wixproj b/src/ext/Dependency/wixlib/dependency.wixproj
index cd30f666..32261349 100644
--- a/src/ext/Dependency/wixlib/dependency.wixproj
+++ b/src/ext/Dependency/wixlib/dependency.wixproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="GitInfo" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/DirectX/ca/directxca.vcxproj b/src/ext/DirectX/ca/directxca.vcxproj
index e9faff16..abc54156 100644
--- a/src/ext/DirectX/ca/directxca.vcxproj
+++ b/src/ext/DirectX/ca/directxca.vcxproj
@@ -52,13 +52,12 @@
     </ClCompile>
     <ClInclude Include="precomp.h" />
     <None Include="directx.def" />
-    <None Include="packages.config" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="WixToolset.WcaUtil" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="GitInfo" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/ext/DirectX/ca/packages.config b/src/ext/DirectX/ca/packages.config
deleted file mode 100644
index 6e8da8cb..00000000
--- a/src/ext/DirectX/ca/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <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
diff --git a/src/ext/Firewall/ca/fwca.vcxproj b/src/ext/Firewall/ca/fwca.vcxproj
index dd98574a..0f08bc72 100644
--- a/src/ext/Firewall/ca/fwca.vcxproj
+++ b/src/ext/Firewall/ca/fwca.vcxproj
@@ -66,8 +66,8 @@
 
   <ItemGroup>
     <PackageReference Include="WixToolset.WcaUtil" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="GitInfo" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/ext/Http/ca/httpca.vcxproj b/src/ext/Http/ca/httpca.vcxproj
index 31f781f6..9e6fbd56 100644
--- a/src/ext/Http/ca/httpca.vcxproj
+++ b/src/ext/Http/ca/httpca.vcxproj
@@ -64,8 +64,8 @@
 
   <ItemGroup>
     <PackageReference Include="WixToolset.WcaUtil" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="GitInfo" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/ext/Iis/ca/iisca.vcxproj b/src/ext/Iis/ca/iisca.vcxproj
index 7e4a1a3e..3ac9cdcf 100644
--- a/src/ext/Iis/ca/iisca.vcxproj
+++ b/src/ext/Iis/ca/iisca.vcxproj
@@ -138,8 +138,8 @@
 
   <ItemGroup>
     <PackageReference Include="WixToolset.WcaUtil" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="GitInfo" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/ext/Iis/wixlib/iis.wixproj b/src/ext/Iis/wixlib/iis.wixproj
index 989d2bc5..f4e6ae1b 100644
--- a/src/ext/Iis/wixlib/iis.wixproj
+++ b/src/ext/Iis/wixlib/iis.wixproj
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="GitInfo" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/PowerShell/wixlib/powershell.wixproj b/src/ext/PowerShell/wixlib/powershell.wixproj
index f35c819a..b28eb626 100644
--- a/src/ext/PowerShell/wixlib/powershell.wixproj
+++ b/src/ext/PowerShell/wixlib/powershell.wixproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="GitInfo" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Sql/ca/sqlca.vcxproj b/src/ext/Sql/ca/sqlca.vcxproj
index dee6e8fb..a6e85afb 100644
--- a/src/ext/Sql/ca/sqlca.vcxproj
+++ b/src/ext/Sql/ca/sqlca.vcxproj
@@ -73,8 +73,8 @@
 
   <ItemGroup>
     <PackageReference Include="WixToolset.WcaUtil" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="GitInfo" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/ext/Sql/wixlib/sql.wixproj b/src/ext/Sql/wixlib/sql.wixproj
index 8d92f5ad..ef2080c4 100644
--- a/src/ext/Sql/wixlib/sql.wixproj
+++ b/src/ext/Sql/wixlib/sql.wixproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="GitInfo" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Util/ca/utilca.vcxproj b/src/ext/Util/ca/utilca.vcxproj
index d8f086b5..352d7723 100644
--- a/src/ext/Util/ca/utilca.vcxproj
+++ b/src/ext/Util/ca/utilca.vcxproj
@@ -96,8 +96,8 @@
 
   <ItemGroup>
     <PackageReference Include="WixToolset.WcaUtil" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="GitInfo" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/ext/VisualStudio/ca/vsca.vcxproj b/src/ext/VisualStudio/ca/vsca.vcxproj
index 2ddff8d3..6eb78fd7 100644
--- a/src/ext/VisualStudio/ca/vsca.vcxproj
+++ b/src/ext/VisualStudio/ca/vsca.vcxproj
@@ -55,8 +55,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Native" />
     <PackageReference Include="WixToolset.WcaUtil" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="GitInfo" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/ext/VisualStudio/wixlib/vs.wixproj b/src/ext/VisualStudio/wixlib/vs.wixproj
index 8af4d7ef..61b4a93a 100644
--- a/src/ext/VisualStudio/wixlib/vs.wixproj
+++ b/src/ext/VisualStudio/wixlib/vs.wixproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" />
-    <PackageReference Include="GitInfo" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb