aboutsummaryrefslogtreecommitdiff
path: root/src/ext
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-10-18 11:57:08 -0700
committerRob Mensching <rob@firegiant.com>2022-10-19 13:23:21 -0700
commit44e69b72d820bcebee45b738372117d35d487404 (patch)
treec6fb14635ccfe00c2bda5409a0da9b61cebe8292 /src/ext
parente550b63845a90e1a9452060b50a00ca5d9ee8c67 (diff)
downloadwix-44e69b72d820bcebee45b738372117d35d487404.tar.gz
wix-44e69b72d820bcebee45b738372117d35d487404.tar.bz2
wix-44e69b72d820bcebee45b738372117d35d487404.zip
Update build dependencies and normalize more projects
Diffstat (limited to 'src/ext')
-rw-r--r--src/ext/ComPlus/ca/complusca.vcxproj4
-rw-r--r--src/ext/ComPlus/wixlib/complus.wixproj4
-rw-r--r--src/ext/Dependency/ca/dependencyca.vcxproj4
-rw-r--r--src/ext/Dependency/wixlib/dependency.wixproj4
-rw-r--r--src/ext/DirectX/ca/directxca.vcxproj5
-rw-r--r--src/ext/DirectX/ca/packages.config5
-rw-r--r--src/ext/Firewall/ca/fwca.vcxproj4
-rw-r--r--src/ext/Http/ca/httpca.vcxproj4
-rw-r--r--src/ext/Iis/ca/iisca.vcxproj4
-rw-r--r--src/ext/Iis/wixlib/iis.wixproj4
-rw-r--r--src/ext/PowerShell/wixlib/powershell.wixproj4
-rw-r--r--src/ext/Sql/ca/sqlca.vcxproj4
-rw-r--r--src/ext/Sql/wixlib/sql.wixproj4
-rw-r--r--src/ext/Util/ca/utilca.vcxproj4
-rw-r--r--src/ext/VisualStudio/ca/vsca.vcxproj4
-rw-r--r--src/ext/VisualStudio/wixlib/vs.wixproj4
16 files changed, 30 insertions, 36 deletions
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 @@
92 92
93 <ItemGroup> 93 <ItemGroup>
94 <PackageReference Include="WixToolset.WcaUtil" /> 94 <PackageReference Include="WixToolset.WcaUtil" />
95 <PackageReference Include="Microsoft.SourceLink.GitHub" /> 95 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
96 <PackageReference Include="GitInfo" /> 96 <PackageReference Include="GitInfo" PrivateAssets="All" />
97 </ItemGroup> 97 </ItemGroup>
98 98
99 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 99 <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 @@
21 </ItemGroup> 21 </ItemGroup>
22 22
23 <ItemGroup> 23 <ItemGroup>
24 <PackageReference Include="Microsoft.SourceLink.GitHub" /> 24 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
25 <PackageReference Include="GitInfo" /> 25 <PackageReference Include="GitInfo" PrivateAssets="All" />
26 </ItemGroup> 26 </ItemGroup>
27</Project> 27</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 @@
62 62
63 <ItemGroup> 63 <ItemGroup>
64 <PackageReference Include="WixToolset.WcaUtil" /> 64 <PackageReference Include="WixToolset.WcaUtil" />
65 <PackageReference Include="Microsoft.SourceLink.GitHub" /> 65 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
66 <PackageReference Include="GitInfo" /> 66 <PackageReference Include="GitInfo" PrivateAssets="All" />
67 </ItemGroup> 67 </ItemGroup>
68 68
69 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 69 <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 @@
23 </ItemGroup> 23 </ItemGroup>
24 24
25 <ItemGroup> 25 <ItemGroup>
26 <PackageReference Include="Microsoft.SourceLink.GitHub" /> 26 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
27 <PackageReference Include="GitInfo" /> 27 <PackageReference Include="GitInfo" PrivateAssets="All" />
28 </ItemGroup> 28 </ItemGroup>
29</Project> 29</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 @@
52 </ClCompile> 52 </ClCompile>
53 <ClInclude Include="precomp.h" /> 53 <ClInclude Include="precomp.h" />
54 <None Include="directx.def" /> 54 <None Include="directx.def" />
55 <None Include="packages.config" />
56 </ItemGroup> 55 </ItemGroup>
57 56
58 <ItemGroup> 57 <ItemGroup>
59 <PackageReference Include="WixToolset.WcaUtil" /> 58 <PackageReference Include="WixToolset.WcaUtil" />
60 <PackageReference Include="Microsoft.SourceLink.GitHub" /> 59 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
61 <PackageReference Include="GitInfo" /> 60 <PackageReference Include="GitInfo" PrivateAssets="All" />
62 </ItemGroup> 61 </ItemGroup>
63 62
64 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 63 <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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<packages>
3 <package id="WixToolset.DUtil" version="4.0.0-preview.0-build.1" targetFramework="native" />
4 <package id="WixToolset.WcaUtil" version="4.0.16" targetFramework="native" />
5</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 @@
66 66
67 <ItemGroup> 67 <ItemGroup>
68 <PackageReference Include="WixToolset.WcaUtil" /> 68 <PackageReference Include="WixToolset.WcaUtil" />
69 <PackageReference Include="Microsoft.SourceLink.GitHub" /> 69 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
70 <PackageReference Include="GitInfo" /> 70 <PackageReference Include="GitInfo" PrivateAssets="All" />
71 </ItemGroup> 71 </ItemGroup>
72 72
73 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 73 <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 @@
64 64
65 <ItemGroup> 65 <ItemGroup>
66 <PackageReference Include="WixToolset.WcaUtil" /> 66 <PackageReference Include="WixToolset.WcaUtil" />
67 <PackageReference Include="Microsoft.SourceLink.GitHub" /> 67 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
68 <PackageReference Include="GitInfo" /> 68 <PackageReference Include="GitInfo" PrivateAssets="All" />
69 </ItemGroup> 69 </ItemGroup>
70 70
71 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 71 <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 @@
138 138
139 <ItemGroup> 139 <ItemGroup>
140 <PackageReference Include="WixToolset.WcaUtil" /> 140 <PackageReference Include="WixToolset.WcaUtil" />
141 <PackageReference Include="Microsoft.SourceLink.GitHub" /> 141 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
142 <PackageReference Include="GitInfo" /> 142 <PackageReference Include="GitInfo" PrivateAssets="All" />
143 </ItemGroup> 143 </ItemGroup>
144 144
145 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 145 <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 @@
20 </ItemGroup> 20 </ItemGroup>
21 21
22 <ItemGroup> 22 <ItemGroup>
23 <PackageReference Include="Microsoft.SourceLink.GitHub" /> 23 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
24 <PackageReference Include="GitInfo" /> 24 <PackageReference Include="GitInfo" PrivateAssets="All" />
25 </ItemGroup> 25 </ItemGroup>
26</Project> 26</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 @@
6 </PropertyGroup> 6 </PropertyGroup>
7 7
8 <ItemGroup> 8 <ItemGroup>
9 <PackageReference Include="Microsoft.SourceLink.GitHub" /> 9 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
10 <PackageReference Include="GitInfo" /> 10 <PackageReference Include="GitInfo" PrivateAssets="All" />
11 </ItemGroup> 11 </ItemGroup>
12</Project> 12</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 @@
73 73
74 <ItemGroup> 74 <ItemGroup>
75 <PackageReference Include="WixToolset.WcaUtil" /> 75 <PackageReference Include="WixToolset.WcaUtil" />
76 <PackageReference Include="Microsoft.SourceLink.GitHub" /> 76 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
77 <PackageReference Include="GitInfo" /> 77 <PackageReference Include="GitInfo" PrivateAssets="All" />
78 </ItemGroup> 78 </ItemGroup>
79 79
80 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 80 <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 @@
19 </ItemGroup> 19 </ItemGroup>
20 20
21 <ItemGroup> 21 <ItemGroup>
22 <PackageReference Include="Microsoft.SourceLink.GitHub" /> 22 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
23 <PackageReference Include="GitInfo" /> 23 <PackageReference Include="GitInfo" PrivateAssets="All" />
24 </ItemGroup> 24 </ItemGroup>
25</Project> 25</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 @@
96 96
97 <ItemGroup> 97 <ItemGroup>
98 <PackageReference Include="WixToolset.WcaUtil" /> 98 <PackageReference Include="WixToolset.WcaUtil" />
99 <PackageReference Include="Microsoft.SourceLink.GitHub" /> 99 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
100 <PackageReference Include="GitInfo" /> 100 <PackageReference Include="GitInfo" PrivateAssets="All" />
101 </ItemGroup> 101 </ItemGroup>
102 102
103 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 103 <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 @@
55 <ItemGroup> 55 <ItemGroup>
56 <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Native" /> 56 <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Native" />
57 <PackageReference Include="WixToolset.WcaUtil" /> 57 <PackageReference Include="WixToolset.WcaUtil" />
58 <PackageReference Include="Microsoft.SourceLink.GitHub" /> 58 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
59 <PackageReference Include="GitInfo" /> 59 <PackageReference Include="GitInfo" PrivateAssets="All" />
60 </ItemGroup> 60 </ItemGroup>
61 61
62 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 62 <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 @@
14 </ItemGroup> 14 </ItemGroup>
15 15
16 <ItemGroup> 16 <ItemGroup>
17 <PackageReference Include="Microsoft.SourceLink.GitHub" /> 17 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
18 <PackageReference Include="GitInfo" /> 18 <PackageReference Include="GitInfo" PrivateAssets="All" />
19 </ItemGroup> 19 </ItemGroup>
20</Project> 20</Project>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 05:04:26 +0000