use primary constructors - GitVersion.Core

Author: arturcic

src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs

@@ -202,7 +202,7 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
         var configuration = GitFlowConfigurationBuilder.New.WithTagPrefix("prefix").Build();
         var overrideConfiguration = new ConfigurationHelper(configuration).Dictionary;
 
-        gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath, ConfigurationInfo = { OverrideConfiguration = overrideConfiguration } };
+        gitVersionOptions = new() { WorkingDirectory = fixture.RepositoryPath, ConfigurationInfo = { OverrideConfiguration = overrideConfiguration } };
 
         gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
         versionVariables = gitVersionCalculator.CalculateVersionVariables();
@@ -480,7 +480,7 @@ public void CalculateVersionFromWorktreeHead()
         fixture.Repository.MakeATaggedCommit("v2.0.0");
 
         fixture.Repository.Worktrees.Add(branchV1.CanonicalName, "1.0", worktreePath, false);
-        using var worktreeFixture = new LocalRepositoryFixture(new Repository(worktreePath));
+        using var worktreeFixture = new LocalRepositoryFixture(new(worktreePath));
 
         var gitVersionOptions = new GitVersionOptions { WorkingDirectory = worktreeFixture.RepositoryPath };
 
@@ -507,7 +507,7 @@ public void CalculateVersionVariables_TwoBranchHasSameCommitHeadDetachedAndNotTa
         fixture.LocalRepositoryFixture.Repository.CreateBranch("support/1.0");
         fixture.LocalRepositoryFixture.Checkout(commit.Sha);
 
-        using var worktreeFixture = new LocalRepositoryFixture(new Repository(fixture.LocalRepositoryFixture.RepositoryPath));
+        using var worktreeFixture = new LocalRepositoryFixture(new(fixture.LocalRepositoryFixture.RepositoryPath));
         var gitVersionOptions = new GitVersionOptions { WorkingDirectory = worktreeFixture.RepositoryPath };
 
         var environment = new TestEnvironment();
@@ -534,7 +534,7 @@ public void CalculateVersionVariables_TwoBranchHasSameCommitHeadDetachedAndTagge
         fixture.LocalRepositoryFixture.ApplyTag("1.0.1");
         fixture.LocalRepositoryFixture.Checkout(commit.Sha);
 
-        using var worktreeFixture = new LocalRepositoryFixture(new Repository(fixture.LocalRepositoryFixture.RepositoryPath));
+        using var worktreeFixture = new LocalRepositoryFixture(new(fixture.LocalRepositoryFixture.RepositoryPath));
         var gitVersionOptions = new GitVersionOptions { WorkingDirectory = worktreeFixture.RepositoryPath };
 
         var environment = new TestEnvironment();
@@ -559,7 +559,7 @@ public void CalculateVersionVariables_ShallowFetch_ThrowException()
         using var fixture = new RemoteRepositoryFixture();
         fixture.LocalRepositoryFixture.MakeShallow();
 
-        using var worktreeFixture = new LocalRepositoryFixture(new Repository(fixture.LocalRepositoryFixture.RepositoryPath));
+        using var worktreeFixture = new LocalRepositoryFixture(new(fixture.LocalRepositoryFixture.RepositoryPath));
         var gitVersionOptions = new GitVersionOptions { WorkingDirectory = worktreeFixture.RepositoryPath };
 
         var environment = new TestEnvironment();

src/GitVersion.Core.Tests/Core/RepositoryExtensionsTests.cs

@@ -33,14 +33,14 @@ private static IRemote MockRemote(IGitRepository repository)
 
         var branches = Substitute.For<IBranchCollection>();
         branches[branch.Name.Canonical].Returns(branch);
-        branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { branch }).GetEnumerator());
+        branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)[branch]).GetEnumerator());
 
         var reference = Substitute.For<IReference>();
         reference.Name.Returns(new ReferenceName("refs/heads/develop"));
 
         var references = Substitute.For<IReferenceCollection>();
         references["develop"].Returns(reference);
-        references.GetEnumerator().Returns(_ => ((IEnumerable<IReference>)new[] { reference }).GetEnumerator());
+        references.GetEnumerator().Returns(_ => ((IEnumerable<IReference>)[reference]).GetEnumerator());
 
         repository.Refs.Returns(references);
         repository.Head.Returns(branch);

src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs

@@ -75,7 +75,7 @@ private static IGitRepository CreateRepository()
         var mockCommit = GitToolsTestingExtensions.CreateMockCommit();
         var mockBranch = GitToolsTestingExtensions.CreateMockBranch(TestBase.MainBranch, mockCommit);
         var branches = Substitute.For<IBranchCollection>();
-        branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { mockBranch }).GetEnumerator());
+        branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)[mockBranch]).GetEnumerator());
 
         var mockRepository = Substitute.For<IGitRepository>();
         mockRepository.Branches.Returns(branches);

src/GitVersion.Core.Tests/Helpers/TestConsole.cs

@@ -3,16 +3,10 @@
 
 namespace GitVersion.Core.Tests.Helpers;
 
-public class TestConsole : IConsole
+public class TestConsole(params string[] responses) : IConsole
 {
-    private readonly Queue<string> responses;
-    private readonly ILog log;
-
-    public TestConsole(params string[] responses)
-    {
-        this.log = new NullLog();
-        this.responses = new Queue<string>(responses);
-    }
+    private readonly Queue<string> responses = new(responses);
+    private readonly ILog log = new NullLog();
 
     public void WriteLine(string? msg) => this.log.Info(msg + PathHelper.NewLine);
 

src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs

@@ -11,14 +11,14 @@ public class MainScenarios : TestBase
     [Test]
     public void CanHandleContinuousDelivery()
     {
-        var configuaration = GitFlowConfigurationBuilder.New
+        var configuration = GitFlowConfigurationBuilder.New
             .WithBranch(MainBranch, builder => builder.WithVersioningMode(VersioningMode.ContinuousDelivery))
             .Build();
 
         using var fixture = new EmptyRepositoryFixture();
         fixture.Repository.MakeATaggedCommit("1.0.0");
         fixture.Repository.MakeCommits(2);
-        fixture.AssertFullSemver("1.0.1-1+2", configuaration);
+        fixture.AssertFullSemver("1.0.1-1+2", configuration);
     }
 
     [Test]

src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentMode.cs

@@ -2,7 +2,6 @@
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
 using GitVersion.VersionCalculation;
-using LibGit2Sharp;
 
 namespace GitVersion.Core.Tests.IntegrationTests;
 
@@ -68,7 +67,7 @@ public void MergedFeatureBranchesToMainImpliesRelease()
         fixture.SequenceDiagram.NoteOver("Merge message contains '+semver: minor'", MainBranch);
         var commit = fixture.Repository.Head.Tip;
         // Put semver increment in merge message
-        fixture.Repository.Commit(commit.Message + " +semver: minor", commit.Author, commit.Committer, new CommitOptions { AmendPreviousCommit = true });
+        fixture.Repository.Commit(commit.Message + " +semver: minor", commit.Author, commit.Committer, new() { AmendPreviousCommit = true });
         fixture.AssertFullSemver("1.2.0", configuration);
 
         fixture.BranchTo("feature/foo4", "foo4");
@@ -479,7 +478,7 @@ public void VerifyIncrementConfigIsHonoured()
         fixture.SequenceDiagram.NoteOver("Merge message contains '+semver: patch'", MainBranch);
         var commit = fixture.Repository.Head.Tip;
         // Put semver increment in merge message
-        fixture.Repository.Commit(commit.Message + " +semver: patch", commit.Author, commit.Committer, new CommitOptions { AmendPreviousCommit = true });
+        fixture.Repository.Commit(commit.Message + " +semver: patch", commit.Author, commit.Committer, new() { AmendPreviousCommit = true });
         fixture.AssertFullSemver("1.1.2", minorIncrementConfig);
 
         var configuration = GetConfigurationBuilder().Build();

src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs

@@ -22,7 +22,7 @@ public void DoNotBlowUpWhenMainAndDevelopPointAtSameCommit()
         fixture.MakeACommit();
         fixture.Repository.CreateBranch("develop");
 
-        Commands.Fetch(fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, [], new FetchOptions(), null);
+        Commands.Fetch(fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, [], new(), null);
         Commands.Checkout(fixture.LocalRepositoryFixture.Repository, fixture.Repository.Head.Tip);
         fixture.LocalRepositoryFixture.Repository.Branches.Remove(MainBranch);
         fixture.InitializeRepo();
@@ -88,7 +88,7 @@ public void DoNotBlowUpWhenDevelopAndFeatureBranchPointAtSameCommit()
         fixture.MakeACommit();
         fixture.Repository.CreateBranch("feature/someFeature");
 
-        Commands.Fetch(fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, [], new FetchOptions(), null);
+        Commands.Fetch(fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, [], new(), null);
         Commands.Checkout(fixture.LocalRepositoryFixture.Repository, fixture.Repository.Head.Tip);
         fixture.LocalRepositoryFixture.Repository.Branches.Remove(MainBranch);
         fixture.InitializeRepo();

src/GitVersion.Core.Tests/IntegrationTests/ReleaseBranchScenarios.cs

@@ -438,7 +438,7 @@ public void CommitBeetweenMergeReleaseToDevelopShouldNotResetCount()
 
         // Merge release to develop - emulate commit between other person release commit push and this commit merge to develop
         Commands.Checkout(fixture.Repository, "develop");
-        fixture.Repository.Merge(commit1, Generate.SignatureNow(), new MergeOptions { FastForwardStrategy = FastForwardStrategy.NoFastForward });
+        fixture.Repository.Merge(commit1, Generate.SignatureNow(), new() { FastForwardStrategy = FastForwardStrategy.NoFastForward });
         fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
 
         // Check version on release after merge to develop

src/GitVersion.Core.Tests/IntegrationTests/RemoteRepositoryScenarios.cs

@@ -78,8 +78,8 @@ public void GivenARemoteGitRepositoryAheadOfLocalRepositoryThenChangesShouldPull
         fixture.Repository.MakeACommit();
         fixture.AssertFullSemver("0.0.1-6");
         fixture.AssertFullSemver("0.0.1-5", repository: fixture.LocalRepositoryFixture.Repository);
-        var buildSignature = fixture.LocalRepositoryFixture.Repository.Config.BuildSignature(new DateTimeOffset(DateTime.Now));
-        Commands.Pull(fixture.LocalRepositoryFixture.Repository, buildSignature, new PullOptions());
+        var buildSignature = fixture.LocalRepositoryFixture.Repository.Config.BuildSignature(new(DateTime.Now));
+        Commands.Pull(fixture.LocalRepositoryFixture.Repository, buildSignature, new());
         fixture.AssertFullSemver("0.0.1-6", repository: fixture.LocalRepositoryFixture.Repository);
     }
 

src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs

@@ -44,7 +44,7 @@ public void TakesVersionFromNameOfRemoteReleaseBranchInOrigin()
         using var fixture = new RemoteRepositoryFixture();
         fixture.BranchTo("release/2.0.0");
         fixture.MakeACommit();
-        Commands.Fetch(fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, [], new FetchOptions(), null);
+        Commands.Fetch(fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, [], new(), null);
 
         fixture.LocalRepositoryFixture.Checkout("origin/release/2.0.0");
 
@@ -58,7 +58,7 @@ public void DoesNotTakeVersionFromNameOfRemoteReleaseBranchInCustomRemote()
         fixture.LocalRepositoryFixture.Repository.Network.Remotes.Rename("origin", "upstream");
         fixture.BranchTo("release/2.0.0");
         fixture.MakeACommit();
-        Commands.Fetch(fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, [], new FetchOptions(), null);
+        Commands.Fetch(fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, [], new(), null);
 
         fixture.LocalRepositoryFixture.Checkout("upstream/release/2.0.0");