diff options
author | Rob Mensching <rob@firegiant.com> | 2022-10-18 11:57:08 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2022-10-19 13:23:21 -0700 |
commit | 44e69b72d820bcebee45b738372117d35d487404 (patch) | |
tree | c6fb14635ccfe00c2bda5409a0da9b61cebe8292 /src/internal/SetBuildNumber | |
parent | e550b63845a90e1a9452060b50a00ca5d9ee8c67 (diff) | |
download | wix-44e69b72d820bcebee45b738372117d35d487404.tar.gz wix-44e69b72d820bcebee45b738372117d35d487404.tar.bz2 wix-44e69b72d820bcebee45b738372117d35d487404.zip |
Update build dependencies and normalize more projects
Diffstat (limited to 'src/internal/SetBuildNumber')
-rw-r--r-- | src/internal/SetBuildNumber/Directory.Packages.props.pp | 12 | ||||
-rw-r--r-- | src/internal/SetBuildNumber/SetBuildNumber.proj | 4 | ||||
-rw-r--r-- | src/internal/SetBuildNumber/global.json.pp | 4 |
3 files changed, 9 insertions, 11 deletions
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": { |