cleanup

arturcic · arturcic · commit 8c4273cebb3c · 2023-09-06T18:19:51.000+02:00
diff --git a/src/GitVersion.BuildAgents/Agents/BuildKite.cs b/src/GitVersion.BuildAgents/Agents/BuildKite.cs
@@ -28,12 +28,10 @@ public override string[] GenerateSetParameterMessage(string name, string? value)
         {
             return Environment.GetEnvironmentVariable("BUILDKITE_BRANCH");
         }
-        else
-        {
-            // For pull requests BUILDKITE_BRANCH refers to the head, so adjust the
-            // branch name for pull request versioning to function as expected
-            return string.Format("refs/pull/{0}/head", pullRequest);
-        }
+
+        // For pull requests BUILDKITE_BRANCH refers to the head, so adjust the
+        // branch name for pull request versioning to function as expected
+        return string.Format("refs/pull/{0}/head", pullRequest);
     }
 
     public override bool PreventFetch() => true;
diff --git a/src/GitVersion.Core.Tests/Configuration/ConfigurationProviderTests.cs b/src/GitVersion.Core.Tests/Configuration/ConfigurationProviderTests.cs
@@ -412,7 +412,7 @@ public void ShouldOverrideTagPrefixWithOverrideConfigValue([Values] bool tagPref
     {
         var text = tagPrefixSetAtYmlFile ? "tag-prefix: custom-tag-prefix-from-yml" : "";
         SetupConfigFileContent(text);
-        var overrideConfiguration = new Dictionary<object, object?>()
+        var overrideConfiguration = new Dictionary<object, object?>
         {
             { "tag-prefix", "tag-prefix-from-override-configuration" }
         };
@@ -426,7 +426,7 @@ public void ShouldNotOverrideDefaultTagPrefixWhenNotSetInOverrideConfig()
     {
         const string text = "";
         SetupConfigFileContent(text);
-        var overrideConfiguration = new Dictionary<object, object?>()
+        var overrideConfiguration = new Dictionary<object, object?>
         {
             { "next-version", "1.0.0" }
         };
@@ -441,7 +441,7 @@ public void ShouldNotOverrideTagPrefixFromConfigFileWhenNotSetInOverrideConfig()
     {
         const string text = "tag-prefix: custom-tag-prefix-from-yml";
         SetupConfigFileContent(text);
-        var overrideConfiguration = new Dictionary<object, object?>()
+        var overrideConfiguration = new Dictionary<object, object?>
         {
             { "next-version", "1.0.0" }
         };
@@ -455,7 +455,7 @@ public void ShouldOverrideTagPrefixFromConfigFileWhenSetInOverrideConfig()
     {
         const string text = "tag-prefix: custom-tag-prefix-from-yml";
         SetupConfigFileContent(text);
-        var overrideConfiguration = new Dictionary<object, object?>()
+        var overrideConfiguration = new Dictionary<object, object?>
         {
             { "tag-prefix", "custom-tag-prefix-from-console" }
         };
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/IgnoreBeforeScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/IgnoreBeforeScenarios.cs
@@ -17,7 +17,7 @@ public void ShouldFallbackToBaseVersionWhenAllCommitsAreIgnored(string? nextVers
         fixture.MakeACommit();
 
         var configuration = GitFlowConfigurationBuilder.New.WithNextVersion(nextVersion)
-            .WithIgnoreConfiguration(new IgnoreConfiguration() { Before = dateTimeNow.AddDays(1) }).Build();
+            .WithIgnoreConfiguration(new IgnoreConfiguration { Before = dateTimeNow.AddDays(1) }).Build();
 
         fixture.AssertFullSemver(expectedFullSemVer, configuration);
     }
@@ -33,7 +33,7 @@ public void ShouldNotFallbackToBaseVersionWhenAllCommitsAreNotIgnored(string? ne
         fixture.MakeACommit();
 
         var configuration = GitFlowConfigurationBuilder.New.WithNextVersion(nextVersion)
-            .WithIgnoreConfiguration(new IgnoreConfiguration() { Before = dateTimeNow.AddDays(-1) }).Build();
+            .WithIgnoreConfiguration(new IgnoreConfiguration { Before = dateTimeNow.AddDays(-1) }).Build();
 
         fixture.AssertFullSemver(expectedFullSemVer, configuration);
     }
diff --git a/src/GitVersion.Core.Tests/MergeMessageTests.cs b/src/GitVersion.Core.Tests/MergeMessageTests.cs
@@ -176,7 +176,7 @@ public void ParsesBitBucketPullMergeMessage_v7(
 
     private static readonly object?[] BitBucketCloudPullMergeMessages =
     {
-        new object?[] { $@"Merged in release/2.301.0 (pull request #1789)
+        new object?[] { @"Merged in release/2.301.0 (pull request #1789)
 
 Release/2.301.0
 
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs
@@ -24,7 +24,7 @@ public void ReturnsNullWhenNoNextVersionIsInConfig()
     [TestCase("0.1", "0.1.0", SemanticVersionFormat.Loose)]
     public void ConfigNextVersionTest(string nextVersion, string expectedVersion, SemanticVersionFormat versionFormat)
     {
-        var overrideConfiguration = new Dictionary<object, object?>()
+        var overrideConfiguration = new Dictionary<object, object?>
         {
             { "next-version", nextVersion },
             { "semantic-version-format", versionFormat }
@@ -39,7 +39,7 @@ public void ConfigNextVersionTest(string nextVersion, string expectedVersion, Se
     [TestCase("0.1", SemanticVersionFormat.Strict)]
     public void ConfigNextVersionTestShouldFail(string nextVersion, SemanticVersionFormat versionFormat)
     {
-        var overrideConfiguration = new Dictionary<object, object?>()
+        var overrideConfiguration = new Dictionary<object, object?>
         {
             { "next-version", nextVersion },
             { "semantic-version-format", versionFormat }
diff --git a/src/GitVersion.Core/Configuration/ConfigurationExtensions.cs b/src/GitVersion.Core/Configuration/ConfigurationExtensions.cs
@@ -20,7 +20,7 @@ public static IBranchConfiguration GetBranchConfiguration(this IGitVersionConfig
     public static IBranchConfiguration GetBranchConfiguration(this IGitVersionConfiguration configuration, ReferenceName branchName)
     {
         var branchConfiguration = GetBranchConfigurations(configuration, branchName.WithoutOrigin).FirstOrDefault();
-        branchConfiguration ??= new BranchConfiguration()
+        branchConfiguration ??= new BranchConfiguration
         {
             RegularExpression = string.Empty,
             Label = ConfigurationConstants.BranchNamePlaceholder,
diff --git a/src/GitVersion.Core/Configuration/GitFlowConfigurationBuilder.cs b/src/GitVersion.Core/Configuration/GitFlowConfigurationBuilder.cs
@@ -9,7 +9,7 @@ internal sealed class GitFlowConfigurationBuilder : ConfigurationBuilderBase<Git
 
     private GitFlowConfigurationBuilder()
     {
-        WithConfiguration(new GitVersionConfiguration()
+        WithConfiguration(new GitVersionConfiguration
         {
             AssemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,
             AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
@@ -36,7 +36,7 @@ private GitFlowConfigurationBuilder()
             IsMainline = false
         });
 
-        WithBranch(DevelopBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(DevelopBranch.Name).WithConfiguration(new BranchConfiguration
         {
             Increment = IncrementStrategy.Minor,
             RegularExpression = DevelopBranch.RegexPattern,
@@ -50,7 +50,7 @@ private GitFlowConfigurationBuilder()
             PreReleaseWeight = 0
         });
 
-        WithBranch(MainBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(MainBranch.Name).WithConfiguration(new BranchConfiguration
         {
             Increment = IncrementStrategy.Patch,
             RegularExpression = MainBranch.RegexPattern,
@@ -67,7 +67,7 @@ private GitFlowConfigurationBuilder()
             PreReleaseWeight = 55000
         });
 
-        WithBranch(ReleaseBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(ReleaseBranch.Name).WithConfiguration(new BranchConfiguration
         {
             Increment = IncrementStrategy.None,
             RegularExpression = ReleaseBranch.RegexPattern,
@@ -87,7 +87,7 @@ private GitFlowConfigurationBuilder()
             PreReleaseWeight = 30000
         });
 
-        WithBranch(FeatureBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(FeatureBranch.Name).WithConfiguration(new BranchConfiguration
         {
             Increment = IncrementStrategy.Inherit,
             RegularExpression = FeatureBranch.RegexPattern,
@@ -104,7 +104,7 @@ private GitFlowConfigurationBuilder()
             PreReleaseWeight = 30000
         });
 
-        WithBranch(PullRequestBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(PullRequestBranch.Name).WithConfiguration(new BranchConfiguration
         {
             Increment = IncrementStrategy.Inherit,
             RegularExpression = PullRequestBranch.RegexPattern,
@@ -122,7 +122,7 @@ private GitFlowConfigurationBuilder()
             PreReleaseWeight = 30000
         });
 
-        WithBranch(HotfixBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(HotfixBranch.Name).WithConfiguration(new BranchConfiguration
         {
             Increment = IncrementStrategy.Inherit,
             RegularExpression = HotfixBranch.RegexPattern,
@@ -138,7 +138,7 @@ private GitFlowConfigurationBuilder()
             PreReleaseWeight = 30000
         });
 
-        WithBranch(SupportBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(SupportBranch.Name).WithConfiguration(new BranchConfiguration
         {
             Increment = IncrementStrategy.Patch,
             RegularExpression = SupportBranch.RegexPattern,
@@ -152,7 +152,7 @@ private GitFlowConfigurationBuilder()
             PreReleaseWeight = 55000
         });
 
-        WithBranch(UnknownBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(UnknownBranch.Name).WithConfiguration(new BranchConfiguration
         {
             RegularExpression = UnknownBranch.RegexPattern,
             Label = ConfigurationConstants.BranchNamePlaceholder,
diff --git a/src/GitVersion.Core/Configuration/GitHubFlowConfigurationBuilder.cs b/src/GitVersion.Core/Configuration/GitHubFlowConfigurationBuilder.cs
@@ -9,7 +9,7 @@ internal sealed class GitHubFlowConfigurationBuilder : ConfigurationBuilderBase<
 
     private GitHubFlowConfigurationBuilder()
     {
-        WithConfiguration(new GitVersionConfiguration()
+        WithConfiguration(new GitVersionConfiguration
         {
             AssemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,
             AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
@@ -36,7 +36,7 @@ private GitHubFlowConfigurationBuilder()
             IsMainline = false
         });
 
-        WithBranch(MainBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(MainBranch.Name).WithConfiguration(new BranchConfiguration
         {
             Increment = IncrementStrategy.Patch,
             RegularExpression = MainBranch.RegexPattern,
@@ -52,7 +52,7 @@ private GitHubFlowConfigurationBuilder()
             PreReleaseWeight = 55000
         });
 
-        WithBranch(ReleaseBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(ReleaseBranch.Name).WithConfiguration(new BranchConfiguration
         {
             Increment = IncrementStrategy.None,
             RegularExpression = ReleaseBranch.RegexPattern,
@@ -70,7 +70,7 @@ private GitHubFlowConfigurationBuilder()
             PreReleaseWeight = 30000
         });
 
-        WithBranch(FeatureBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(FeatureBranch.Name).WithConfiguration(new BranchConfiguration
         {
             Increment = IncrementStrategy.Inherit,
             RegularExpression = FeatureBranch.RegexPattern,
@@ -84,7 +84,7 @@ private GitHubFlowConfigurationBuilder()
             PreReleaseWeight = 30000
         });
 
-        WithBranch(PullRequestBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(PullRequestBranch.Name).WithConfiguration(new BranchConfiguration
         {
             Increment = IncrementStrategy.Inherit,
             RegularExpression = PullRequestBranch.RegexPattern,
@@ -99,7 +99,7 @@ private GitHubFlowConfigurationBuilder()
             PreReleaseWeight = 30000
         });
 
-        WithBranch(UnknownBranch.Name).WithConfiguration(new BranchConfiguration()
+        WithBranch(UnknownBranch.Name).WithConfiguration(new BranchConfiguration
         {
             RegularExpression = UnknownBranch.RegexPattern,
             Label = ConfigurationConstants.BranchNamePlaceholder,
diff --git a/src/GitVersion.Core/Configuration/IgnoreConfigurationBuilder.cs b/src/GitVersion.Core/Configuration/IgnoreConfigurationBuilder.cs
@@ -32,7 +32,7 @@ public IgnoreConfigurationBuilder WithShas(HashSet<string> value)
         return this;
     }
 
-    public IIgnoreConfiguration Build() => new IgnoreConfiguration()
+    public IIgnoreConfiguration Build() => new IgnoreConfiguration
     {
         Before = before,
         Shas = shas
diff --git a/src/GitVersion.Core/Configuration/Init/EditConfigStep.cs b/src/GitVersion.Core/Configuration/Init/EditConfigStep.cs
@@ -2,6 +2,7 @@
 using GitVersion.Configuration.Init.SetConfig;
 using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
+using GitVersion.VersionCalculation;
 
 namespace GitVersion.Configuration.Init;
 
@@ -57,7 +58,7 @@ protected override string GetPrompt(ConfigurationBuilder configurationBuilder, s
 
 3) Set next version number
 4) Branch specific configuration
-5) Branch Increment mode (per commit/after tag) (Current: {configuration.VersioningMode ?? VersionCalculation.VersioningMode.ContinuousDeployment})
+5) Branch Increment mode (per commit/after tag) (Current: {configuration.VersioningMode ?? VersioningMode.ContinuousDeployment})
 6) Assembly versioning scheme (Current: {configuration.AssemblyVersioningScheme})
 7) Setup build scripts";
     }
diff --git a/src/GitVersion.Core/Options/GitVersionOptions.cs b/src/GitVersion.Core/Options/GitVersionOptions.cs
@@ -13,8 +13,6 @@ public class GitVersionOptions
     public WixInfo WixInfo { get; } = new();
     public Settings Settings { get; } = new();
 
-
-
     public bool Init;
     public bool Diag;
     public bool IsVersion;
diff --git a/src/GitVersion.Core/VersionCalculation/ContinuousDeliveryVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/ContinuousDeliveryVersionCalculator.cs
@@ -47,13 +47,11 @@ private SemanticVersion CalculateInternal(NextVersion nextVersion)
                 }
             };
         }
-        else
+
+        var baseVersionBuildMetaData = CreateVersionBuildMetaData(nextVersion.BaseVersion.BaseVersionSource);
+        return new SemanticVersion(nextVersion.BaseVersion.SemanticVersion)
         {
-            var baseVersionBuildMetaData = CreateVersionBuildMetaData(nextVersion.BaseVersion.BaseVersionSource);
-            return new SemanticVersion(nextVersion.BaseVersion.SemanticVersion)
-            {
-                BuildMetaData = baseVersionBuildMetaData
-            };
-        }
+            BuildMetaData = baseVersionBuildMetaData
+        };
     }
 }
diff --git a/src/GitVersion.Core/VersionCalculation/ContinuousDeploymentVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/ContinuousDeploymentVersionCalculator.cs
@@ -47,21 +47,19 @@ private SemanticVersion CalculateInternal(NextVersion nextVersion)
                 }
             };
         }
-        else
-        {
-            var baseVersionBuildMetaData = CreateVersionBuildMetaData(nextVersion.BaseVersion.BaseVersionSource);
 
-            Contract.Assume(baseVersionBuildMetaData.CommitsSinceTag.HasValue);
+        var baseVersionBuildMetaData = CreateVersionBuildMetaData(nextVersion.BaseVersion.BaseVersionSource);
+
+        Contract.Assume(baseVersionBuildMetaData.CommitsSinceTag.HasValue);
 
-            return new SemanticVersion(nextVersion.BaseVersion.SemanticVersion)
+        return new SemanticVersion(nextVersion.BaseVersion.SemanticVersion)
+        {
+            PreReleaseTag = SemanticVersionPreReleaseTag.Empty,
+            BuildMetaData = new SemanticVersionBuildMetaData(baseVersionBuildMetaData)
             {
-                PreReleaseTag = SemanticVersionPreReleaseTag.Empty,
-                BuildMetaData = new SemanticVersionBuildMetaData(baseVersionBuildMetaData)
-                {
-                    CommitsSinceVersionSource = baseVersionBuildMetaData.CommitsSinceTag.Value,
-                    CommitsSinceTag = null
-                }
-            };
-        }
+                CommitsSinceVersionSource = baseVersionBuildMetaData.CommitsSinceTag.Value,
+                CommitsSinceTag = null
+            }
+        };
     }
 }
diff --git a/src/GitVersion.Core/VersionCalculation/ManualDeploymentVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/ManualDeploymentVersionCalculator.cs
@@ -30,12 +30,10 @@ private SemanticVersion CalculateInternal(NextVersion nextVersion)
         {
             return CalculateIncrementedVersion(nextVersion);
         }
-        else
+
+        return new SemanticVersion(nextVersion.BaseVersion.SemanticVersion)
         {
-            return new SemanticVersion(nextVersion.BaseVersion.SemanticVersion)
-            {
-                BuildMetaData = CreateVersionBuildMetaData(nextVersion.BaseVersion.BaseVersionSource)
-            };
-        }
+            BuildMetaData = CreateVersionBuildMetaData(nextVersion.BaseVersion.BaseVersionSource)
+        };
     }
 }
diff --git a/src/GitVersion.Core/VersionCalculation/NonTrunkBasedVersionCalculatorBase.cs b/src/GitVersion.Core/VersionCalculation/NonTrunkBasedVersionCalculatorBase.cs
@@ -51,13 +51,11 @@ protected SemanticVersion CalculateIncrementedVersion(NextVersion nextVersion)
                 BuildMetaData = CreateVersionBuildMetaData(nextVersion.BaseVersion.BaseVersionSource)
             };
         }
-        else
+
+        return new SemanticVersion(nextVersion.IncrementedVersion)
         {
-            return new SemanticVersion(nextVersion.IncrementedVersion)
-            {
-                BuildMetaData = CreateVersionBuildMetaData(nextVersion.BaseVersion.BaseVersionSource)
-            };
-        }
+            BuildMetaData = CreateVersionBuildMetaData(nextVersion.BaseVersion.BaseVersionSource)
+        };
     }
 
     protected SemanticVersionBuildMetaData CreateVersionBuildMetaData(ICommit? baseVersionSource)
diff --git a/src/GitVersion.MsBuild.Tests/Tasks/GenerateGitVersionInformationTest.cs b/src/GitVersion.MsBuild.Tests/Tasks/GenerateGitVersionInformationTest.cs
@@ -248,8 +248,7 @@ public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuildA
         fileContent.ShouldMatch(string.Format(regexPattern, nameof(GitVersionVariables.Patch), "4"));
         fileContent.ShouldMatch(string.Format(regexPattern, nameof(GitVersionVariables.MajorMinorPatch), "1.2.4"));
         fileContent.ShouldMatch(string.Format(regexPattern, nameof(GitVersionVariables.FullSemVer), "1.2.4-1"));
-        fileContent.ShouldContain("namespace Test.Root", Case.Insensitive);
-
+        fileContent.ShouldContain("namespace Test.Root");
     }
 
     [TestCaseSource(nameof(Languages))]
@@ -281,7 +280,7 @@ public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuildA
         fileContent.ShouldMatch(string.Format(regexPattern, nameof(GitVersionVariables.Patch), "1"));
         fileContent.ShouldMatch(string.Format(regexPattern, nameof(GitVersionVariables.MajorMinorPatch), "1.0.1"));
         fileContent.ShouldMatch(string.Format(regexPattern, nameof(GitVersionVariables.FullSemVer), "1.0.1-1"));
-        fileContent.ShouldContain("namespace App", Case.Insensitive);
+        fileContent.ShouldContain("namespace App");
     }
 
     [TestCaseSource(nameof(Languages))]
@@ -307,13 +306,12 @@ public void GenerateGitVersionInformationTaskShouldCreateFileWithUseProjectNames
         fileContent.ShouldMatch(string.Format(regexPattern, nameof(GitVersionVariables.Patch), "4"));
         fileContent.ShouldMatch(string.Format(regexPattern, nameof(GitVersionVariables.MajorMinorPatch), "1.2.4"));
         fileContent.ShouldMatch(string.Format(regexPattern, nameof(GitVersionVariables.FullSemVer), "1.2.4-1"));
-        fileContent.ShouldContain("namespace App.Project", Case.Insensitive);
+        fileContent.ShouldContain("namespace App.Project");
     }
 
     [TestCaseSource(nameof(Languages))]
     public void GenerateGitVersionInformationTaskShouldCreateFileWithUseProjectNamespaceSetAndRootNamespaceIsSet(string language)
     {
-
         var extension = FileHelper.GetFileExtension(language);
         var task = new GenerateGitVersionInformation
         {
diff --git a/src/GitVersion.Output/GitVersionInfo/GitVersionInfoGenerator.cs b/src/GitVersion.Output/GitVersionInfo/GitVersionInfoGenerator.cs

Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,10 @@ public override string[] GenerateSetParameterMessage(string name, string? value)`
`28`	`28`	`{`
`29`	`29`	`return Environment.GetEnvironmentVariable("BUILDKITE_BRANCH");`
`30`	`30`	`}`
`31`		`- else`
`32`		`- {`
`33`		`- // For pull requests BUILDKITE_BRANCH refers to the head, so adjust the`
`34`		`- // branch name for pull request versioning to function as expected`
`35`		`- return string.Format("refs/pull/{0}/head", pullRequest);`
`36`		`- }`
	`31`	`+`
	`32`	`+ // For pull requests BUILDKITE_BRANCH refers to the head, so adjust the`
	`33`	`+ // branch name for pull request versioning to function as expected`
	`34`	`+ return string.Format("refs/pull/{0}/head", pullRequest);`
`37`	`35`	`}`
`38`	`36`
`39`	`37`	`public override bool PreventFetch() => true;`
Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ public void ShouldOverrideTagPrefixWithOverrideConfigValue([Values] bool tagPref`
`412`	`412`	`{`
`413`	`413`	`var text = tagPrefixSetAtYmlFile ? "tag-prefix: custom-tag-prefix-from-yml" : "";`
`414`	`414`	`SetupConfigFileContent(text);`
`415`		`- var overrideConfiguration = new Dictionary<object, object?>()`
	`415`	`+ var overrideConfiguration = new Dictionary<object, object?>`
`416`	`416`	`{`
`417`	`417`	`{ "tag-prefix", "tag-prefix-from-override-configuration" }`
`418`	`418`	`};`
`@@ -426,7 +426,7 @@ public void ShouldNotOverrideDefaultTagPrefixWhenNotSetInOverrideConfig()`
`426`	`426`	`{`
`427`	`427`	`const string text = "";`
`428`	`428`	`SetupConfigFileContent(text);`
`429`		`- var overrideConfiguration = new Dictionary<object, object?>()`
	`429`	`+ var overrideConfiguration = new Dictionary<object, object?>`
`430`	`430`	`{`
`431`	`431`	`{ "next-version", "1.0.0" }`
`432`	`432`	`};`
`@@ -441,7 +441,7 @@ public void ShouldNotOverrideTagPrefixFromConfigFileWhenNotSetInOverrideConfig()`
`441`	`441`	`{`
`442`	`442`	`const string text = "tag-prefix: custom-tag-prefix-from-yml";`
`443`	`443`	`SetupConfigFileContent(text);`
`444`		`- var overrideConfiguration = new Dictionary<object, object?>()`
	`444`	`+ var overrideConfiguration = new Dictionary<object, object?>`
`445`	`445`	`{`
`446`	`446`	`{ "next-version", "1.0.0" }`
`447`	`447`	`};`
`@@ -455,7 +455,7 @@ public void ShouldOverrideTagPrefixFromConfigFileWhenSetInOverrideConfig()`
`455`	`455`	`{`
`456`	`456`	`const string text = "tag-prefix: custom-tag-prefix-from-yml";`
`457`	`457`	`SetupConfigFileContent(text);`
`458`		`- var overrideConfiguration = new Dictionary<object, object?>()`
	`458`	`+ var overrideConfiguration = new Dictionary<object, object?>`
`459`	`459`	`{`
`460`	`460`	`{ "tag-prefix", "custom-tag-prefix-from-console" }`
`461`	`461`	`};`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public void ShouldFallbackToBaseVersionWhenAllCommitsAreIgnored(string? nextVers`
`17`	`17`	`fixture.MakeACommit();`
`18`	`18`
`19`	`19`	`var configuration = GitFlowConfigurationBuilder.New.WithNextVersion(nextVersion)`
`20`		`- .WithIgnoreConfiguration(new IgnoreConfiguration() { Before = dateTimeNow.AddDays(1) }).Build();`
	`20`	`+ .WithIgnoreConfiguration(new IgnoreConfiguration { Before = dateTimeNow.AddDays(1) }).Build();`
`21`	`21`
`22`	`22`	`fixture.AssertFullSemver(expectedFullSemVer, configuration);`
`23`	`23`	`}`
`@@ -33,7 +33,7 @@ public void ShouldNotFallbackToBaseVersionWhenAllCommitsAreNotIgnored(string? ne`
`33`	`33`	`fixture.MakeACommit();`
`34`	`34`
`35`	`35`	`var configuration = GitFlowConfigurationBuilder.New.WithNextVersion(nextVersion)`
`36`		`- .WithIgnoreConfiguration(new IgnoreConfiguration() { Before = dateTimeNow.AddDays(-1) }).Build();`
	`36`	`+ .WithIgnoreConfiguration(new IgnoreConfiguration { Before = dateTimeNow.AddDays(-1) }).Build();`
`37`	`37`
`38`	`38`	`fixture.AssertFullSemver(expectedFullSemVer, configuration);`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public void ParsesBitBucketPullMergeMessage_v7(`
`176`	`176`
`177`	`177`	`private static readonly object?[] BitBucketCloudPullMergeMessages =`
`178`	`178`	`{`
`179`		`- new object?[] { $@"Merged in release/2.301.0 (pull request #1789)`
	`179`	`+ new object?[] { @"Merged in release/2.301.0 (pull request #1789)`
`180`	`180`
`181`	`181`	`Release/2.301.0`
`182`	`182`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public void ReturnsNullWhenNoNextVersionIsInConfig()`
`24`	`24`	`[TestCase("0.1", "0.1.0", SemanticVersionFormat.Loose)]`
`25`	`25`	`public void ConfigNextVersionTest(string nextVersion, string expectedVersion, SemanticVersionFormat versionFormat)`
`26`	`26`	`{`
`27`		`- var overrideConfiguration = new Dictionary<object, object?>()`
	`27`	`+ var overrideConfiguration = new Dictionary<object, object?>`
`28`	`28`	`{`
`29`	`29`	`{ "next-version", nextVersion },`
`30`	`30`	`{ "semantic-version-format", versionFormat }`
`@@ -39,7 +39,7 @@ public void ConfigNextVersionTest(string nextVersion, string expectedVersion, Se`
`39`	`39`	`[TestCase("0.1", SemanticVersionFormat.Strict)]`
`40`	`40`	`public void ConfigNextVersionTestShouldFail(string nextVersion, SemanticVersionFormat versionFormat)`
`41`	`41`	`{`
`42`		`- var overrideConfiguration = new Dictionary<object, object?>()`
	`42`	`+ var overrideConfiguration = new Dictionary<object, object?>`
`43`	`43`	`{`
`44`	`44`	`{ "next-version", nextVersion },`
`45`	`45`	`{ "semantic-version-format", versionFormat }`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static IBranchConfiguration GetBranchConfiguration(this IGitVersionConfig`
`20`	`20`	`public static IBranchConfiguration GetBranchConfiguration(this IGitVersionConfiguration configuration, ReferenceName branchName)`
`21`	`21`	`{`
`22`	`22`	`var branchConfiguration = GetBranchConfigurations(configuration, branchName.WithoutOrigin).FirstOrDefault();`
`23`		`- branchConfiguration ??= new BranchConfiguration()`
	`23`	`+ branchConfiguration ??= new BranchConfiguration`
`24`	`24`	`{`
`25`	`25`	`RegularExpression = string.Empty,`
`26`	`26`	`Label = ConfigurationConstants.BranchNamePlaceholder,`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public IgnoreConfigurationBuilder WithShas(HashSet<string> value)`
`32`	`32`	`return this;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public IIgnoreConfiguration Build() => new IgnoreConfiguration()`
	`35`	`+ public IIgnoreConfiguration Build() => new IgnoreConfiguration`
`36`	`36`	`{`
`37`	`37`	`Before = before,`
`38`	`38`	`Shas = shas`