Used GitVersion to generate versions (next version is based on existing tags). Replaced Directory.Build.props with GlobalAssemblyInfo.cs

Author: gpailler

.gitignore

@@ -225,6 +225,9 @@ packages
 *.lock.json
 
 # Cake
-tools/
+tools/*
+!tools/packages.config
+
+
 .vs/
 artifacts/

Directory.Build.props

@@ -1,9 +1,5 @@
 <Project>
     <PropertyGroup>
-        <VersionPrefix>1.1.0</VersionPrefix>
-        <!-- VersionSuffix is computed in build.cake depending of the type of the build -->
-        <VersionSuffix>dev.0+sha.0</VersionSuffix>
-
         <Description>A Slack wrapper for direct interaction with their APIs.</Description>
         <Copyright>Inumedia - Copyright ©  2018</Copyright>
         <AssemblyProduct>SlackAPI</AssemblyProduct>
@@ -15,5 +11,9 @@
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/Inumedia/SlackAPI</RepositoryUrl>
+
+        <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+        <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+        <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     </PropertyGroup>
 </Project>

GlobalAssemblyInfo.cs

@@ -0,0 +1,5 @@
+using System.Reflection;
+
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyInformationalVersion("1.1.0.0")]

SlackAPI.Tests/SlackAPI.Tests.csproj

@@ -30,6 +30,12 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\GlobalAssemblyInfo.cs">
+      <Link>Properties\GlobalAssemblyInfo.cs</Link>
+    </Compile>
+  </ItemGroup>
+
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
   </PropertyGroup>

SlackAPI.sln

@@ -7,6 +7,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlackAPI", "SlackAPI\SlackA
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlackAPI.Tests", "SlackAPI.Tests\SlackAPI.Tests.csproj", "{DEFA9559-0F8F-4C38-9644-67A080EDC46D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{532C9828-A2CC-4281-950A-248B06D42E9C}"
+ProjectSection(SolutionItems) = preProject
+	appveyor.yml = appveyor.yml
+	build.cake = build.cake
+	Directory.Build.props = Directory.Build.props
+	GlobalAssemblyInfo.cs = GlobalAssemblyInfo.cs
+	README.md = README.md
+EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

SlackAPI/SlackAPI.csproj

@@ -27,6 +27,12 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\GlobalAssemblyInfo.cs">
+      <Link>Properties\GlobalAssemblyInfo.cs</Link>
+    </Compile>
+  </ItemGroup>
+
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
   </PropertyGroup>

build.cake

@@ -1,5 +1,6 @@
-#tool "nuget:?package=GitVersion.CommandLine"
-#addin "Cake.FileHelpers"
+#tool "nuget:?package=GitVersion.CommandLine&version=5.1.3"
+#addin "Cake.FileHelpers&version=3.2.1"
+#addin "Cake.Incubator&version=5.1.0"
 
 using System.Text.RegularExpressions;
 
@@ -11,7 +12,7 @@ var testProject = File("./SlackAPI.Tests/SlackApi.Tests.csproj");
 var testConfig = File("./SlackAPI.Tests/Configuration/config.json");
 var projects = new[] { project, testProject };
 var artifactsDirectory = "./artifacts";
-var versionSuffix = string.Empty;
+GitVersion gitVersion = null;
 var isReleaseBuild = false;
 
 Task("Clean")
@@ -24,67 +25,26 @@ Task("Clean")
 Task("Configure")
     .Does(() =>
 {
-    var buildNumber = 0;
-    if (AppVeyor.IsRunningOnAppVeyor)
-    {
-        isReleaseBuild = AppVeyor.Environment.Repository.Branch == "master" && AppVeyor.Environment.Repository.Tag.IsTag;
-        buildNumber = AppVeyor.Environment.Build.Number;
-        Information("Build number is '{0}' (CI build)", buildNumber);
-    }
-    else
-    {
-        buildNumber = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-        Information("Build number is '{0}' (local build)", buildNumber);
-    }
-
-    // If the build is a tag on master, generate a clean version (1.0.0)
-    // following SemVer 1.0.0 rules. NuGet supports only SemVer 1.0.0
-    // In other cases, generate a prerelease version (1.0.0-branch.123+sha.abcdefg)
-    // following SevVer 2.0.0 rules. MyGet supports SemVer 2.0.0
-    if (isReleaseBuild)
-    {
-        versionSuffix = "\"\"";
-    }
-    else
-    {
-        var gitVersion = GitVersion();
-        var gitBranch = (AppVeyor.IsRunningOnAppVeyor
-            ? AppVeyor.Environment.Repository.Branch
-            : gitVersion.BranchName);
-        gitBranch = Regex.Replace(gitBranch, @"[/\-_]", string.Empty);
-        gitBranch = gitBranch.Substring(0, Math.Min(10, gitBranch.Length));
-
-        Information("Current git branch is '{0}' (normalized)", gitBranch);
-
-        var gitCommitId = (AppVeyor.IsRunningOnAppVeyor
-            ? AppVeyor.Environment.Repository.Commit.Id
-            : gitVersion.Sha)
-            .Substring(0, 8);
-
-        Information("Current git sha is '{0}' (normalized)", gitCommitId);
-
-        var isPullRequest = AppVeyor.IsRunningOnAppVeyor && AppVeyor.Environment.PullRequest.IsPullRequest;
-        if (isPullRequest)
-        {
-            gitBranch = "PR";
-        }
+    gitVersion = GitVersion();
 
-        Information("Is Pull Request: '{0}'", isPullRequest);
+    GitVersion(new GitVersionSettings {
+        UpdateAssemblyInfo = true,
+        UpdateAssemblyInfoFilePath = "GlobalAssemblyInfo.cs"
+    });
 
+    isReleaseBuild = AppVeyor.IsRunningOnAppVeyor
+        ? AppVeyor.Environment.Repository.Branch == "master"
+        : false;
 
-        versionSuffix = $"{gitBranch}.{buildNumber}+sha.{gitCommitId}";
-    }
+    Information("Is release build: '{0}'", isReleaseBuild);
+    Information("GitVersion details:\n{0}", gitVersion.Dump());
 
-    var versionPrefix = XmlPeek("./Directory.Build.props", "/Project/PropertyGroup/VersionPrefix");
-    var version = isReleaseBuild ? $"{versionPrefix}-release.{buildNumber}" : string.Join("-", versionPrefix, versionSuffix);
     if (AppVeyor.IsRunningOnAppVeyor)
     {
-        // Update AppVeyor build version so it will match the build version in assemblies and package
-        AppVeyor.UpdateBuildVersion(version);
+        var buildVersion = gitVersion.SemVer + ".ci." + AppVeyor.Environment.Build.Number;
+        Information("Using build version: {0}", buildVersion);
+        AppVeyor.UpdateBuildVersion(buildVersion);
     }
-
-    Information("Using version '{0}'", version);
-    Information("Release type build (skip symbols): {0}", isReleaseBuild);
 });
 
 
@@ -98,8 +58,7 @@ Task("Build")
             project,
             new DotNetCoreBuildSettings
             {
-                Configuration = configuration,
-                VersionSuffix = versionSuffix
+                Configuration = configuration
             }
         );
     }
@@ -186,9 +145,9 @@ Task("Package")
         {
             Configuration = configuration,
             OutputDirectory = artifactsDirectory,
-            VersionSuffix = versionSuffix,
             IncludeSymbols = !isReleaseBuild,
-            IncludeSource = !isReleaseBuild
+            IncludeSource = !isReleaseBuild,
+            ArgumentCustomization = args => args.Append("/p:Version=\"" + gitVersion.NuGetVersion + "\"")
         }
     );
 

tools/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+    <package id="Cake" version="0.37.0" />
+</packages>