Use MinVer; Roll to 2019

jet · Jan 22, 2019 · 6e5bee4 · 6e5bee4
1 parent 530ab34
commit 6e5bee4
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 16 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,13 +1,12 @@
 <Project ToolsVersion="15.0">
   <PropertyGroup>
-    <VersionPrefix>0.2.1</VersionPrefix>
     <Authors>@jet @amjjd @eiriktsarpalis and contributors</Authors>
     <Company>Jet.com</Company>
     <Description>Simple version-tolerant Newtonsoft.Json Converters for F# types</Description>
     <PackageProjectUrl>https://github.com/jet/Jet.JsonNet.Converters</PackageProjectUrl>
     <PackageTags>fsharp unionconverter JsonPickler json converters</PackageTags>
     <PackageLicenseUrl>https://github.com/jet/Jet.JsonNet.Converters/blob/master/LICENSE</PackageLicenseUrl>
-    <Copyright>Copyright © 2016-8</Copyright>
+    <Copyright>Copyright © 2016-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
@@ -0,0 +1,16 @@
+<Project ToolsVersion="15.0">
+  <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>
diff --git a/Jet.JsonNet.Converters.sln b/Jet.JsonNet.Converters.sln
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".project", ".project", "{1D
 		build.proj = build.proj
 		build.ps1 = build.ps1
 		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
 		global.json = global.json
 		LICENSE = LICENSE
 		README.md = README.md

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,4 +1,7 @@
 name: $(Rev:r)
+trigger:
+- master
+- refs/tags/*
 jobs:
 - job: Windows
   pool:
@@ -11,20 +14,11 @@ 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:
-      VersionSuffix: '$(VersionSuffix)'
+      BUILD_PR: $(SYSTEM.PULLREQUEST.PULLREQUESTNUMBER)
+      BUILD_ID: $(BUILD.BUILDNUMBER) 
   - task: PublishBuildArtifacts@1
     inputs:
       pathtoPublish: 'bin'

diff --git a/build.proj b/build.proj
@@ -6,7 +6,10 @@
     <Cfg>--configuration Release</Cfg>
 
     <ThisDirAbsolute>$([System.IO.Path]::GetFullPath("$(MSBuildThisFileDirectory)"))</ThisDirAbsolute>
-    <PackOptions>-o $(ThisDirAbsolute)bin --version-suffix "$(VersionSuffix)"</PackOptions>
+
+    <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>
 

diff --git a/src/Jet.JsonNet.Converters/Jet.JsonNet.Converters.fsproj b/src/Jet.JsonNet.Converters/Jet.JsonNet.Converters.fsproj
@@ -18,9 +18,11 @@
 
   <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" />
   </ItemGroup>
 
-</Project>
+</Project>