aboutsummaryrefslogtreecommitdiff
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
parente550b63845a90e1a9452060b50a00ca5d9ee8c67 (diff)
downloadwix-44e69b72d820bcebee45b738372117d35d487404.tar.gz
wix-44e69b72d820bcebee45b738372117d35d487404.tar.bz2
wix-44e69b72d820bcebee45b738372117d35d487404.zip
Update build dependencies and normalize more projects
Diffstat
-rw-r--r--src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj2
-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
-rw-r--r--src/internal/SetBuildNumber/Directory.Packages.props.pp12
-rw-r--r--src/internal/SetBuildNumber/SetBuildNumber.proj4
-rw-r--r--src/internal/SetBuildNumber/global.json.pp4
-rw-r--r--src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj4
-rw-r--r--src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props4
-rw-r--r--src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets20
-rw-r--r--src/internal/WixBuildTools.TestSupport.Native/packages.config12
-rw-r--r--src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj4
-rw-r--r--src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec4
-rw-r--r--src/wix/wixnative/wixnative.vcxproj4
27 files changed, 65 insertions, 75 deletions
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj
index fd26a027..b83084d0 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj
+++ b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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. --> 2<!-- 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. -->
3 3
4<Project Sdk="Microsoft.Build.NoTargets/3.0.4"> 4<Project Sdk="Microsoft.Build.NoTargets">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>net6.0</TargetFramework> 6 <TargetFramework>net6.0</TargetFramework>
7 <PackageId>WixToolset.BootstrapperCore.Native</PackageId> 7 <PackageId>WixToolset.BootstrapperCore.Native</PackageId>
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>
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index e1df6f8e..38e0e3ab 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -45,7 +45,6 @@
45 <PackageVersion Include="System.DirectoryServices" Version="4.7.0" /> 45 <PackageVersion Include="System.DirectoryServices" Version="4.7.0" />
46 <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="4.7.0" /> 46 <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="4.7.0" />
47 <PackageVersion Include="System.IO.Compression" Version="4.3.0" /> 47 <PackageVersion Include="System.IO.Compression" Version="4.3.0" />
48 <!-- Warning: The version for System.IO.FileSystem.AccessControl must be kept in sync with WixToolset.Core.Native.nuspec -->
49 <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="4.6.0" /> 48 <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="4.6.0" />
50 <PackageVersion Include="System.Reflection.Metadata" Version="1.6.0" /> 49 <PackageVersion Include="System.Reflection.Metadata" Version="1.6.0" />
51 <PackageVersion Include="System.Security.Principal.Windows" Version="4.7.0" /> 50 <PackageVersion Include="System.Security.Principal.Windows" Version="4.7.0" />
@@ -73,15 +72,14 @@
73 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="15.7.179" /> 72 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="15.7.179" />
74 </ItemGroup> 73 </ItemGroup>
75 74
75 <!-- Keep the following versions in sync with internal\WixBuildTools.TestSupport.Native\packages.config -->
76 <ItemGroup> 76 <ItemGroup>
77 <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> 77 <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
78 <PackageVersion Include="GitInfo" Version="2.2.0" /> 78 <PackageVersion Include="GitInfo" Version="2.2.0" />
79 </ItemGroup>
80 79
81 <ItemGroup> 80 <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
82 <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.8.3" /> 81 <PackageVersion Include="xunit" Version="2.4.2" />
83 <PackageVersion Include="xunit" Version="2.4.1" />
84 <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" /> 82 <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
85 <PackageVersion Include="xunit.assert" Version="2.4.1" /> 83 <PackageVersion Include="xunit.assert" Version="2.4.2" />
86 </ItemGroup> 84 </ItemGroup>
87</Project> 85</Project>
diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj
index d9a918e2..a63fd671 100644
--- a/src/internal/SetBuildNumber/SetBuildNumber.proj
+++ b/src/internal/SetBuildNumber/SetBuildNumber.proj
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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. --> 2<!-- 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. -->
3 3
4<Project Sdk="Microsoft.Build.NoTargets/3.0.4"> 4<Project Sdk="Microsoft.Build.NoTargets/3.5.6">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>net6.0</TargetFramework> 6 <TargetFramework>net6.0</TargetFramework>
7 <!-- Disable central package version management since this project will write the central package version management file --> 7 <!-- Disable central package version management since this project will write the central package version management file -->
@@ -94,6 +94,6 @@
94 94
95 95
96 <ItemGroup> 96 <ItemGroup>
97 <PackageReference Include="GitInfo" Version="2.1.2" /> 97 <PackageReference Include="GitInfo" Version="2.2.0" />
98 </ItemGroup> 98 </ItemGroup>
99</Project> 99</Project>
diff --git a/src/internal/SetBuildNumber/global.json.pp b/src/internal/SetBuildNumber/global.json.pp
index a3485efa..bad3c0bd 100644
--- a/src/internal/SetBuildNumber/global.json.pp
+++ b/src/internal/SetBuildNumber/global.json.pp
@@ -1,7 +1,7 @@
1{ 1{
2 "msbuild-sdks": { 2 "msbuild-sdks": {
3 "Microsoft.Build.Traversal": "3.0.23", 3 "Microsoft.Build.Traversal": "3.2.0",
4 "Microsoft.Build.NoTargets": "3.3.0", 4 "Microsoft.Build.NoTargets": "3.5.6",
5 "WixToolset.Sdk": "{packageversion}" 5 "WixToolset.Sdk": "{packageversion}"
6 }, 6 },
7 "sdk": { 7 "sdk": {
diff --git a/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
index 861f1679..d12d3623 100644
--- a/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
+++ b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
@@ -21,8 +21,8 @@
21 </ItemGroup> 21 </ItemGroup>
22 22
23 <ItemGroup> 23 <ItemGroup>
24 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> 24 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
25 <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="All" /> 25 <PackageReference Include="GitInfo" PrivateAssets="All" />
26 </ItemGroup> 26 </ItemGroup>
27 27
28</Project> 28</Project>
diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props
index a0952197..d9d9dab4 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props
+++ b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props
@@ -1,11 +1,11 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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. --> 2<!-- 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. -->
3 3
4<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 4<Project>
5 <PropertyGroup> 5 <PropertyGroup>
6 <RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore))</RepoRootDir> 6 <RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore))</RepoRootDir>
7 </PropertyGroup> 7 </PropertyGroup>
8 <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props')" /> 8 <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.2\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.2\build\xunit.core.props')" />
9 <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" /> 9 <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" />
10 <PropertyGroup> 10 <PropertyGroup>
11 <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> 11 <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
index 5b6f2ef3..3d28ed57 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
+++ b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
@@ -22,30 +22,30 @@
22 <HintPath>$(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll</HintPath> 22 <HintPath>$(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll</HintPath>
23 </Reference> 23 </Reference>
24 <Reference Include="xunit.assert"> 24 <Reference Include="xunit.assert">
25 <HintPath>$(RootPackagesFolder)xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath> 25 <HintPath>$(RootPackagesFolder)xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll</HintPath>
26 </Reference> 26 </Reference>
27 <Reference Include="xunit.core"> 27 <Reference Include="xunit.core">
28 <HintPath>$(RootPackagesFolder)xunit.extensibility.core.2.4.1\lib\netstandard1.1\xunit.core.dll</HintPath> 28 <HintPath>$(RootPackagesFolder)xunit.extensibility.core.2.4.2\lib\netstandard1.1\xunit.core.dll</HintPath>
29 </Reference> 29 </Reference>
30 <Reference Include="xunit.execution.desktop"> 30 <Reference Include="xunit.execution.desktop">
31 <HintPath>$(RootPackagesFolder)xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath> 31 <HintPath>$(RootPackagesFolder)xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll</HintPath>
32 </Reference> 32 </Reference>
33 </ItemGroup> 33 </ItemGroup>
34 34
35 <Import Project="$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets" Condition="Exists('$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets')" /> 35 <Import Project="$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets" Condition="Exists('$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets')" />
36 <Import Project="$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets')" /> 36 <Import Project="$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets" Condition="Exists('$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets')" />
37 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 37 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
38 <PropertyGroup> 38 <PropertyGroup>
39 <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> 39 <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>
40 </PropertyGroup> 40 </PropertyGroup>
41 <Error Condition="!Exists('$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)GitInfo.2.1.2\build\GitInfo.targets'))" /> 41 <Error Condition="!Exists('$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)GitInfo.2.2.0\build\GitInfo.targets'))" />
42 <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.props'))" /> 42 <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.props'))" />
43 <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.1\build\xunit.core.targets'))" /> 43 <Error Condition="!Exists('$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.core.2.4.2\build\xunit.core.targets'))" />
44 <Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props'))" /> 44 <Error Condition="!Exists('$(RootPackagesFolder)xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RootPackagesFolder)xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props'))" />
45 </Target> 45 </Target>
46 46
47 <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.4.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x86" Condition=" '$(Platform)'!='x64' " /> 47 <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.4.2\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x86" Condition=" '$(Platform)'!='x64' " />
48 <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.4.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x64" Condition=" '$(Platform)'=='x64' " /> 48 <UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.4.2\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x64" Condition=" '$(Platform)'=='x64' " />
49 <Target Name="Test"> 49 <Target Name="Test">
50 <!-- https://xunit.net/docs/running-tests-in-msbuild --> 50 <!-- https://xunit.net/docs/running-tests-in-msbuild -->
51 <!-- https://github.com/xunit/xunit/issues/2188 --> 51 <!-- https://github.com/xunit/xunit/issues/2188 -->
diff --git a/src/internal/WixBuildTools.TestSupport.Native/packages.config b/src/internal/WixBuildTools.TestSupport.Native/packages.config
index 5fa2cecb..060bff6b 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/packages.config
+++ b/src/internal/WixBuildTools.TestSupport.Native/packages.config
@@ -6,12 +6,12 @@
6 Update build\WixBuildTools.TestSupport.native.props and build\WixBuildTools.TestSupport.native.targets 6 Update build\WixBuildTools.TestSupport.native.props and build\WixBuildTools.TestSupport.native.targets
7 when any of these versions are updated. 7 when any of these versions are updated.
8 --> 8 -->
9 <package id="GitInfo" version="2.1.2" /> 9 <package id="GitInfo" version="2.2.0" />
10 <package id="xunit.abstractions" version="2.0.3" /> 10 <package id="xunit.abstractions" version="2.0.3" />
11 <package id="xunit.assert" version="2.4.1" /> 11 <package id="xunit.assert" version="2.4.2" />
12 <package id="xunit.core" version="2.4.1" /> 12 <package id="xunit.core" version="2.4.2" />
13 <package id="xunit.extensibility.core" version="2.4.1" /> 13 <package id="xunit.extensibility.core" version="2.4.2" />
14 <package id="xunit.extensibility.execution" version="2.4.1" /> 14 <package id="xunit.extensibility.execution" version="2.4.2" />
15 <package id="xunit.runner.msbuild" version="2.4.1" /> 15 <package id="xunit.runner.msbuild" version="2.4.2" />
16 <package id="xunit.runner.visualstudio" version="2.4.5" /> 16 <package id="xunit.runner.visualstudio" version="2.4.5" />
17</packages> 17</packages>
diff --git a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
index 031245ba..6698bff7 100644
--- a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
+++ b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
@@ -22,7 +22,7 @@
22 </ItemGroup> 22 </ItemGroup>
23 23
24 <ItemGroup> 24 <ItemGroup>
25 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> 25 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
26 <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="All" /> 26 <PackageReference Include="GitInfo" PrivateAssets="All" />
27 </ItemGroup> 27 </ItemGroup>
28</Project> 28</Project>
diff --git a/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
index e3389bcd..c8fc3161 100644
--- a/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
+++ b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
@@ -12,9 +12,7 @@
12 <projectUrl>$projectUrl$</projectUrl> 12 <projectUrl>$projectUrl$</projectUrl>
13 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> 13 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
14 <dependencies> 14 <dependencies>
15 <group targetFramework=".NETStandard2.0"> 15 <group targetFramework=".NETStandard2.0" />
16 <dependency id="System.IO.FileSystem.AccessControl" version="4.6.0" exclude="Build,Analyzers" />
17 </group>
18 </dependencies> 16 </dependencies>
19 </metadata> 17 </metadata>
20 18
diff --git a/src/wix/wixnative/wixnative.vcxproj b/src/wix/wixnative/wixnative.vcxproj
index e61a8a3d..01b073f9 100644
--- a/src/wix/wixnative/wixnative.vcxproj
+++ b/src/wix/wixnative/wixnative.vcxproj
@@ -62,8 +62,8 @@
62 62
63 <ItemGroup> 63 <ItemGroup>
64 <PackageReference Include="WixToolset.Dutil" /> 64 <PackageReference Include="WixToolset.Dutil" />
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" />
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-19 21:59:32 +0000