From 6aa2aafcf6c066211e82d6d0350d86917edbc5ab Mon Sep 17 00:00:00 2001
From: Ruben Bartelink <ruben@bartelink.com>
Date: Tue, 22 Jan 2019 11:43:58 +0000
Subject: [PATCH] Use MinVer; Update copyright year

---
 Directory.Build.props                    |  3 +--
 Directory.Build.targets                  | 14 ++++++++++++++
 azure-pipelines.yml                      | 24 ++++++++++++------------
 build.proj                               |  6 ++++--
 src/CallPolly.Core/CallPolly.Core.fsproj |  4 +++-
 src/CallPolly/CallPolly.fsproj           |  4 +++-
 6 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 91b28b5..eca9eee 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,13 +1,12 @@
 <Project ToolsVersion="15.0">
   <PropertyGroup>
-    <VersionPrefix>0.0.7</VersionPrefix>
     <Authors>@jet @bartelink and contributors</Authors>
     <Company>Jet.com</Company>
     <Description>Apply systemwide resilience strategies consistently across subsystems, standing on Polly's shoulders</Description>
     <PackageProjectUrl>https://github.com/jet/callpolly</PackageProjectUrl>
     <PackageTags>polly bulkhead circuitbreaker timeout fsharp</PackageTags>
     <PackageLicenseUrl>https://github.com/jet/callpolly/blob/master/LICENSE</PackageLicenseUrl>
-    <Copyright>Copyright © 2018</Copyright>
+    <Copyright>Copyright © 2018-9</Copyright>
 
     <!-- SourceLink related properties https://github.com/dotnet/SourceLink#using-sourcelink -->
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 406b73c..9761fd7 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -3,4 +3,18 @@
   <Target Name="VSTestIfTestProject">
     <CallTarget Targets="VSTest" Condition="'$(IsTestProject)' == 'true'" />
   </Target>
+  <Target Name="ComputePackageVersion" AfterTargets="MinVer" Condition=" '$(BUILD_PR)' != '' AND '$(BUILD_PR)' != '%24(SYSTEM.PULLREQUEST.PULLREQUESTNUMBER)' ">
+    <PropertyGroup>
+      <PackageVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch)-pr.$(BUILD_PR)</PackageVersion>
+      <PackageVersion Condition="'$(MinVerPreRelease)' != ''">$(PackageVersion).$(MinVerPreRelease)</PackageVersion>
+      <PackageVersion Condition="'$(MinVerBuildMetadata)' != ''">$(PackageVersion)+$(MinVerBuildMetadata)</PackageVersion>
+      <Version>$(PackageVersion)</Version>
+    </PropertyGroup>
+  </Target>
+  <Target Name="ComputeFileVersion" AfterTargets="MinVer">
+    <PropertyGroup>
+      <BUILD_ID Condition="'$(BUILD_ID)' == ''">0</BUILD_ID>
+      <FileVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).$(BUILD_ID)</FileVersion>
+    </PropertyGroup>
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1b40c2d..b4ee0b2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,4 +1,7 @@
 name: $(Rev:r)
+trigger:
+- master
+- refs/tags/*
 jobs:
 - job: Windows
   pool:
@@ -26,18 +29,15 @@ jobs:
       testResultsFormat: 'VSTest'
       testResultsFiles: 'tests/**/*.trx'
     condition: succeededOrFailed()
-  - powershell: |
-      $buildId = $env:BUILD_BUILDNUMBER.PadLeft(7, '0');
-      $versionSuffixPR = "ci-$buildId-pr$($env:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER)";
-      $branchName = "$env:BUILD_SOURCEBRANCHNAME".Replace("_","");
-      $versionSuffixBRANCH = "$branchName-$buildId";
-      $isTag = "$env:BUILD_SOURCEBRANCH".StartsWith('refs/tags/');
-      $isPR = "$env:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER" -ne ""
-      $versionSuffix = if ($isTag) { "" } else { if ($isPR) { $versionSuffixPR } else { $versionSuffixBRANCH } };
-      Write-Host "##vso[task.setvariable variable=VersionSuffix]$versionSuffix";
-    displayName: compute VersionSuffix
   - script: dotnet pack build.proj
-    displayName: dotnet pack
+    displayName: dotnet pack build.proj
+    env:
+      BUILD_PR: $(SYSTEM.PULLREQUEST.PULLREQUESTNUMBER)
+      BUILD_ID: $(BUILD.BUILDNUMBER) 
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: 'bin'
+      artifactName: 'nupkgs'
   - task: NuGetCommand@2
     condition: succeededOrFailed()
     inputs:
@@ -61,4 +61,4 @@ jobs:
       testResultsFiles: 'tests/**/*.trx'
     condition: succeededOrFailed()
   - script: dotnet pack build.proj
-    displayName: dotnet pack
+    displayName: dotnet pack
\ No newline at end of file
diff --git a/build.proj b/build.proj
index cdfef29..4af10d9 100644
--- a/build.proj
+++ b/build.proj
@@ -6,9 +6,11 @@
     <Cfg>--configuration Release</Cfg>
 
     <ThisDirAbsolute>$([System.IO.Path]::GetFullPath("$(MSBuildThisFileDirectory)"))</ThisDirAbsolute>
-    <PackOptions>-o $(ThisDirAbsolute)bin --version-suffix "$(VersionSuffix)"</PackOptions>
-    <TestOptions>--logger:trx</TestOptions>
 
+    <PrOption Condition =" '$(BUILD_PR)' != '%24(SYSTEM.PULLREQUEST.PULLREQUESTNUMBER)' ">/p:BUILD_PR=$(BUILD_PR) </PrOption>
+    <PackOptions>/p:BUILD_ID=$(BUILD_ID) $(PrOption) -o $(ThisDirAbsolute)bin</PackOptions>
+
+    <TestOptions>--logger:trx</TestOptions>
   </PropertyGroup>
 
   <Target Name="Pack">
diff --git a/src/CallPolly.Core/CallPolly.Core.fsproj b/src/CallPolly.Core/CallPolly.Core.fsproj
index bf5ba4f..12d900b 100644
--- a/src/CallPolly.Core/CallPolly.Core.fsproj
+++ b/src/CallPolly.Core/CallPolly.Core.fsproj
@@ -19,6 +19,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="1.0.0-beta.2" PrivateAssets="All" />
+
     <PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' != 'netstandard2.0' " />
     <PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
@@ -26,4 +28,4 @@
     <PackageReference Include="Serilog" Version="2.7.1" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/CallPolly/CallPolly.fsproj b/src/CallPolly/CallPolly.fsproj
index 2547cdc..6f72138 100644
--- a/src/CallPolly/CallPolly.fsproj
+++ b/src/CallPolly/CallPolly.fsproj
@@ -21,6 +21,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="1.0.0-beta.2" PrivateAssets="All" />
+
     <PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' != 'netstandard2.0' " />
     <PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
     <PackageReference Include="Jet.JsonNet.Converters" Version="0.0.3-CI69140" />
@@ -29,4 +31,4 @@
     <PackageReference Include="Serilog" Version="2.7.1" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file