Merge pull request #82 from dorssel/gitversion

Refactor GitVersion
dorssel · Dec 23, 2024 · 20e2e62 · 20e2e62
2 parents 770d90d + 334517a
commit 20e2e62
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,6 +15,13 @@
         "trx2junit"
       ],
       "rollForward": false
+    },
+    "gitversion.tool": {
+      "version": "6.1.0",
+      "commands": [
+        "dotnet-gitversion"
+      ],
+      "rollForward": false
     }
   }
 }
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -53,6 +53,10 @@ SPDX-License-Identifier: MIT
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Dorssel.GitVersion.MsBuild" PrivateAssets="all" />
+  </ItemGroup>
+
   <Target Name="SetCopyright" AfterTargets="GetVersion">
     <PropertyGroup>
       <!-- For deterministic builds, use the commit year as the copyright year. -->
@@ -65,7 +69,6 @@ SPDX-License-Identifier: MIT
   <Target Name="SetPackageVersion" AfterTargets="GetVersion">
     <PropertyGroup>
       <PackageVersion>$(GitVersion_MajorMinorPatch)</PackageVersion>
-      <PackageVersion Condition=" '$(GitVersion_MajorMinorPatch)' == '' ">0.9.99</PackageVersion>
     </PropertyGroup>
   </Target>
 

diff --git a/Directory.Build.targets b/Directory.Build.targets
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MIT
 <Project>
   <ItemGroup>
     <!-- all -->
-    <PackageVersion Include="GitVersion.MsBuild" Version="6.0.5" />
+    <PackageVersion Include="Dorssel.GitVersion.MsBuild" Version="1.1.0" />
     <!-- SqliteTimestamp -->
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
     <!-- unit tests -->

diff --git a/dotnet-ef-sqlite-timestamp.sln b/dotnet-ef-sqlite-timestamp.sln
@@ -13,7 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
 		.config\dotnet-tools.json = .config\dotnet-tools.json
 		GitVersion.yml = GitVersion.yml