Merge pull request #3975 from arturcic/main

cleanups & refactorings

Author: arturcic

new-cli/GitVersion.Calculation/CalculateCommand.cs

@@ -1,4 +1,5 @@
 using GitVersion.Extensions;
+using GitVersion.Git;
 using GitVersion.Infrastructure;
 
 namespace GitVersion.Commands;

new-cli/GitVersion.Cli/Program.cs

@@ -1,6 +1,7 @@
 using GitVersion;
 using GitVersion.Extensions;
 using GitVersion.Generated;
+using GitVersion.Git;
 using GitVersion.Infrastructure;
 
 var modules = new IGitVersionModule[]

new-cli/GitVersion.Core.Libgit2Sharp/Git/GitRepository.extended.cs

@@ -1,4 +1,4 @@
-namespace GitVersion;
+namespace GitVersion.Git;
 
 internal sealed partial class GitRepository : IGitRepository
 {

new-cli/GitVersion.Core.Libgit2Sharp/LibGit2SharpCoreModule.cs

@@ -1,6 +1,6 @@
 using GitVersion.Infrastructure;
 
-namespace GitVersion;
+namespace GitVersion.Git;
 
 public class LibGit2SharpCoreModule : IGitVersionModule
 {

new-cli/GitVersion.Core.Tester/GitVersionApp.cs

@@ -1,3 +1,4 @@
+using GitVersion.Git;
 using GitVersion.Infrastructure;
 
 namespace GitVersion;

new-cli/GitVersion.Core.Tester/Program.cs

@@ -1,5 +1,6 @@
 using GitVersion;
 using GitVersion.Extensions;
+using GitVersion.Git;
 using GitVersion.Infrastructure;
 
 var assemblies = new IGitVersionModule[]

schemas/6.0/GitVersion.configuration.json

@@ -126,11 +126,8 @@
     "pre-release-weight": {
       "$ref": "#/$defs/nullableOfInt32"
     },
-    "prevent-increment-of-merged-branch-version": {
-      "$ref": "#/$defs/nullableOfBoolean2"
-    },
-    "prevent-increment-when-current-commit-tagged": {
-      "$ref": "#/$defs/nullableOfBoolean3"
+    "prevent-increment": {
+      "$ref": "#/$defs/preventIncrementConfiguration"
     },
     "regex": {
       "$ref": "#/$defs/string2"
@@ -186,6 +183,7 @@
         "description": "Specifies which version strategies (one or more) will be used to determine the next version. Following values are available: 'ConfiguredNextVersion', 'MergeMessage', 'TaggedCommit', 'TrackReleaseBranches', 'VersionInBranchName' and 'TrunkBased'.",
         "enum": [
           "None",
+          "Fallback",
           "ConfiguredNextVersion",
           "MergeMessage",
           "TaggedCommit",
@@ -231,11 +229,8 @@
         "pre-release-weight": {
           "$ref": "#/$defs/nullableOfInt32"
         },
-        "prevent-increment-of-merged-branch-version": {
-          "$ref": "#/$defs/nullableOfBoolean2"
-        },
-        "prevent-increment-when-current-commit-tagged": {
-          "$ref": "#/$defs/nullableOfBoolean3"
+        "prevent-increment": {
+          "$ref": "#/$defs/preventIncrementConfiguration"
         },
         "regex": {
           "$ref": "#/$defs/string2"
@@ -319,8 +314,23 @@
         "null"
       ]
     },
+    "preventIncrementConfiguration": {
+      "description": "The prevent increment configuration section.",
+      "type": "object",
+      "properties": {
+        "of-merged-branch": {
+          "$ref": "#/$defs/nullableOfBoolean2"
+        },
+        "when-branch-merged": {
+          "$ref": "#/$defs/nullableOfBoolean2"
+        },
+        "when-current-commit-tagged": {
+          "$ref": "#/$defs/nullableOfBoolean3"
+        }
+      }
+    },
     "nullableOfBoolean2": {
-      "description": "Prevent increment of merged branch version.",
+      "description": "Prevent increment when branch merged.",
       "type": [
         "boolean",
         "null"

src/Directory.Build.props

@@ -41,7 +41,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="System.Text.Json"/>
         <PackageReference Include="Roslynator.Analyzers">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/GitVersion.App.Tests/ArgumentParserTests.cs

@@ -1,6 +1,5 @@
 using GitVersion.Configuration;
 using GitVersion.Core.Tests.Helpers;
-using GitVersion.Extensions;
 using GitVersion.Helpers;
 using GitVersion.Logging;
 using GitVersion.VersionCalculation;

src/GitVersion.App.Tests/Helpers/ProgramFixture.cs

@@ -8,7 +8,7 @@ namespace GitVersion.App.Tests;
 public sealed class ProgramFixture
 {
     private readonly IEnvironment environment;
-    private List<Action<IServiceCollection>> Overrides { get; } = new();
+    private List<Action<IServiceCollection>> Overrides { get; } = [];
     private readonly Lazy<string> logger;
     private readonly Lazy<string?> output;