VersionSuffix environment variable

fsprojects · Aug 18, 2020 · 723bc39 · 723bc39
1 parent 538480b
commit 723bc39
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -12,6 +12,10 @@
     <PackageProjectUrl>https://github.com/fsprojects/FSharpPlus</PackageProjectUrl>
     <PackageIconUrl>https://raw.github.com/fsprojects/FSharpPlus/master/docsrc/files/img/logo.png</PackageIconUrl>
     <PackageTags>f# FSharp Applicative Monad MonadTransformer Arrow Overloading</PackageTags>
+    <VersionPrefix>1.2.0</VersionPrefix>
+    <VersionSuffix></VersionSuffix>
+    <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
+    <Version Condition=" '$(VersionSuffix)' == '' ">$(VersionPrefix)</Version>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,13 @@
 image: Visual Studio 2019
+
+before_build:
+  - ps: >-
+      $buildId = $env:APPVEYOR_BUILD_NUMBER.PadLeft(5, '0');
+      $versionSuffixPR = "PR$($env:APPVEYOR_PULL_REQUEST_NUMBER)-$buildId";
+      $branchName = "$env:APPVEYOR_REPO_BRANCH".Replace("_","");
+      $versionSuffixBRANCH = if ("$env:APPVEYOR_REPO_BRANCH" -eq "v1.1.0") { "CI$buildId" } else { "$branchName-CI$buildId" };
+      $env:VersionSuffix = if ("$env:APPVEYOR_REPO_TAG" -eq "true") { "" } else { if ("$env:APPVEYOR_PULL_REQUEST_NUMBER") { $versionSuffixPR } else { $versionSuffixBRANCH } };
+
 init:
   - git config --global core.autocrlf input
 install:
@@ -7,10 +16,10 @@ build_script:
   - cmd: dotnet restore ./FSharpPlus.sln
   - cmd: dotnet build -c Release ./FSharpPlus.sln
   - cmd: dotnet test -c Release tests/FSharpPlus.Tests
-  - cmd: dotnet pack build.proj
+  - cmd: dotnet pack build.proj --version-suffix %VersionSuffix%
   - ps: ./docsrc/tools/download_nugets.ps1
   - cmd: dotnet run -c Release --project ./docsrc/tools
 test: off
 artifacts:
   - path: bin
-    name: bin
+    name: bin
diff --git a/src/FSharpPlus/FSharpPlus.fsproj b/src/FSharpPlus/FSharpPlus.fsproj
@@ -8,10 +8,6 @@
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
     <Title>FSharpPlus</Title>
     <AssemblyName>FSharpPlus</AssemblyName>
-    <VersionPrefix>1.2.0</VersionPrefix>
-    <VersionSuffix></VersionSuffix>
-    <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
-    <Version Condition=" '$(VersionSuffix)' == '' ">$(VersionPrefix)</Version>
     <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
     <FileVersion>$(VersionPrefix).0</FileVersion>
     <ProjectGuid>1368368e-d2f4-4fef-bb2f-492e05156e0f</ProjectGuid>

diff --git a/src/FSharpPlus/Providers/FSharpPlus.Providers.fsproj b/src/FSharpPlus/Providers/FSharpPlus.Providers.fsproj
@@ -8,11 +8,6 @@
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
     <Title>FSharpPlus.Providers</Title>
     <AssemblyName>FSharpPlus.Providers</AssemblyName>
-    <!--<VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>
-    </VersionSuffix>-->
-    <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
-    <Version Condition=" '$(VersionSuffix)' == '' ">$(VersionPrefix)</Version>
     <AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
     <FileVersion>$(VersionPrefix).0</FileVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>