Merge branch 'master' into ProjectFileUpdating

Author: asbjornu

.azurepipelines/artifacts-test.yml

@@ -2,7 +2,6 @@ jobs:
 - ${{ each distro in parameters.distros }}:
     - ${{ each dotnetVersion in parameters.dotnetVersions }}:
       - job:
-        condition: or( ne('${{ distro }}', 'alpine.3.10-x64'), ne('${{ dotnetVersion }}', '3.1'))
         displayName: 'Artifacts Test ${{ distro }} ${{ dotnetVersion }} (${{ parameters.name }})'
         pool:
           vmImage: ${{ parameters.vmImage }}

.github/workflows/build.yml

@@ -105,10 +105,6 @@ jobs:
         os: [linux]
         targetFramework: [2.1, 3.1]
         distro: [alpine.3.10-x64, centos.7-x64, debian.9-x64, fedora.30-x64, ubuntu.16.04-x64, ubuntu.18.04-x64]
-        exclude:
-          # for some reason this is not working on CI, but works locally
-          - targetFramework: 3.1
-            distro: alpine.3.10-x64
       fail-fast: false
 
     steps:

azure-pipelines.yml

@@ -55,34 +55,24 @@ stages:
   - Test
   condition: succeeded()
   jobs:
-  # - template: .azurepipelines/generate-job.yml
   - template: .azurepipelines/artifacts-test.yml
     parameters:
       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' ]
-#   - template: .azurepipelines/artifacts-test.yml
-#     parameters:
-#       name: Windows
-#       vmImage: 'windows-latest'
 
 - stage: Docker
   displayName: 'Docker Build & Test'
   dependsOn: Artifact_Test
   condition: succeeded()
   jobs:
-  # - template: .azurepipelines/generate-job.yml
   - template: .azurepipelines/docker.yml
     parameters:
       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' ]
-#   - template: .azurepipelines/docker.yml
-#     parameters:
-#       name: Windows
-#       vmImage: 'windows-latest'
 
 - stage: Publish
   displayName: 'Publish'

build/artifacts-test.cake

@@ -111,6 +111,12 @@ Task("Artifacts-MsBuildCore-Test")
     {
         var (os, distro, targetframework) = dockerImage;
 
+        // TODO investigate
+        if (distro == "alpine.3.10-x64" && targetframework == "netcoreapp3.1") {
+            Information("Skipping this combination, works locally, not in CI for some reason");
+            continue;
+        }
+
         var cmd = $"-file {rootPrefix}/scripts/Test-MsBuildCore.ps1 -version {version} -repoPath {rootPrefix}/repo/test/core -nugetPath {rootPrefix}/nuget -targetframework {targetframework}";
 
         DockerTestArtifact(dockerImage, parameters, cmd);

build/utils/parameters.cake

@@ -141,7 +141,7 @@ public class BuildParameters
         NativeRuntimes = new Dictionary<PlatformFamily, string[]>
         {
             [PlatformFamily.Windows] = new[] { "win-x64", "win-x86" },
-            [PlatformFamily.Linux]   = new[] { "debian.9-x64", "centos.7-x64", "fedora.30-x64", "ubuntu.16.04-x64", "ubuntu.18.04-x64" },
+            [PlatformFamily.Linux]   = new[] { "alpine.3.10-x64", "debian.9-x64", "centos.7-x64", "fedora.30-x64", "ubuntu.16.04-x64", "ubuntu.18.04-x64" },
             [PlatformFamily.OSX]     = new[] { "osx-x64" },
         };
 

src/Docker/docker.ps1

@@ -1,10 +1,8 @@
-using GitTools.Testing;
 using GitVersion.Logging;
 using GitVersion.Extensions;
 using GitVersionCore.Tests.Helpers;
 using LibGit2Sharp;
 using NUnit.Framework;
-using System.Linq;
 using NSubstitute;
 using System;
 using System.Collections.Generic;
@@ -41,7 +39,7 @@ private Remote MockRemote(IGitRepository repository)
             var head = branches.Add("refs/heads/feature/feat-test", tip);
             var remote = new TesatbleRemote("origin");
             var references = new TestableReferenceCollection();
-            var reference = references.Add("develop", "refs/heads/develop");
+            _ = references.Add("develop", "refs/heads/develop");
 
             repository.Refs.Returns(references);
             repository.Head.Returns(head);

src/GitVersionCore.Tests/Core/RepositoryExtensionsTests.cs

@@ -20,6 +20,24 @@ public class MainlineDevelopmentMode : TestBase
             VersioningMode = VersioningMode.Mainline
         };
 
+        [Test]
+        public void VerifyNonMasterMainlineVersionIdenticalAsMaster()
+        {
+            using var fixture = new EmptyRepositoryFixture();
+            fixture.Repository.MakeACommit("1");
+
+            fixture.BranchTo("feature/foo", "foo");
+            fixture.MakeACommit("2 +semver: major");
+            fixture.Checkout("master");
+            fixture.MergeNoFF("feature/foo");
+
+            fixture.AssertFullSemver("1.0.0", config);
+
+            fixture.BranchTo("support/1.0", "support");
+
+            fixture.AssertFullSemver("1.0.0", config);
+        }
+
         [Test]
         public void MergedFeatureBranchesToMasterImpliesRelease()
         {
@@ -117,7 +135,7 @@ public void SupportBranches()
             fixture.AssertFullSemver("1.0.2", config);
 
             fixture.BranchTo("support/1.0", "support10");
-            fixture.AssertFullSemver("1.0.3", config);
+            fixture.AssertFullSemver("1.0.2", config);
 
             // Move master on
             fixture.Checkout("master");
@@ -126,9 +144,9 @@ public void SupportBranches()
 
             // Continue on support/1.0
             fixture.Checkout("support/1.0");
+            fixture.MakeACommit(); // 1.0.3
             fixture.MakeACommit(); // 1.0.4
-            fixture.MakeACommit(); // 1.0.5
-            fixture.AssertFullSemver("1.0.5", config);
+            fixture.AssertFullSemver("1.0.4", config);
             fixture.BranchTo("feature/foo", "foo");
             fixture.AssertFullSemver("1.0.5-foo.0", config);
             fixture.MakeACommit();
@@ -185,7 +203,7 @@ public void VerifySupportForwardMerge()
             fixture.MakeACommit();
             fixture.AssertFullSemver("1.1.2", config);
             fixture.Checkout("support/1.0");
-            fixture.AssertFullSemver("1.0.4", config);
+            fixture.AssertFullSemver("1.0.3", config);
 
             fixture.BranchTo("feature/foo", "foo");
             fixture.MakeACommit();

src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs

@@ -15,7 +15,7 @@ public class GitRepositoryCommands : IGitRepositoryCommands
 
         public GitRepositoryCommands(Lazy<IRepository> lazyRepository)
         {
-            this.lazyRepository = lazyRepository ?? throw new System.ArgumentNullException(nameof(lazyRepository));
+            this.lazyRepository = lazyRepository ?? throw new ArgumentNullException(nameof(lazyRepository));
         }
 
         public Branch Checkout(string committishOrBranchSpec)

src/GitVersionCore/Core/GitRepositoryCommands.cs

@@ -69,7 +69,7 @@ public SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion)
                 mainlineVersion.BuildMetaData = CreateVersionBuildMetaData(mergeBase);
 
                 // branches other than master always get a bump for the act of branching
-                if (context.CurrentBranch.FriendlyName != "master")
+                if (!context.CurrentBranch.IsSameBranch(mainline))
                 {
                     var branchIncrement = FindMessageIncrement(null, context.CurrentCommit, mergeBase, mainlineCommitLog);
                     log.Info($"Performing {branchIncrement} increment for current branch ");

src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs

@@ -104,7 +104,8 @@ public Arguments ParseArguments(string[] commandLineArguments)
                 : firstArgument;
 
             arguments.TargetPath = arguments.TargetPath.TrimEnd('/', '\\');
-            arguments.UpdateAssemblyInfoFileName = ResolveFiles(arguments.TargetPath, arguments.UpdateAssemblyInfoFileName).ToHashSet();
+
+            if (!arguments.EnsureAssemblyInfo) arguments.UpdateAssemblyInfoFileName = ResolveFiles(arguments.TargetPath, arguments.UpdateAssemblyInfoFileName).ToHashSet();
             arguments.NoFetch = arguments.NoFetch || buildAgent != null && buildAgent.PreventFetch();
 
             return arguments;