Merge branch 'master' into feature/repo-dirty-flag

Author: pysco68

.github/workflows/build.yml

@@ -103,7 +103,7 @@ jobs:
     strategy:
       matrix:
         os: [linux]
-        targetFramework: [2.1, 3.1]
+        targetFramework: [3.1]
         distro: [alpine.3.10-x64, centos.7-x64, debian.9-x64, fedora.30-x64, ubuntu.16.04-x64, ubuntu.18.04-x64]
       fail-fast: false
 
@@ -233,7 +233,7 @@ jobs:
     strategy:
       matrix:
         os: [linux]
-        targetFramework: [2.1, 3.1]
+        targetFramework: [3.1]
         distro: [alpine.3.10-x64, centos.7-x64, debian.9-x64, fedora.30-x64, ubuntu.16.04-x64, ubuntu.18.04-x64]
       fail-fast: false
 

azure-pipelines.yml

@@ -60,7 +60,7 @@ stages:
       name: Linux
       vmImage: 'ubuntu-latest'
       distros: [ 'alpine.3.10-x64', 'centos.7-x64', 'debian.9-x64', 'fedora.30-x64', 'ubuntu.16.04-x64', 'ubuntu.18.04-x64' ]
-      dotnetVersions: [ '2.1', '3.1' ]
+      dotnetVersions: [ '3.1' ]
 
 - stage: Docker
   displayName: 'Docker Build & Test'
@@ -72,7 +72,7 @@ stages:
       name: Linux
       vmImage: 'ubuntu-latest'
       distros: [ 'alpine.3.10-x64', 'centos.7-x64', 'debian.9-x64', 'fedora.30-x64', 'ubuntu.16.04-x64', 'ubuntu.18.04-x64' ]
-      dotnetVersions: [ '2.1', '3.1' ]
+      dotnetVersions: [ '3.1' ]
 
 - stage: Publish
   displayName: 'Publish'

src/Docker/docker.json

@@ -1,13 +1,5 @@
 {
     "linux": {
-        "2.1": [
-            "alpine.3.10-x64",
-            "centos.7-x64",
-            "debian.9-x64",
-            "fedora.30-x64",
-            "ubuntu.16.04-x64",
-            "ubuntu.18.04-x64"
-        ],
         "3.1": [
             "alpine.3.10-x64",
             "centos.7-x64",
@@ -18,9 +10,6 @@
         ]
     },
     "windows": {
-        "2.1": [
-            "nanoserver"
-        ],
         "3.1": [
             "nanoserver"
         ]

src/GitVersionCore.Tests/BuildAgents/GitHubActionsTests.cs

@@ -97,7 +97,7 @@ public void GetCurrentBranchShouldHandlePullRequests()
         }
 
         [TestCase("Something", "1.0.0",
-            "::set-env name=GitVersion_Something::1.0.0")]
+            "\"GitVersion_Something=1.0.0\" >> $GITHUB_ENV")]
         public void GetSetParameterMessage(string key, string value, string expectedResult)
         {
             // Assert
@@ -141,7 +141,7 @@ public void ShouldWriteIntegration()
                 "Executing GenerateSetVersionMessage for 'GitHubActions'.",
                 "",
                 "Executing GenerateBuildLogOutput for 'GitHubActions'.",
-                "::set-env name=GitVersion_Major::1.0.0"
+                "\"GitVersion_Major=1.0.0\" >> $GITHUB_ENV"
             };
 
             string.Join(Environment.NewLine, list)

src/GitVersionCore.Tests/Core/RepositoryExtensionsTests.cs

@@ -52,6 +52,7 @@ private class TestableBranchCollection : BranchCollection
             private readonly IRepository repository;
             public TestableBranchCollection(IRepository repository)
             {
+                this.repository = repository;
             }
 
             IDictionary<string, Branch> branches = new Dictionary<string, Branch>();

src/GitVersionCore.Tests/IntegrationTests/TagCheckoutScenarios.cs

@@ -0,0 +1,32 @@
+using GitTools.Testing;
+using NUnit.Framework;
+
+namespace GitVersionCore.Tests.IntegrationTests
+{
+    [TestFixture]
+    public class TagCheckoutScenarios
+    {
+        [Test]
+        public void GivenARepositoryWithSingleCommit()
+        {
+            using var fixture = new EmptyRepositoryFixture();
+            const string taggedVersion = "1.0.3";
+            fixture.Repository.MakeATaggedCommit(taggedVersion);
+            fixture.Checkout(taggedVersion);
+
+            fixture.AssertFullSemver(taggedVersion);
+        }
+
+        [Test]
+        public void GivenARepositoryWithSingleCommitAndSingleBranch()
+        {
+            using var fixture = new EmptyRepositoryFixture();
+            const string taggedVersion = "1.0.3";
+            fixture.Repository.MakeATaggedCommit(taggedVersion);
+            fixture.BranchTo("task1");
+            fixture.Checkout(taggedVersion);
+
+            fixture.AssertFullSemver(taggedVersion);
+        }
+    }
+}

src/GitVersionCore/BuildAgents/GitHubActions.cs

@@ -23,17 +23,17 @@ public override string GenerateSetVersionMessage(VersionVariables variables)
 
         public override string[] GenerateSetParameterMessage(string name, string value)
         {
-            // https://help.github.com/en/actions/automating-your-workflow-with-github-actions/development-tools-for-github-actions#set-an-environment-variable-set-env
+            // https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files
             // Example
-            // echo "::set-env name=action_state::yellow"
+            // echo "name=action_state::yellow >> $GITHUB_ENV"
 
             if (!string.IsNullOrWhiteSpace(value))
             {
                 var key = $"GitVersion_{name}";
 
                 return new[]
                 {
-                    $"::set-env name={key}::{value}"
+                    $"\"{key}={value}\" >> $GITHUB_ENV"
                 };
             }
 

src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs

@@ -35,7 +35,10 @@ public SemanticVersion FindVersion()
                 log.Info($"Current commit is tagged with version {context.CurrentCommitTaggedVersion}, " +
                          "version calculation is for metadata only.");
             }
-            EnsureHeadIsNotDetached(context);
+            else
+            {
+                EnsureHeadIsNotDetached(context);
+            }
 
             SemanticVersion taggedSemanticVersion = null;