Skip to content

Commit 701757a

Browse files
dorsseldorssel
authored
Merge pull request #1000 from dorssel/dependabot/nuget/GitVersion.MsBuild-6.0.0
Bump GitVersion.MsBuild from 5.12.0 to 6.0.0
2 parents 030c6d7 + 1233db2 commit 701757a

File tree

11 files changed

+86
-22
lines changed

11 files changed

+86
-22
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ SPDX-License-Identifier: GPL-3.0-only
6464

6565
<ItemGroup>
6666
<PackageReference Include="GitVersion.MsBuild" PrivateAssets="all" />
67+
<Compile Include="$(MSBuildThisFileDirectory)Fake_GitVersionInformation.cs" Condition=" '$(MSBuildRuntimeType)' != 'Core' " />
6768
</ItemGroup>
6869

6970
</Project>

‎Directory.Build.targets

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
SPDX-FileCopyrightText: 2024 Frans van Dorsselaer
4+
5+
SPDX-License-Identifier: GPL-3.0-only
6+
-->
7+
<Project>
8+
9+
<PropertyGroup>
10+
<!-- Fix GitVersion -->
11+
<GitVersionFileExe>dotnet &quot;$(PkgGitVersion_MsBuild)/tools/net8.0/gitversion.dll&quot;</GitVersionFileExe>
12+
<GitVersionAssemblyFile>$(PkgGitVersion_MsBuild)/tools/net8.0/GitVersion.MsBuild.dll</GitVersionAssemblyFile>
13+
</PropertyGroup>
14+
15+
</Project>

‎Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-3.0-only
77
<Project>
88
<ItemGroup>
99
<!-- all -->
10-
<PackageVersion Include="GitVersion.MsBuild" Version="5.12.0" />
10+
<PackageVersion Include="GitVersion.MsBuild" Version="6.0.0" />
1111
<!-- Usbipd -->
1212
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
1313
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />

‎Fake_GitVersionInformation.cs

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
// SPDX-FileCopyrightText: 2024 Frans van Dorsselaer
2+
//
3+
// SPDX-License-Identifier: GPL-3.0-only
4+
5+
// This file is compiled only when building from Visual Studio, which is incompatible with GitVersion 6.
6+
// To get accurate versioning, build from the command line with 'dotnet build' instead.
7+
8+
using System.Diagnostics.CodeAnalysis;
9+
10+
[ExcludeFromCodeCoverage]
11+
static class GitVersionInformation
12+
{
13+
public static string Major = "0";
14+
public static string Minor = "9";
15+
public static string Patch = "99";
16+
public static string PreReleaseTag = "";
17+
public static string PreReleaseTagWithDash = "";
18+
public static string PreReleaseLabel = "";
19+
public static string PreReleaseLabelWithDash = "";
20+
public static string PreReleaseNumber = "";
21+
public static string WeightedPreReleaseNumber = "60000";
22+
public static string BuildMetaData = "999";
23+
public static string BuildMetaDataPadded = "0999";
24+
public static string FullBuildMetaData = "999.Branch.vs.Sha.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
25+
public static string MajorMinorPatch = "0.9.99";
26+
public static string SemVer = "0.9.99";
27+
public static string LegacySemVer = "0.9.99";
28+
public static string LegacySemVerPadded = "0.9.99";
29+
public static string AssemblySemVer = "0.9.99.0";
30+
public static string AssemblySemFileVer = "0.9.99.0";
31+
public static string FullSemVer = "0.9.99+999";
32+
public static string InformationalVersion = "0.9.99+999.Branch.vs.Sha.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
33+
public static string BranchName = "vs";
34+
public static string EscapedBranchName = "vs";
35+
public static string Sha = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; // DevSkim: ignore DS173237
36+
public static string ShortSha = "aaaaaaa";
37+
public static string NuGetVersionV2 = "0.9.99";
38+
public static string NuGetVersion = "0.9.99";
39+
public static string NuGetPreReleaseTagV2 = "";
40+
public static string NuGetPreReleaseTag = "";
41+
public static string VersionSourceSha = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; // DevSkim: ignore DS173237
42+
public static string CommitsSinceVersionSource = "999";
43+
public static string CommitsSinceVersionSourcePadded = "0999";
44+
public static string UncommittedChanges = "9";
45+
public static string CommitDate = "2024-07-27";
46+
}

‎Installer/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"native,Version=v0.0": {
55
"GitVersion.MsBuild": {
66
"type": "Direct",
7-
"requested": "[5.12.0, )",
8-
"resolved": "5.12.0",
9-
"contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
7+
"requested": "[6.0.0, )",
8+
"resolved": "6.0.0",
9+
"contentHash": "WYn+IYYDkpTErfbtrfVsM4RxrCINTZRzTFkmAHnYisoUzk1i5kOY1kWeH6kljR3Kmqt8i2FLHaDB6VrIgX6Opg=="
1010
},
1111
"WixToolset.Firewall.wixext": {
1212
"type": "Direct",

‎UnitTests/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
},
1111
"GitVersion.MsBuild": {
1212
"type": "Direct",
13-
"requested": "[5.12.0, )",
14-
"resolved": "5.12.0",
15-
"contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
13+
"requested": "[6.0.0, )",
14+
"resolved": "6.0.0",
15+
"contentHash": "WYn+IYYDkpTErfbtrfVsM4RxrCINTZRzTFkmAHnYisoUzk1i5kOY1kWeH6kljR3Kmqt8i2FLHaDB6VrIgX6Opg=="
1616
},
1717
"Microsoft.NET.Test.Sdk": {
1818
"type": "Direct",

‎UsbIds/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
".NETStandard,Version=v2.0": {
55
"GitVersion.MsBuild": {
66
"type": "Direct",
7-
"requested": "[5.12.0, )",
8-
"resolved": "5.12.0",
9-
"contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
7+
"requested": "[6.0.0, )",
8+
"resolved": "6.0.0",
9+
"contentHash": "WYn+IYYDkpTErfbtrfVsM4RxrCINTZRzTFkmAHnYisoUzk1i5kOY1kWeH6kljR3Kmqt8i2FLHaDB6VrIgX6Opg=="
1010
},
1111
"Microsoft.CodeAnalysis.CSharp": {
1212
"type": "Direct",

‎Usbipd.Automation/packages.lock.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
".NETStandard,Version=v2.0": {
55
"GitVersion.MsBuild": {
66
"type": "Direct",
7-
"requested": "[5.12.0, )",
8-
"resolved": "5.12.0",
9-
"contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
7+
"requested": "[6.0.0, )",
8+
"resolved": "6.0.0",
9+
"contentHash": "WYn+IYYDkpTErfbtrfVsM4RxrCINTZRzTFkmAHnYisoUzk1i5kOY1kWeH6kljR3Kmqt8i2FLHaDB6VrIgX6Opg=="
1010
},
1111
"NETStandard.Library": {
1212
"type": "Direct",
@@ -26,9 +26,9 @@
2626
"net8.0-windows10.0.17763": {
2727
"GitVersion.MsBuild": {
2828
"type": "Direct",
29-
"requested": "[5.12.0, )",
30-
"resolved": "5.12.0",
31-
"contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
29+
"requested": "[6.0.0, )",
30+
"resolved": "6.0.0",
31+
"contentHash": "WYn+IYYDkpTErfbtrfVsM4RxrCINTZRzTFkmAHnYisoUzk1i5kOY1kWeH6kljR3Kmqt8i2FLHaDB6VrIgX6Opg=="
3232
},
3333
"Microsoft.NET.ILLink.Tasks": {
3434
"type": "Direct",

‎Usbipd.PowerShell/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
".NETStandard,Version=v2.0": {
55
"GitVersion.MsBuild": {
66
"type": "Direct",
7-
"requested": "[5.12.0, )",
8-
"resolved": "5.12.0",
9-
"contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
7+
"requested": "[6.0.0, )",
8+
"resolved": "6.0.0",
9+
"contentHash": "WYn+IYYDkpTErfbtrfVsM4RxrCINTZRzTFkmAHnYisoUzk1i5kOY1kWeH6kljR3Kmqt8i2FLHaDB6VrIgX6Opg=="
1010
},
1111
"NETStandard.Library": {
1212
"type": "Direct",

‎Usbipd/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"net8.0-windows10.0.17763": {
55
"GitVersion.MsBuild": {
66
"type": "Direct",
7-
"requested": "[5.12.0, )",
8-
"resolved": "5.12.0",
9-
"contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
7+
"requested": "[6.0.0, )",
8+
"resolved": "6.0.0",
9+
"contentHash": "WYn+IYYDkpTErfbtrfVsM4RxrCINTZRzTFkmAHnYisoUzk1i5kOY1kWeH6kljR3Kmqt8i2FLHaDB6VrIgX6Opg=="
1010
},
1111
"Microsoft.DotNet.ILCompiler": {
1212
"type": "Direct",

0 commit comments

Comments
 (0)