Merge branch 'master' into feature/dynamic-tag-evaluation

Author: asbjornu

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "0.37.0",
+      "version": "0.38.5",
       "commands": [
         "dotnet-cake"
       ]

.github/workflows/format.yml

@@ -1,18 +1,21 @@
-name: Validate PR
+name: Validate Commit
 
-on: [pull_request]
+on:
+  push:
+    branches:
+    - master
+    - 'fix/*'
+    - 'feature/*'
+
+  pull_request:
+    branches:
+    - master
 
 jobs:
   format:
     runs-on: ubuntu-latest
     name: DotNet Format
     steps:
       - uses: actions/checkout@v2
-
-      # workaround for dotnet tools not being on path https://github.com/actions/virtual-environments/issues/213
-      - name: add .dotnet/tools to path
-        run: echo "::set-env name=PATH::${PATH}:${HOME}/.dotnet/tools"
-
       - run: dotnet tool install -g dotnet-format
-
       - run: dotnet format ./ --folder --check --exclude **/AddFormats/

README.md

@@ -88,9 +88,9 @@ from The Noun Project.
 [dockerhub]:                       https://hub.docker.com/r/gittools/gitversion/
 [dockerhub-badge]:                 https://img.shields.io/docker/pulls/gittools/gitversion.svg?logo=docker
 [az-pipeline-task]:                https://marketplace.visualstudio.com/items?itemName=gittools.gittools
-[az-pipeline-task-badge]:          https://img.shields.io/badge/marketplace-gittools.gittools-blue?logo=visual-studio
-[gh-actions]:                      https://github.com/marketplace/actions/use-actions
-[gh-actions-badge]:                https://img.shields.io/badge/marketplace-use--actions-blue?logo=github
+[az-pipeline-task-badge]:          https://img.shields.io/badge/marketplace-gittools.gittools-blue?logo=azure-pipelines
+[gh-actions]:                      https://github.com/marketplace/actions/gittools
+[gh-actions-badge]:                https://img.shields.io/badge/marketplace-gittools-blue?logo=github
 [contribute]:                      https://github.com/GitTools/GitVersion/blob/master/CONTRIBUTING.md
 [why]:                             https://gitversion.net/docs/why
 [usage]:                           https://gitversion.net/docs/usage/usage

build.cake

@@ -2,29 +2,29 @@
 #module nuget:?package=Cake.DotNetTool.Module&version=0.4.0
 
 // Install addins.
-#addin "nuget:?package=Cake.Codecov&version=0.8.0"
+#addin "nuget:?package=Cake.Codecov&version=0.9.1"
 #addin "nuget:?package=Cake.Compression&version=0.2.4"
-#addin "nuget:?package=Cake.Coverlet&version=2.4.2"
-#addin "nuget:?package=Cake.Docker&version=0.11.0"
-#addin "nuget:?package=Cake.Git&version=0.21.0"
+#addin "nuget:?package=Cake.Coverlet&version=2.5.1"
+#addin "nuget:?package=Cake.Docker&version=0.11.1"
+#addin "nuget:?package=Cake.Git&version=0.22.0"
 #addin "nuget:?package=Cake.Gitter&version=0.11.1"
 #addin "nuget:?package=Cake.Incubator&version=5.1.0"
-#addin "nuget:?package=Cake.Json&version=4.0.0"
-#addin "nuget:?package=Cake.Kudu&version=0.10.1"
+#addin "nuget:?package=Cake.Json&version=5.2.0"
+#addin "nuget:?package=Cake.Kudu&version=0.11.0"
 #addin "nuget:?package=Cake.Wyam&version=2.2.9"
 
 #addin "nuget:?package=Newtonsoft.Json&version=12.0.3"
-#addin "nuget:?package=SharpZipLib&version=1.2.0"
+#addin "nuget:?package=SharpZipLib&version=1.3.0"
 #addin "nuget:?package=xunit.assert&version=2.4.1"
 
 // Install tools.
 #tool "nuget:?package=NUnit.ConsoleRunner&version=3.11.1"
-#tool "nuget:?package=nuget.commandline&version=5.4.0"
+#tool "nuget:?package=nuget.commandline&version=5.7.0"
 #tool "nuget:?package=KuduSync.NET&version=1.5.3"
 
 // Install .NET Core Global tools.
-#tool "dotnet:?package=Codecov.Tool&version=1.10.0"
-#tool "dotnet:?package=dotnet-format&version=3.3.111304"
+#tool "dotnet:?package=Codecov.Tool&version=1.12.3"
+#tool "dotnet:?package=dotnet-format&version=4.1.131201"
 #tool "dotnet:?package=GitReleaseManager.Tool&version=0.11.0"
 #tool "dotnet:?package=Wyam.Tool&version=2.2.9"
 

build.config

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-DOTNET_VERSION=2.1.807,3.1.301
+DOTNET_VERSION=2.1.811,3.1.403

build/publish.cake

@@ -35,11 +35,11 @@ Task("Publish-AzurePipeline")
 {
     foreach(var artifact in parameters.Artifacts.All)
     {
-        if (FileExists(artifact.ArtifactPath)) { TFBuild.Commands.UploadArtifact("", artifact.ArtifactPath, "artifacts"); }
+        if (FileExists(artifact.ArtifactPath)) { AzurePipelines.Commands.UploadArtifact("", artifact.ArtifactPath, "artifacts"); }
     }
     foreach(var package in parameters.Packages.All)
     {
-        if (FileExists(package.PackagePath)) { TFBuild.Commands.UploadArtifact("", package.PackagePath, "packages"); }
+        if (FileExists(package.PackagePath)) { AzurePipelines.Commands.UploadArtifact("", package.PackagePath, "packages"); }
     }
 })
 .OnError(exception =>

build/test.cake

@@ -39,11 +39,15 @@ Task("UnitTest")
                     Exclude = new List<string> { "[GitVersion*.Tests]*", "[GitVersionTask.MsBuild]*" }
                 };
 
-                if (IsRunningOnUnix() && string.Equals(framework, parameters.FullFxVersion48))
+                if (string.Equals(framework, parameters.FullFxVersion48)) 
                 {
-                    settings.Filter = "TestCategory!=NoMono";
+                    if (IsRunningOnUnix()) {
+                        settings.Filter = "TestCategory!=NoMono";
+                    } else {
+                        settings.Filter = "TestCategory!=NoNet48";
+                    }
                 }
-
+                
                 DotNetCoreTest(project.FullPath, settings, coverletSettings);
             });
         }
@@ -69,12 +73,12 @@ Task("UnitTest")
     if (parameters.IsRunningOnAzurePipeline)
     {
         if (testResultsFiles.Any()) {
-            var data = new TFBuildPublishTestResultsData {
+            var data = new AzurePipelinesPublishTestResultsData {
                 TestResultsFiles = testResultsFiles.ToArray(),
                 Platform = Context.Environment.Platform.Family.ToString(),
-                TestRunner = TFTestRunnerType.NUnit
+                TestRunner = AzurePipelinesTestRunnerType.NUnit
             };
-            TFBuild.Commands.PublishTestResults(data);
+            AzurePipelines.Commands.PublishTestResults(data);
         }
     }
 });

build/utils/utils.cake

@@ -23,7 +23,7 @@ public static bool IsOnMainRepo(this ICakeContext context)
     }
     else if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
     {
-        repositoryName = buildSystem.TFBuild.Environment.Repository.RepoName;
+        repositoryName = buildSystem.AzurePipelines.Environment.Repository.RepoName;
     }
     else if (buildSystem.IsRunningOnGitHubActions)
     {
@@ -49,7 +49,7 @@ public static bool IsOnMainBranch(this ICakeContext context)
     }
     else if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
     {
-        repositoryBranch = buildSystem.TFBuild.Environment.Repository.SourceBranchName;
+        repositoryBranch = buildSystem.AzurePipelines.Environment.Repository.SourceBranchName;
     }
     else if (buildSystem.IsRunningOnGitHubActions)
     {

docs/input/docs/build-server-support/build-server/bamboo.md

@@ -19,7 +19,7 @@ a Windows build host using Powershell. The build only needs one of the two.
 
 ```bash
 ~/.dotnet/tools/dotnet-gitversion > gitversion.txt
-sed -i '1d;26d;s/  //;s/"//g;s/,//;s/:/=/' gitversion.txt
+sed -i '1d;$ d;s/  //;s/"//g;s/,//;s/:/=/' gitversion.txt
 ```
 
 ### Task: Script

docs/input/docs/more-info/variables.md

@@ -39,7 +39,8 @@ Running `GitVersion.exe` in your repo will show you what is available. For the
   "VersionSourceSha":"950d2f830f5a2af12a6779a48d20dcbb02351f25",
   "CommitsSinceVersionSource":1,
   "CommitsSinceVersionSourcePadded":"0001",
-  "CommitDate":"2014-03-06"
+  "CommitDate":"2014-03-06",
+  "UncommittedChanges": 0
 }
 ```
 

src/Directory.Build.props

@@ -19,23 +19,23 @@
 
     </PropertyGroup>
     <PropertyGroup>
-        <PackageVersion_LibGit2Sharp>0.27.0-preview-0034</PackageVersion_LibGit2Sharp>
-        <PackageVersion_LibGit2Sharp_NativeBinaries>2.0.298</PackageVersion_LibGit2Sharp_NativeBinaries>
+        <PackageVersion_LibGit2Sharp>0.27.0-preview-0096</PackageVersion_LibGit2Sharp>
+        <PackageVersion_LibGit2Sharp_NativeBinaries>2.0.312</PackageVersion_LibGit2Sharp_NativeBinaries>
 
         <PackageVersion_JetBrainsAnnotations>2020.1.0</PackageVersion_JetBrainsAnnotations>
         <PackageVersion_YamlDotNet>8.1.2</PackageVersion_YamlDotNet>
         <PackageVersion_NewtonsoftJson>12.0.3</PackageVersion_NewtonsoftJson>
         <PackageVersion_MicrosoftExtensions>3.0.0</PackageVersion_MicrosoftExtensions>
-        <PackageVersion_MsBuild>16.7.0</PackageVersion_MsBuild>
+        <PackageVersion_MsBuild>16.8.0</PackageVersion_MsBuild>
 
-        <PackageVersion_MicrosoftTestSdk>16.7.1</PackageVersion_MicrosoftTestSdk>
+        <PackageVersion_MicrosoftTestSdk>16.8.0</PackageVersion_MicrosoftTestSdk>
         <PackageVersion_NSubstitute>4.2.2</PackageVersion_NSubstitute>
         <PackageVersion_CoverletMsBuild>2.9.0</PackageVersion_CoverletMsBuild>
         <PackageVersion_NUnit>3.12.0</PackageVersion_NUnit>
         <PackageVersion_GitToolsTesting>1.2.0</PackageVersion_GitToolsTesting>
         <PackageVersion_NUnit3TestAdapter>3.17.0</PackageVersion_NUnit3TestAdapter>
-        <PackageVersion_NunitXmlTestLogger>2.1.62</PackageVersion_NunitXmlTestLogger>
-        <PackageVersion_Shouldly>4.0.0-beta0002</PackageVersion_Shouldly>
+        <PackageVersion_NunitXmlTestLogger>2.1.80</PackageVersion_NunitXmlTestLogger>
+        <PackageVersion_Shouldly>4.0.1</PackageVersion_Shouldly>
 
     </PropertyGroup>
 

src/GitVersion.sln.DotSettings

@@ -549,6 +549,7 @@ II.2.12 <HandlesEvent />
 	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=5C63448180C9174C8C28A084F80E37DF/RelativePath/@EntryValue"></s:String>
 	<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File5C63448180C9174C8C28A084F80E37DF/@KeyIndexDefined">True</s:Boolean>
 	<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File5C63448180C9174C8C28A084F80E37DF/RelativePriority/@EntryValue">1</s:Double>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpFileLayoutPatternsUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>

src/GitVersionCore.Tests/BuildAgents/BuildServerBaseTests.cs

@@ -53,7 +53,7 @@ public void BuildNumberIsFullSemVer()
 
             writes = new List<string>();
             buildServer.WriteIntegration(writes.Add, variables, false);
-            writes.ShouldBeEmpty();
+            writes.ShouldNotContain(x => x.StartsWith("Executing GenerateSetVersionMessage for "));
         }
 
         private class BuildAgent : BuildAgentBase

src/GitVersionCore.Tests/BuildAgents/GitHubActionsTests.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using GitVersion;
 using GitVersion.BuildAgents;
 using GitVersionCore.Tests.Helpers;
@@ -15,6 +16,7 @@ public class GitHubActionsTests : TestBase
     {
         private IEnvironment environment;
         private GitHubActions buildServer;
+        private string githubSetEnvironmentTempFilePath;
 
         [SetUp]
         public void SetUp()
@@ -26,12 +28,21 @@ public void SetUp()
             environment = sp.GetService<IEnvironment>();
             buildServer = sp.GetService<GitHubActions>();
             environment.SetEnvironmentVariable(GitHubActions.EnvironmentVariableName, "true");
+
+            githubSetEnvironmentTempFilePath = Path.GetTempFileName();
+            environment.SetEnvironmentVariable(GitHubActions.GitHubSetEnvTempFileEnvironmentVariableName, githubSetEnvironmentTempFilePath);
         }
 
         [TearDown]
         public void TearDown()
         {
             environment.SetEnvironmentVariable(GitHubActions.EnvironmentVariableName, null);
+            environment.SetEnvironmentVariable(GitHubActions.GitHubSetEnvTempFileEnvironmentVariableName, null);
+            if (githubSetEnvironmentTempFilePath != null && File.Exists(githubSetEnvironmentTempFilePath))
+            {
+                File.Delete(githubSetEnvironmentTempFilePath);
+                githubSetEnvironmentTempFilePath = null;
+            }
         }
 
         [Test]
@@ -96,19 +107,17 @@ public void GetCurrentBranchShouldHandlePullRequests()
             result.ShouldBe("refs/pull/1/merge");
         }
 
-        [TestCase("Something", "1.0.0",
-            "\"GitVersion_Something=1.0.0\" >> $GITHUB_ENV")]
-        public void GetSetParameterMessage(string key, string value, string expectedResult)
+        [Test]
+        public void GetSetParameterMessage()
         {
             // Assert
             environment.GetEnvironmentVariable("GitVersion_Something").ShouldBeNullOrWhiteSpace();
 
             // Act
-            var result = buildServer.GenerateSetParameterMessage(key, value);
+            var result = buildServer.GenerateSetParameterMessage("GitVersion_Something", "1.0.0");
 
             // Assert
-            result.ShouldContain(s => true, 1);
-            result.ShouldBeEquivalentTo(new[] { expectedResult });
+            result.ShouldContain(s => true, 0);
         }
 
         [Test]
@@ -141,11 +150,20 @@ public void ShouldWriteIntegration()
                 "Executing GenerateSetVersionMessage for 'GitHubActions'.",
                 "",
                 "Executing GenerateBuildLogOutput for 'GitHubActions'.",
-                "\"GitVersion_Major=1.0.0\" >> $GITHUB_ENV"
+                "Writing version variables to $GITHUB_ENV file for 'GitHubActions'."
             };
 
             string.Join(Environment.NewLine, list)
                 .ShouldBe(string.Join(Environment.NewLine, expected));
+
+            var expectedFileContents = new List<string>
+            {
+                "GitVersion_Major=1.0.0"
+            };
+
+            var actualFileContents = File.ReadAllLines(githubSetEnvironmentTempFilePath);
+
+            actualFileContents.ShouldBe(expectedFileContents);
         }
 
         [Test]
@@ -162,7 +180,7 @@ public void ShouldNotWriteIntegration()
             // Act
             buildServer.WriteIntegration(s => { list.Add(s); }, vars, false);
 
-            list.ShouldBeEmpty();
+            list.ShouldNotContain(x => x.StartsWith("Executing GenerateSetVersionMessage for "));
         }
 
         [Test]

src/GitVersionCore.Tests/Configuration/ConfigProviderTests.cs

@@ -198,8 +198,8 @@ public void NextVersionCanHavePatch()
 
         [Test]
         [MethodImpl(MethodImplOptions.NoInlining)]
-        [Category("NoMono")]
-        [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void CanWriteOutEffectiveConfiguration()
         {
             var config = configProvider.Provide(repoPath);

src/GitVersionCore.Tests/Configuration/IgnoreConfigTests.cs

@@ -1,13 +1,15 @@
 using System;
 using System.IO;
 using GitVersion.Configuration;
+using GitVersion.Model.Configuration;
 using GitVersionCore.Tests.Helpers;
 using NUnit.Framework;
 using Shouldly;
 using YamlDotNet.Core;
 
 namespace GitVersionCore.Tests.Configuration
 {
+
     [TestFixture]
     public class IgnoreConfigTests : TestBase
     {
@@ -34,7 +36,7 @@ public void ShouldSupportsOtherSequenceFormat()
         {
             var yaml = @"
 ignore:
-    sha: 
+    sha:
         - b6c0c9fda88830ebcd563e500a5a7da5a1658e98
         - 6c19c7c219ecf8dbc468042baefa73a1b213e8b1
 ";
@@ -59,7 +61,7 @@ public void WhenNotInConfigShouldHaveDefaults()
 
             config.Ignore.ShouldNotBeNull();
             config.Ignore.ShAs.ShouldBeEmpty();
-            config.Ignore.Before.ShouldBeNull();
+            config.Ignore.Before.ShouldBe(null);
         }
 
         [Test]
@@ -73,5 +75,13 @@ public void WhenBadDateFormatShouldFail()
             using var reader = new StringReader(yaml);
             Should.Throw<YamlException>(() => ConfigSerializer.Read(reader));
         }
+
+        [Test]
+        public void NewInstanceShouldBeEmpty()
+        {
+            var ignoreConfig = new IgnoreConfig();
+
+            ignoreConfig.IsEmpty.ShouldBeTrue();
+        }
     }
 }

src/GitVersionCore.Tests/Configuration/Init/InitScenarios.cs

@@ -21,8 +21,8 @@ public void Setup()
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void CanSetNextVersion()
         {
             var workingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "c:\\proj" : "/proj";