Merge pull request #1000 from dorssel/dependabot/nuget/GitVersion.MsB…

…uild-6.0.0 Bump GitVersion.MsBuild from 5.12.0 to 6.0.0
dorssel · Aug 1, 2024 · 701757a · 701757a
2 parents 030c6d7 + 1233db2
commit 701757a
Show file tree

Hide file tree

Showing 11 changed files with 86 additions and 22 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -64,6 +64,7 @@ SPDX-License-Identifier: GPL-3.0-only
 
   <ItemGroup>
     <PackageReference Include="GitVersion.MsBuild" PrivateAssets="all" />
+    <Compile Include="$(MSBuildThisFileDirectory)Fake_GitVersionInformation.cs" Condition=" '$(MSBuildRuntimeType)' != 'Core' " />
   </ItemGroup>
 
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+SPDX-FileCopyrightText: 2024 Frans van Dorsselaer
+
+SPDX-License-Identifier: GPL-3.0-only
+-->
+<Project>
+
+  <PropertyGroup>
+    <!-- Fix GitVersion -->
+    <GitVersionFileExe>dotnet &quot;$(PkgGitVersion_MsBuild)/tools/net8.0/gitversion.dll&quot;</GitVersionFileExe>
+    <GitVersionAssemblyFile>$(PkgGitVersion_MsBuild)/tools/net8.0/GitVersion.MsBuild.dll</GitVersionAssemblyFile>
+  </PropertyGroup>
+
+</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-3.0-only
 <Project>
   <ItemGroup>
     <!-- all -->
-    <PackageVersion Include="GitVersion.MsBuild" Version="5.12.0" />
+    <PackageVersion Include="GitVersion.MsBuild" Version="6.0.0" />
     <!-- Usbipd -->
     <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />

diff --git a/Fake_GitVersionInformation.cs b/Fake_GitVersionInformation.cs
@@ -0,0 +1,46 @@
+// SPDX-FileCopyrightText: 2024 Frans van Dorsselaer
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
+// This file is compiled only when building from Visual Studio, which is incompatible with GitVersion 6.
+// To get accurate versioning, build from the command line with 'dotnet build' instead.
+
+using System.Diagnostics.CodeAnalysis;
+
+[ExcludeFromCodeCoverage]
+static class GitVersionInformation
+{
+    public static string Major = "0";
+    public static string Minor = "9";
+    public static string Patch = "99";
+    public static string PreReleaseTag = "";
+    public static string PreReleaseTagWithDash = "";
+    public static string PreReleaseLabel = "";
+    public static string PreReleaseLabelWithDash = "";
+    public static string PreReleaseNumber = "";
+    public static string WeightedPreReleaseNumber = "60000";
+    public static string BuildMetaData = "999";
+    public static string BuildMetaDataPadded = "0999";
+    public static string FullBuildMetaData = "999.Branch.vs.Sha.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+    public static string MajorMinorPatch = "0.9.99";
+    public static string SemVer = "0.9.99";
+    public static string LegacySemVer = "0.9.99";
+    public static string LegacySemVerPadded = "0.9.99";
+    public static string AssemblySemVer = "0.9.99.0";
+    public static string AssemblySemFileVer = "0.9.99.0";
+    public static string FullSemVer = "0.9.99+999";
+    public static string InformationalVersion = "0.9.99+999.Branch.vs.Sha.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+    public static string BranchName = "vs";
+    public static string EscapedBranchName = "vs";
+    public static string Sha = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; // DevSkim: ignore DS173237
+    public static string ShortSha = "aaaaaaa";
+    public static string NuGetVersionV2 = "0.9.99";
+    public static string NuGetVersion = "0.9.99";
+    public static string NuGetPreReleaseTagV2 = "";
+    public static string NuGetPreReleaseTag = "";
+    public static string VersionSourceSha = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; // DevSkim: ignore DS173237
+    public static string CommitsSinceVersionSource = "999";
+    public static string CommitsSinceVersionSourcePadded = "0999";
+    public static string UncommittedChanges = "9";
+    public static string CommitDate = "2024-07-27";
+}
diff --git a/Installer/packages.lock.json b/Installer/packages.lock.json
@@ -4,9 +4,9 @@
     "native,Version=v0.0": {
       "GitVersion.MsBuild": {
         "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
+        "requested": "[6.0.0, )",
+        "resolved": "6.0.0",
+        "contentHash": "WYn+IYYDkpTErfbtrfVsM4RxrCINTZRzTFkmAHnYisoUzk1i5kOY1kWeH6kljR3Kmqt8i2FLHaDB6VrIgX6Opg=="
       },
       "WixToolset.Firewall.wixext": {
         "type": "Direct",

diff --git a/UnitTests/packages.lock.json b/UnitTests/packages.lock.json
@@ -10,9 +10,9 @@
       },
       "GitVersion.MsBuild": {
         "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
+        "requested": "[6.0.0, )",
+        "resolved": "6.0.0",
+        "contentHash": "WYn+IYYDkpTErfbtrfVsM4RxrCINTZRzTFkmAHnYisoUzk1i5kOY1kWeH6kljR3Kmqt8i2FLHaDB6VrIgX6Opg=="
       },
       "Microsoft.NET.Test.Sdk": {
         "type": "Direct",

diff --git a/UsbIds/packages.lock.json b/UsbIds/packages.lock.json
@@ -4,9 +4,9 @@
     ".NETStandard,Version=v2.0": {
       "GitVersion.MsBuild": {
         "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
+        "requested": "[6.0.0, )",
+        "resolved": "6.0.0",
+        "contentHash": "WYn+IYYDkpTErfbtrfVsM4RxrCINTZRzTFkmAHnYisoUzk1i5kOY1kWeH6kljR3Kmqt8i2FLHaDB6VrIgX6Opg=="
       },
       "Microsoft.CodeAnalysis.CSharp": {
         "type": "Direct",

diff --git a/Usbipd.Automation/packages.lock.json b/Usbipd.Automation/packages.lock.json
@@ -4,9 +4,9 @@
     ".NETStandard,Version=v2.0": {
       "GitVersion.MsBuild": {
         "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
+        "requested": "[6.0.0, )",
+        "resolved": "6.0.0",
+        "contentHash": "WYn+IYYDkpTErfbtrfVsM4RxrCINTZRzTFkmAHnYisoUzk1i5kOY1kWeH6kljR3Kmqt8i2FLHaDB6VrIgX6Opg=="
       },
       "NETStandard.Library": {
         "type": "Direct",
@@ -26,9 +26,9 @@
     "net8.0-windows10.0.17763": {
       "GitVersion.MsBuild": {
         "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
+        "requested": "[6.0.0, )",
+        "resolved": "6.0.0",
+        "contentHash": "WYn+IYYDkpTErfbtrfVsM4RxrCINTZRzTFkmAHnYisoUzk1i5kOY1kWeH6kljR3Kmqt8i2FLHaDB6VrIgX6Opg=="
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",

diff --git a/Usbipd.PowerShell/packages.lock.json b/Usbipd.PowerShell/packages.lock.json
@@ -4,9 +4,9 @@
     ".NETStandard,Version=v2.0": {
       "GitVersion.MsBuild": {
         "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
+        "requested": "[6.0.0, )",
+        "resolved": "6.0.0",
+        "contentHash": "WYn+IYYDkpTErfbtrfVsM4RxrCINTZRzTFkmAHnYisoUzk1i5kOY1kWeH6kljR3Kmqt8i2FLHaDB6VrIgX6Opg=="
       },
       "NETStandard.Library": {
         "type": "Direct",

diff --git a/Usbipd/packages.lock.json b/Usbipd/packages.lock.json
@@ -4,9 +4,9 @@
     "net8.0-windows10.0.17763": {
       "GitVersion.MsBuild": {
         "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
+        "requested": "[6.0.0, )",
+        "resolved": "6.0.0",
+        "contentHash": "WYn+IYYDkpTErfbtrfVsM4RxrCINTZRzTFkmAHnYisoUzk1i5kOY1kWeH6kljR3Kmqt8i2FLHaDB6VrIgX6Opg=="
       },
       "Microsoft.DotNet.ILCompiler": {
         "type": "Direct",

diff --git a/usbipd-win.sln b/usbipd-win.sln
@@ -13,7 +13,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		codecov.yml = codecov.yml
 		COPYING.md = COPYING.md
 		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
+		Fake_GitVersionInformation.cs = Fake_GitVersionInformation.cs
 		GitVersion.yml = GitVersion.yml
 		global.json = global.json
 		nuget.config = nuget.config