Merge remote-tracking branch 'arturcic/main' into main

Author: arturcic

docs/input/docs/usage/msbuild.md

@@ -258,6 +258,16 @@ For SDK-style projects, `UpdateVersionProperties` controls setting the default
 variables: `Version`, `VersionPrefix`, `VersionSuffix`, `PackageVersion`,
 `InformationalVersion`, `AssemblyVersion` and `FileVersion`.
 
+## Extra properties
+
+There are properties that correspont to certain 
+[command line arguments](/docs/usage/cli/arguments) for GetVersion task.
+In particular, setting `GitVersion_NoFetchEnabled` to `true` disables `git fetch` 
+during version calculation, setting `GitVersion_NoNormalizeEnabled` to `true` disables 
+normalize step on a build server, setting `GitVersion_NoCacheEnabled` to `true`
+makes GetVersion ignore cache. All the rest command line arguments can be passed via 
+`GitVersion_CommandLineArguments` variable.
+
 ## My Git repository requires authentication. What should I do?
 
 Set the environment variables `GITVERSION_REMOTE_USERNAME` and

src/GitTools.Testing/Fixtures/BaseGitFlowRepositoryFixture.cs

@@ -12,8 +12,26 @@ public class BaseGitFlowRepositoryFixture : EmptyRepositoryFixture
     ///
     /// Main will be tagged with the initial version before branching develop
     /// </summary>
-    public BaseGitFlowRepositoryFixture(string initialVersion) :
-        this(r => r.MakeATaggedCommit(initialVersion))
+    public BaseGitFlowRepositoryFixture(string initialVersion) : this(initialVersion, "main")
+    {
+    }
+
+    /// <summary>
+    /// Creates a repo with a develop branch off main which is a single commit ahead of main
+    ///
+    /// Main will be tagged with the initial version before branching develop
+    /// </summary>
+    public BaseGitFlowRepositoryFixture(string initialVersion, string branchName) :
+        this(r => r.MakeATaggedCommit(initialVersion), branchName)
+    {
+    }
+
+    /// <summary>
+    /// Creates a repo with a develop branch off main which is a single commit ahead of main
+    ///
+    /// The initial setup actions will be performed before branching develop
+    /// </summary>
+    public BaseGitFlowRepositoryFixture(Action<IRepository> initialMainAction) : this(initialMainAction, "main")
     {
     }
 
@@ -22,7 +40,8 @@ public BaseGitFlowRepositoryFixture(string initialVersion) :
     ///
     /// The initial setup actions will be performed before branching develop
     /// </summary>
-    public BaseGitFlowRepositoryFixture(Action<IRepository> initialMainAction) => SetupRepo(initialMainAction);
+    public BaseGitFlowRepositoryFixture(Action<IRepository> initialMainAction, string branchName) :
+        base(branchName) => SetupRepo(initialMainAction);
 
     private void SetupRepo(Action<IRepository> initialMainAction)
     {

src/GitTools.Testing/Fixtures/EmptyRepositoryFixture.cs

@@ -4,13 +4,18 @@ namespace GitTools.Testing;
 
 public class EmptyRepositoryFixture : RepositoryFixtureBase
 {
-    public EmptyRepositoryFixture() : base(CreateNewRepository)
+    public EmptyRepositoryFixture() : this("main")
     {
     }
 
-    private static IRepository CreateNewRepository(string path)
+    public EmptyRepositoryFixture(string branchName)
+        : base(path => CreateNewRepository(path, branchName))
     {
-        Init(path);
+    }
+
+    private static IRepository CreateNewRepository(string path, string branchName)
+    {
+        Init(path, branchName);
         Console.WriteLine("Created git repository at '{0}'", path);
 
         return new Repository(path);

src/GitTools.Testing/Fixtures/RemoteRepositoryFixture.cs

@@ -12,7 +12,12 @@ public class RemoteRepositoryFixture : RepositoryFixtureBase
     public RemoteRepositoryFixture(Func<string, IRepository> builder)
         : base(builder) => CreateLocalRepository();
 
-    public RemoteRepositoryFixture() : this(CreateNewRepository)
+    public RemoteRepositoryFixture() : this("main")
+    {
+    }
+
+    public RemoteRepositoryFixture(string branchName) :
+        this(path => CreateNewRepository(path, branchName))
     {
     }
 
@@ -21,9 +26,9 @@ public RemoteRepositoryFixture() : this(CreateNewRepository)
     /// </summary>
     public LocalRepositoryFixture LocalRepositoryFixture { get; private set; }
 
-    private static IRepository CreateNewRepository(string path)
+    private static IRepository CreateNewRepository(string path, string branchName)
     {
-        Init(path);
+        Init(path, branchName);
         Console.WriteLine("Created git repository at '{0}'", path);
 
         var repo = new Repository(path);

src/GitTools.Testing/Fixtures/RepositoryFixtureBase.cs

@@ -65,7 +65,7 @@ protected virtual void Dispose(bool disposing)
 
     public void Checkout(string branch) => Commands.Checkout(Repository, branch);
 
-    public static void Init(string path) => GitTestExtensions.ExecuteGitCmd($"init {path} -b main");
+    public static void Init(string path, string branchName) => GitTestExtensions.ExecuteGitCmd($"init {path} -b {branchName}");
 
     public void MakeATaggedCommit(string tag)
     {

src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs

@@ -15,7 +15,9 @@ public class PullRequestInBuildAgentTest
     {
         "refs/pull-requests/5/merge",
         "refs/pull/5/merge",
-        "refs/heads/pull/5/head"
+        "refs/heads/pull/5/head",
+        "refs/remotes/pull/5/merge",
+        "refs/remotes/pull-requests/5/merge"
     };
 
     [TestCaseSource(nameof(PrMergeRefs))]
@@ -49,7 +51,6 @@ public async Task VerifyContinuaCIPullRequest(string pullRequestRef)
         await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
     }
 
-
     [TestCaseSource(nameof(PrMergeRefs))]
     public async Task VerifyDronePullRequest(string pullRequestRef)
     {
@@ -128,7 +129,6 @@ public async Task VerifyTravisCIPullRequest(string pullRequestRef)
         await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
     }
 
-
     [TestCaseSource(nameof(PrMergeRefs))]
     public async Task VerifyBitBucketPipelinesPullRequest(string pullRequestRef)
     {
@@ -143,9 +143,9 @@ public async Task VerifyBitBucketPipelinesPullRequest(string pullRequestRef)
 
     private static async Task VerifyPullRequestVersionIsCalculatedProperly(string pullRequestRef, Dictionary<string, string> env)
     {
-        using var fixture = new EmptyRepositoryFixture();
+        using var fixture = new EmptyRepositoryFixture("main");
         var remoteRepositoryPath = ExecutableHelper.GetTempPath();
-        RepositoryFixtureBase.Init(remoteRepositoryPath);
+        RepositoryFixtureBase.Init(remoteRepositoryPath, "main");
         using (var remoteRepository = new Repository(remoteRepositoryPath))
         {
             remoteRepository.Config.Set("user.name", "Test");
@@ -180,4 +180,23 @@ private static async Task VerifyPullRequestVersionIsCalculatedProperly(string pu
         // Cleanup repository files
         DirectoryHelper.DeleteDirectory(remoteRepositoryPath);
     }
+
+    private static readonly object[] PrMergeRefInputs =
+    {
+        new object[] { "refs/pull-requests/5/merge", "refs/pull-requests/5/merge", false, true, false },
+        new object[] { "refs/pull/5/merge", "refs/pull/5/merge", false, true, false},
+        new object[] { "refs/heads/pull/5/head", "pull/5/head", true, false, false },
+        new object[] { "refs/remotes/pull/5/merge", "pull/5/merge", false, true, true },
+    };
+
+    [TestCaseSource(nameof(PrMergeRefInputs))]
+    public void VerifyPullRequestInput(string pullRequestRef, string friendly, bool isBranch, bool isPullRequest, bool isRemote)
+    {
+        var refName = new ReferenceName(pullRequestRef);
+
+        Assert.AreEqual(friendly, refName.Friendly);
+        Assert.AreEqual(isBranch, refName.IsBranch);
+        Assert.AreEqual(isPullRequest, refName.IsPullRequest);
+        Assert.AreEqual(isRemote, refName.IsRemoteBranch);
+    }
 }

src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs

@@ -36,9 +36,9 @@ public async Task VerifyTagCheckoutOnGitHubActions()
 
     private static async Task VerifyTagCheckoutVersionIsCalculatedProperly(Dictionary<string, string> env)
     {
-        using var fixture = new EmptyRepositoryFixture();
+        using var fixture = new EmptyRepositoryFixture("main");
         var remoteRepositoryPath = ExecutableHelper.GetTempPath();
-        RepositoryFixtureBase.Init(remoteRepositoryPath);
+        RepositoryFixtureBase.Init(remoteRepositoryPath, "main");
         using (var remoteRepository = new Repository(remoteRepositoryPath))
         {
             remoteRepository.Config.Set("user.name", "Test");

src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

@@ -54,10 +54,8 @@ branches:
     pre-release-weight: 30000
   feature:
     mode: ContinuousDelivery
-    tag: useBranchName
+    tag: '{BranchName}'
     increment: Inherit
-    prevent-increment-of-merged-branch-version: false
-    track-merge-target: false
     regex: ^features?[/-]
     source-branches:
     - develop
@@ -66,17 +64,12 @@ branches:
     - feature
     - support
     - hotfix
-    tracks-release-branches: false
-    is-release-branch: false
-    is-mainline: false
     pre-release-weight: 30000
   pull-request:
     mode: ContinuousDelivery
     tag: PullRequest
     increment: Inherit
-    prevent-increment-of-merged-branch-version: false
     tag-number-pattern: '[/-](?<number>\d+)'
-    track-merge-target: false
     regex: ^(pull|pull\-requests|pr)[/-]
     source-branches:
     - develop
@@ -85,9 +78,6 @@ branches:
     - feature
     - support
     - hotfix
-    tracks-release-branches: false
-    is-release-branch: false
-    is-mainline: false
     pre-release-weight: 30000
   hotfix:
     mode: ContinuousDelivery
@@ -97,9 +87,10 @@ branches:
     track-merge-target: false
     regex: ^hotfix(es)?[/-]
     source-branches:
-    - develop
+    - release
     - main
     - support
+    - hotfix
     tracks-release-branches: false
     is-release-branch: false
     is-mainline: false
@@ -119,6 +110,7 @@ branches:
     pre-release-weight: 55000
 ignore:
   sha: []
+increment: Inherit
 commit-date-format: yyyy-MM-dd
 merge-message-formats: {}
 update-build-number: true

src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs

@@ -3,7 +3,6 @@
 using GitVersion.Core.Tests.IntegrationTests;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
-using GitVersion.VersionCalculation;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using Shouldly;
@@ -14,13 +13,11 @@ namespace GitVersion.Core.Tests;
 public class RepositoryStoreTests : TestBase
 {
     private readonly ILog log;
-    private readonly IIncrementStrategyFinder incrementStrategyFinder;
 
     public RepositoryStoreTests()
     {
         var sp = ConfigureServices();
         this.log = sp.GetRequiredService<ILog>();
-        this.incrementStrategyFinder = sp.GetRequiredService<IIncrementStrategyFinder>();
     }
 
     [Test]
@@ -65,7 +62,7 @@ public void FindsCorrectMergeBaseForForwardMerge()
 
         var develop = fixtureRepository.FindBranch("develop");
         var release = fixtureRepository.FindBranch("release-2.0.0");
-        var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository, this.incrementStrategyFinder);
+        var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository);
 
         var releaseBranchMergeBase = gitRepoMetadataProvider.FindMergeBase(release, develop);
 
@@ -121,7 +118,7 @@ public void FindsCorrectMergeBaseForForwardMergeMovesOn()
 
         var develop = fixtureRepository.FindBranch("develop");
         var release = fixtureRepository.FindBranch("release-2.0.0");
-        var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository, this.incrementStrategyFinder);
+        var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository);
 
         var releaseBranchMergeBase = gitRepoMetadataProvider.FindMergeBase(release, develop);
 
@@ -196,7 +193,7 @@ public void FindsCorrectMergeBaseForMultipleForwardMerges()
         var develop = fixtureRepository.FindBranch("develop");
         var release = fixtureRepository.FindBranch("release-2.0.0");
 
-        var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository, this.incrementStrategyFinder);
+        var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository);
 
         var releaseBranchMergeBase = gitRepoMetadataProvider.FindMergeBase(release, develop);
 
@@ -213,7 +210,7 @@ public void GetBranchesContainingCommitThrowsDirectlyOnNullCommit()
     {
         using var fixture = new EmptyRepositoryFixture();
         var fixtureRepository = fixture.Repository.ToGitRepository();
-        var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository, this.incrementStrategyFinder);
+        var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository);
 
         Assert.Throws<ArgumentNullException>(() => gitRepoMetadataProvider.GetBranchesContainingCommit(null));
     }
@@ -227,7 +224,7 @@ public void FindCommitBranchWasBranchedFromShouldReturnNullIfTheRemoteIsTheOnlyS
 
         var localRepository = fixture.LocalRepositoryFixture.Repository.ToGitRepository();
 
-        var gitRepoMetadataProvider = new RepositoryStore(this.log, localRepository, this.incrementStrategyFinder);
+        var gitRepoMetadataProvider = new RepositoryStore(this.log, localRepository);
 
         var branch = localRepository.FindBranch("main");
         branch.ShouldNotBeNull();

src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs

@@ -82,8 +82,8 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
 
         try
         {
-            var semanticVersion = nextVersionCalculator.FindVersion();
-            var variables = variableProvider.GetVariablesFor(semanticVersion, context.Configuration, context.IsCurrentCommitTagged);
+            var nextVersion = nextVersionCalculator.FindVersion();
+            var variables = variableProvider.GetVariablesFor(nextVersion.IncrementedVersion, nextVersion.Configuration, context.IsCurrentCommitTagged);
 
             return variables;
         }