Use MinVer

SixLabors · Jul 2, 2020 · 6521c1c · 6521c1c
1 parent d49d552
commit 6521c1c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 57 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -52,31 +52,15 @@ jobs:
                   git fetch --prune --unshallow
                   git submodule -q update --init --recursive
 
-            - name: Fetch Tags for GitVersion
-              run: |
-                  git fetch --tags
-
-            - name: Fetch master for GitVersion
-              if: github.ref != 'refs/heads/master'
-              run: git branch --create-reflog master origin/master
-
-            - name: Install GitVersion
-              uses: gittools/actions/gitversion/[email protected]
-              with:
-                  versionSpec: "5.3.x"
-
-            - name: Use GitVersion
-              id: gitversion # step id used as reference for output values
-              uses: gittools/actions/gitversion/[email protected]
-
             - name: Setup DotNet SDK
               uses: actions/setup-dotnet@v1
               with:
-                  dotnet-version: "3.1.101"
+                  dotnet-version: "3.1.x"
 
             - name: Build
               shell: pwsh
-              run: ./ci-build.ps1 "${{steps.gitversion.outputs.nuGetVersion}}" "${{matrix.options.framework}}"
+              if: startsWith(github.ref, 'refs/tags/') == false
+              run: ./ci-build.ps1 "${{matrix.options.framework}}"
 
             - name: Test
               shell: pwsh
@@ -112,31 +96,14 @@ jobs:
                   git fetch --prune --unshallow
                   git submodule -q update --init --recursive
 
-            - name: Fetch Tags for GitVersion
-              run: |
-                  git fetch --tags
-
-            - name: Fetch master for GitVersion
-              if: github.ref != 'refs/heads/master'
-              run: git branch --create-reflog master origin/master
-
-            - name: Install GitVersion
-              uses: gittools/actions/gitversion/[email protected]
-              with:
-                  versionSpec: "5.3.x"
-
-            - name: Use GitVersion
-              id: gitversion # step id used as reference for output values
-              uses: gittools/actions/gitversion/[email protected]
-
             - name: Setup DotNet SDK
               uses: actions/setup-dotnet@v1
               with:
-                  dotnet-version: "3.1.101"
+                  dotnet-version: "3.1.x"
 
             - name: Pack
               shell: pwsh
-              run: ./ci-pack.ps1 "${{steps.gitversion.outputs.nuGetVersion}}"
+              run: ./ci-pack.ps1
 
             - name: Publish to MyGet
               shell: pwsh

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -29,6 +29,12 @@
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
 
+  <!--MinVer Properties for versioning-->
+  <PropertyGroup>
+    <MinVerTagPrefix>v</MinVerTagPrefix>
+    <MinVerVerbosity>normal</MinVerVerbosity>
+  </PropertyGroup>
+
   <!--
     https://apisof.net/
     +===================+=======+==========+=====================+=============+=================+====================+==============+=========+

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -23,6 +23,7 @@
     <PackageReference Update="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
 
     <!--Src Dependencies-->
+    <PackageReference Update="MinVer" PrivateAssets="All" Version="2.3.0" />
     <PackageReference Update="System.Buffers" Version="4.5.0" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />
     <PackageReference Update="System.IO.UnmanagedMemoryStream" Version="4.3.0" />

diff --git a/GitVersion.yml b/GitVersion.yml
diff --git a/ci-build.ps1 b/ci-build.ps1
@@ -1,7 +1,5 @@
 param(
-  [Parameter(Mandatory, Position = 0)]
-  [string]$version,
-  [Parameter(Mandatory = $true, Position = 1)]
+  [Parameter(Mandatory = $true, Position = 0)]
   [string]$targetFramework
 )
 
@@ -10,4 +8,4 @@ dotnet clean -c Release
 $repositoryUrl = "https://github.com/$env:GITHUB_REPOSITORY"
 
 # Building for a specific framework.
-dotnet build -c Release -f $targetFramework /p:packageversion=$version /p:RepositoryUrl=$repositoryUrl
+dotnet build -c Release -f $targetFramework /p:RepositoryUrl=$repositoryUrl
diff --git a/ci-pack.ps1 b/ci-pack.ps1
@@ -1,11 +1,6 @@
-param(
-  [Parameter(Mandatory, Position = 0)]
-  [string]$version
-)
-
 dotnet clean -c Release
 
 $repositoryUrl = "https://github.com/$env:GITHUB_REPOSITORY"
 
 # Building for packing and publishing.
-dotnet pack -c Release --output "$PSScriptRoot/artifacts" /p:packageversion=$version /p:RepositoryUrl=$repositoryUrl
+dotnet pack -c Release --output "$PSScriptRoot/artifacts" /p:RepositoryUrl=$repositoryUrl
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
@@ -19,6 +19,10 @@
     <RootNamespace>SixLabors.ImageSharp</RootNamespace>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="MinVer" PrivateAssets="All" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
   </ItemGroup>