From b5342c9e5ce41eca3c45e86a65f24456731179d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Sep 2021 15:07:14 +0000
Subject: [PATCH 01/30] Bump reviewdog/action-remark-lint from 3 to 4

Bumps [reviewdog/action-remark-lint](https://github.com/reviewdog/action-remark-lint) from 3 to 4.
- [Release notes](https://github.com/reviewdog/action-remark-lint/releases)
- [Changelog](https://github.com/reviewdog/action-remark-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reviewdog/action-remark-lint/compare/v3...v4)

---
updated-dependencies:
- dependency-name: reviewdog/action-remark-lint
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 5b9af8dec0..6c94c13e1e 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -79,7 +79,7 @@ jobs:
         arguments: --url-ignore /api/ --allow-hash-href --assume-extension --disable-external
     -
       name: '[Remark Lint]'
-      uses: reviewdog/action-remark-lint@v3
+      uses: reviewdog/action-remark-lint@v4
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         reporter: github-pr-check

From da9b5ec2a2516a621a8e0dfd176ceafb395d2c78 Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Mon, 27 Sep 2021 18:28:14 +0200
Subject: [PATCH 02/30] (build) add docker arm64 support, added docker manifest
 as well

only alpine3.12, alpine3.13, alpine3.14, centos.7 do not have an arm64 image
---
 .github/workflows/ci.yml                      |  42 +++----
 build/.run/Docker Build.run.xml               |   4 +-
 build/.run/Docker Manifest.run.xml            |  20 ++++
 build/.run/Docker Publish.run.xml             |   2 +-
 build/.run/Docker Test.run.xml                |   2 +-
 build/artifacts/BuildLifetime.cs              |   5 +-
 .../Tasks/ArtifactsMsBuildCoreTest.cs         |   2 +-
 build/common/Utilities/Arguments.cs           |   1 +
 build/common/Utilities/Constants.cs           |  33 ++++--
 .../Utilities/DockerContextExtensions.cs      | 105 ++++++++++++++----
 build/common/Utilities/Models.cs              |   2 +-
 build/docker/BuildContext.cs                  |   1 +
 build/docker/BuildLifetime.cs                 |   5 +-
 build/docker/Tasks/DockerBuild.cs             |   7 +-
 build/docker/Tasks/DockerManifest.cs          |  49 ++++++++
 build/docker/Tasks/DockerPublish.cs           |  14 ++-
 build/docker/Tasks/DockerTest.cs              |   2 +
 src/Docker/prerequisites.md                   |   9 ++
 18 files changed, 233 insertions(+), 72 deletions(-)
 create mode 100644 build/.run/Docker Manifest.run.xml
 create mode 100644 build/docker/Tasks/DockerManifest.cs
 create mode 100644 src/Docker/prerequisites.md

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7d3954b775..8a456391fd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -187,7 +187,7 @@ jobs:
     strategy:
       matrix:
         targetFramework: [ '3.1', '5.0' ]
-        distro: [ alpine.3.12-x64, centos.7-x64, centos.8-x64, debian.9-x64, debian.10-x64, fedora.33-x64, ubuntu.16.04-x64, ubuntu.18.04-x64, ubuntu.20.04-x64 ]
+        distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
       fail-fast: false
 
     steps:
@@ -226,7 +226,7 @@ jobs:
     -
       name: '[Test Artifacts]'
       shell: pwsh
-      run: dotnet run/artifacts.dll --target=ArtifactsTest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
+      run: dotnet run/artifacts.dll --target=ArtifactsTest --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
 
   docker_linux_images:
     name: Build, Test and Publish Docker Images
@@ -235,7 +235,7 @@ jobs:
     strategy:
       matrix:
         targetFramework: [ '3.1', '5.0' ]
-        distro: [ alpine.3.12-x64, centos.7-x64, centos.8-x64, debian.9-x64, debian.10-x64, fedora.33-x64, ubuntu.16.04-x64, ubuntu.18.04-x64, ubuntu.20.04-x64 ]
+        distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
       fail-fast: false
 
     steps:
@@ -273,10 +273,6 @@ jobs:
       uses: docker/setup-buildx-action@v1
       with:
         install: true
-    -
-      name: '[Docker Build/Test] DockerHub'
-      shell: pwsh
-      run: dotnet run/docker.dll --target=DockerTest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
     -
       name: Login to DockerHub
       if: success() && github.event_name != 'pull_request'
@@ -285,28 +281,20 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
     -
-      name: '[Docker Publish] DockerHub'
+      name: '[Docker Build/Test/Publish (amd64)] DockerHub'
       if: success() && github.event_name != 'pull_request'
       shell: pwsh
-      run: dotnet run/docker.dll --target=DockerPublish --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
-
-    # -
-    #   name: '[Docker Build/Test] GitHub Container Registry'
-    #   shell: pwsh
-    #   run: dotnet run/docker.dll --target=DockerTest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
-    # -
-    #   name: Login to GitHub Container Registry
-    #   if: success() && github.event_name != 'pull_request'
-    #   uses: docker/login-action@v1
-    #   with:
-    #       registry: ghcr.io
-    #       username: ${{ github.repository_owner }}
-    #       password: ${{ secrets.GITHUB_TOKEN }}
-    # -
-    #   name: '[Docker Publish] GitHub Container Registry'
-    #   if: success() && github.event_name != 'pull_request'
-    #   shell: pwsh
-    #   run: dotnet run/docker.dll --target=DockerPublish --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
+      run: dotnet run/docker.dll --target=DockerPublish --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
+    -
+      name: '[Docker Build/Test/Publish (arm64)] DockerHub'
+      if: success() && github.event_name != 'pull_request'
+      shell: pwsh
+      run: dotnet run/docker.dll --target=DockerPublish --arch arm64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
+    -
+      name: '[Docker Publish Manifest] DockerHub'
+      if: success() && github.event_name != 'pull_request'
+      shell: pwsh
+      run: dotnet run/docker.dll --target=DockerManifest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
 
   publish:
     name: Publish
diff --git a/build/.run/Docker Build.run.xml b/build/.run/Docker Build.run.xml
index 4ed920934a..cebab346bf 100644
--- a/build/.run/Docker Build.run.xml	
+++ b/build/.run/Docker Build.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker Build" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --arch amd64 --docker_dotnetversion=5.0 --docker_distro=debian.11" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -17,4 +17,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/build/.run/Docker Manifest.run.xml b/build/.run/Docker Manifest.run.xml
new file mode 100644
index 0000000000..ca0ecd1a0f
--- /dev/null
+++ b/build/.run/Docker Manifest.run.xml	
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Docker Manifest" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerManifest --docker_dotnetversion=5.0 --docker_distro=debian.11" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/docker/docker.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value="net5.0" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/build/.run/Docker Publish.run.xml b/build/.run/Docker Publish.run.xml
index 7bd47ac3c1..6d43f506cf 100644
--- a/build/.run/Docker Publish.run.xml	
+++ b/build/.run/Docker Publish.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker Publish" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerPublish --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerPublish --arch amd64 --docker_dotnetversion=5.0 --docker_distro=debian.11" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
diff --git a/build/.run/Docker Test.run.xml b/build/.run/Docker Test.run.xml
index 61fdbba88c..1c2d5bb7d2 100644
--- a/build/.run/Docker Test.run.xml	
+++ b/build/.run/Docker Test.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker Test" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerTest --docker_registry github --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerTest --arch amd64 --docker_dotnetversion=5.0 --docker_distro=debian.11" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
diff --git a/build/artifacts/BuildLifetime.cs b/build/artifacts/BuildLifetime.cs
index 4ed3c02a94..e2ee89c6b1 100644
--- a/build/artifacts/BuildLifetime.cs
+++ b/build/artifacts/BuildLifetime.cs
@@ -15,17 +15,20 @@ public override void Setup(BuildContext context)
 
             context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", string.Empty) == "linux";
 
+            var architecture = context.Argument(Arguments.Architecture, Architecture.Amd64);
             var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.DockerHub);
             var dotnetVersion = context.Argument(Arguments.DockerDotnetVersion, string.Empty).ToLower();
             var dockerDistro = context.Argument(Arguments.DockerDistro, string.Empty).ToLower();
 
             var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.VersionsToBuild : new[] { dotnetVersion };
             var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistrosToBuild : new[] { dockerDistro };
+            var archs = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.ArchToBuild : new[] { architecture };
 
             var registry = dockerRegistry == DockerRegistry.DockerHub ? Constants.DockerHubRegistry : Constants.GitHubContainerRegistry;
             context.Images = from version in versions
                              from distro in distros
-                             select new DockerImage(distro, version, registry, true);
+                             from arch in archs
+                             select new DockerImage(distro, version, arch, registry, true);
 
             context.StartGroup("Build Setup");
 
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
index 61aa2953ab..4bfc984c5f 100644
--- a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
+++ b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
@@ -31,7 +31,7 @@ public override void Run(BuildContext context)
                 string distro = dockerImage.Distro;
                 string targetFramework = dockerImage.TargetFramework;
 
-                if (targetFramework == Constants.Version31 && distro == "centos.8-x64") continue; // TODO check why this one fails
+                if (targetFramework == Constants.Version31 && distro == Constants.Centos8) continue; // TODO check why this one fails
                 targetFramework = targetFramework switch
                 {
                     Constants.Version31 => $"netcoreapp{targetFramework}",
diff --git a/build/common/Utilities/Arguments.cs b/build/common/Utilities/Arguments.cs
index 88396982a8..5413abb2a6 100644
--- a/build/common/Utilities/Arguments.cs
+++ b/build/common/Utilities/Arguments.cs
@@ -3,6 +3,7 @@ namespace Common.Utilities
     public class Arguments
     {
         public const string Configuration = "configuration";
+        public const string Architecture = "arch";
         public const string DotnetTarget = "dotnet_target";
         public const string DockerRegistry = "docker_registry";
         public const string DockerDotnetVersion = "docker_dotnetversion";
diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs
index b8de491c70..330c707848 100644
--- a/build/common/Utilities/Constants.cs
+++ b/build/common/Utilities/Constants.cs
@@ -12,6 +12,8 @@ public class Constants
         public const string CoreFxVersion31 = "netcoreapp3.1";
         public const string FullFxVersion48 = "net48";
         public static readonly string[] VersionsToBuild = { Version50, Version31 };
+        public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };
+        public static readonly string[] DistrosToSkip = { Alpine312, Alpine313, Alpine314, Centos7 };
 
         public const string DockerBaseImageName = "gittools/build-images";
         public const string DockerImageName = "gittools/gitversion";
@@ -21,20 +23,33 @@ public class Constants
         public const string DockerHubRegistry = "docker.io";
         public const string GitHubContainerRegistry = "ghcr.io";
 
-        public const string Alpine312 = "alpine.3.12-x64";
-        public const string Debian10 = "debian.10-x64";
-        public const string Ubuntu2004 = "ubuntu.20.04-x64";
+        public const string Arm64 = "arm64";
+        public const string Amd64 = "amd64";
+
+        public const string Alpine312 = "alpine.3.12";
+        public const string Alpine313 = "alpine.3.13";
+        public const string Alpine314 = "alpine.3.14";
+        public const string Centos7 = "centos.7";
+        public const string Centos8 = "centos.8";
+        public const string Debian9 = "debian.9";
+        public const string Debian10 = "debian.10";
+        public const string Debian11 = "debian.11";
+        public const string Fedora33 = "fedora.33";
+        public const string Ubuntu1804 = "ubuntu.18.04";
+        public const string Ubuntu2004 = "ubuntu.20.04";
         public const string DockerDistroLatest = Debian10;
         public static readonly string[] DockerDistrosToBuild =
         {
             Alpine312,
-            "centos.7-x64",
-            "centos.8-x64",
-            "debian.9-x64",
+            Alpine313,
+            Alpine314,
+            Centos7,
+            Centos8,
+            Debian9,
             Debian10,
-            "fedora.33-x64",
-            "ubuntu.16.04-x64",
-            "ubuntu.18.04-x64",
+            Debian11,
+            Fedora33,
+            Ubuntu1804,
             Ubuntu2004
         };
         public const string NugetOrgUrl = "https://api.nuget.org/v3/index.json";
diff --git a/build/common/Utilities/DockerContextExtensions.cs b/build/common/Utilities/DockerContextExtensions.cs
index 87e5947fb1..f060a32c13 100644
--- a/build/common/Utilities/DockerContextExtensions.cs
+++ b/build/common/Utilities/DockerContextExtensions.cs
@@ -10,21 +10,35 @@
 
 namespace Common.Utilities
 {
+    public enum Architecture
+    {
+        Arm64,
+        Amd64
+    }
     public static class DockerContextExtensions
     {
-        public static void DockerBuild(this BuildContextBase context, DockerImage dockerImage, bool pushImages)
+        public static bool SkipArm64Image(this ICakeContext context, DockerImage dockerImage)
+        {
+            if (dockerImage.Architecture != Architecture.Arm64) return false;
+            if (!Constants.DistrosToSkip.Contains(dockerImage.Distro)) return false;
+
+            context.Information($"Skipping Target: {dockerImage.TargetFramework}, Distro: {dockerImage.Distro}, Arch: {dockerImage.Architecture}");
+            return true;
+        }
+
+        public static void DockerBuildImage(this BuildContextBase context, DockerImage dockerImage)
         {
             if (context.Version == null) return;
 
-            var (distro, targetFramework, registry, _) = dockerImage;
+            var (distro, targetFramework, arch, registry, _) = dockerImage;
+
+            context.Information($"Building image: {dockerImage}");
+
             var workDir = Paths.Src.Combine("Docker");
-            var tags = context.GetDockerTags(dockerImage);
+            var tags = context.GetDockerTags(dockerImage, arch);
 
-            var platforms = new List<string> { "linux/amd64" };
-            // if (targetFramework != "3.1" || !distro.StartsWith("alpine"))
-            // {
-            //     platforms.Add("linux/arm64");
-            // }
+            var suffix = GetArchitectureSuffix(arch);
+            var platforms = new List<string> { $"linux/{suffix}" };
 
             var buildSettings = new DockerImageBuildSettings
             {
@@ -43,20 +57,55 @@ public static void DockerBuild(this BuildContextBase context, DockerImage docker
                 Platform = string.Join(",", platforms),
             };
 
-            var pushArg = pushImages ? "--push" : string.Empty;
-
-            context.DockerBuild(buildSettings, workDir.ToString(), pushArg);
+            context.DockerBuild(buildSettings, workDir.ToString(), "--output type=docker");
         }
 
-        public static void DockerPush(this BuildContextBase context, DockerImage dockerImage)
+        public static void DockerPushImage(this BuildContextBase context, DockerImage dockerImage)
         {
-            var tags = context.GetDockerTags(dockerImage);
+            var tags = context.GetDockerTags(dockerImage, dockerImage.Architecture);
             foreach (var tag in tags)
             {
                 context.DockerPush(tag);
             }
         }
 
+        public static void DockerCreateManifest(this BuildContextBase context, DockerImage dockerImage, bool skipArm64Image)
+        {
+            var manifestTags = context.GetDockerTags(dockerImage);
+            foreach (var tag in manifestTags)
+            {
+                var amd64Tag = $"{tag}-{GetArchitectureSuffix(Architecture.Amd64)}";
+                if (skipArm64Image)
+                {
+                    context.DockerManifestCreate(tag, amd64Tag);
+                }
+                else
+                {
+                    var arm64Tag = $"{tag}-{GetArchitectureSuffix(Architecture.Arm64)}";
+                    context.DockerManifestCreate(tag, amd64Tag, arm64Tag);
+                }
+            }
+        }
+
+        public static void DockerPushManifest(this BuildContextBase context, DockerImage dockerImage)
+        {
+            var manifestTags = context.GetDockerTags(dockerImage);
+            foreach (var tag in manifestTags)
+            {
+                context.DockerManifestPush(tag);
+            }
+        }
+        public static void DockerRemoveManifest(this BuildContextBase context, DockerImage dockerImage)
+        {
+            var manifestTags = context.GetDockerTags(dockerImage);
+            foreach (var tag in manifestTags)
+            {
+                context.DockerManifestRemove(tag);
+            }
+        }
+
+        private static void DockerManifestRemove(this ICakeContext context, string tag) => context.DockerCustomCommand($"manifest rm {tag}");
+
         public static void DockerPullImage(this ICakeContext context, DockerImage dockerImage)
         {
             var tag = $"{dockerImage.DockerImageName()}:{dockerImage.Distro}-sdk-{dockerImage.TargetFramework}";
@@ -65,19 +114,26 @@ public static void DockerPullImage(this ICakeContext context, DockerImage docker
 
         public static void DockerTestImage(this BuildContextBase context, DockerImage dockerImage)
         {
-            var tags = context.GetDockerTags(dockerImage);
+            var tags = context.GetDockerTags(dockerImage, dockerImage.Architecture);
             foreach (var tag in tags)
             {
-                context.DockerTestRun(tag, "/repo", "/showvariable", "FullSemver");
+                context.DockerTestRun(tag, dockerImage.Architecture, "/repo", "/showvariable", "FullSemver");
             }
         }
 
         public static void DockerTestArtifact(this BuildContextBase context, DockerImage dockerImage, string cmd)
         {
             var tag = $"{dockerImage.DockerImageName()}:{dockerImage.Distro}-sdk-{dockerImage.TargetFramework}";
-            context.DockerTestRun(tag, "sh", cmd);
+            context.DockerTestRun(tag, dockerImage.Architecture, "sh", cmd);
         }
 
+        private static string GetArchitectureSuffix(Architecture arch) => arch switch
+        {
+            Architecture.Arm64 => "arm64",
+            Architecture.Amd64 => "amd64",
+            _ => "amd64"
+        };
+
         private static void DockerBuild(
             this ICakeContext context,
             DockerImageBuildSettings settings,
@@ -103,16 +159,16 @@ private static void DockerBuild(
             genericDockerRunner.Run("buildx build", settings, additional);
         }
 
-        private static void DockerTestRun(this BuildContextBase context, string image, string command, params string[] args)
+        private static void DockerTestRun(this BuildContextBase context, string image, Architecture arch, string command, params string[] args)
         {
-            var settings = GetDockerRunSettings(context);
+            var settings = GetDockerRunSettings(context, arch);
             context.Information($"Testing image: {image}");
             var output = context.DockerRunImage(settings, image, command, args);
             context.Information("Output : " + output);
 
             Assert.Contains(context.Version?.GitVersion.FullSemVer, output);
         }
-        private static IEnumerable<string> GetDockerTags(this BuildContextBase context, DockerImage dockerImage)
+        private static IEnumerable<string> GetDockerTags(this BuildContextBase context, DockerImage dockerImage, Architecture? arch = null)
         {
             var name = dockerImage.DockerImageName();
             var distro = dockerImage.Distro;
@@ -148,10 +204,14 @@ private static IEnumerable<string> GetDockerTags(this BuildContextBase context,
                 }
             }
 
-            return tags;
+            if (!arch.HasValue) return tags;
+
+            var suffix = GetArchitectureSuffix(arch.Value);
+            return tags.Select(x => $"{x}-{suffix}");
+
         }
         private static string DockerImageName(this DockerImage image) => $"{image.Registry}/{(image.UseBaseImage ? Constants.DockerBaseImageName : Constants.DockerImageName)}";
-        private static DockerContainerRunSettings GetDockerRunSettings(this BuildContextBase context)
+        private static DockerContainerRunSettings GetDockerRunSettings(this BuildContextBase context, Architecture arch)
         {
             var currentDir = context.MakeAbsolute(context.Directory("."));
             var root = string.Empty;
@@ -164,7 +224,8 @@ private static DockerContainerRunSettings GetDockerRunSettings(this BuildContext
                     $"{currentDir}/tests/scripts:{root}/scripts",
                     $"{currentDir}/artifacts/packages/nuget:{root}/nuget",
                     $"{currentDir}/artifacts/packages/native:{root}/native",
-                }
+                },
+                Platform = $"linux/{arch.ToString().ToLower()}"
             };
 
             if (context.IsAzurePipelineBuild)
diff --git a/build/common/Utilities/Models.cs b/build/common/Utilities/Models.cs
index 0a962678d5..0c35270547 100644
--- a/build/common/Utilities/Models.cs
+++ b/build/common/Utilities/Models.cs
@@ -37,7 +37,7 @@ public static BuildVersion Calculate(GitVersion gitVersion)
         }
     }
 
-    public record DockerImage(string Distro, string TargetFramework, string Registry, bool UseBaseImage);
+    public record DockerImage(string Distro, string TargetFramework, Architecture Architecture, string Registry, bool UseBaseImage);
 
     public enum DockerRegistry
     {
diff --git a/build/docker/BuildContext.cs b/build/docker/BuildContext.cs
index b410a5b0fb..4389de39e2 100644
--- a/build/docker/BuildContext.cs
+++ b/build/docker/BuildContext.cs
@@ -7,6 +7,7 @@ namespace Docker
     public class BuildContext : BuildContextBase
     {
         public bool IsDockerOnLinux { get; set; }
+        public Architecture Arch { get; set; }
 
         public IEnumerable<DockerImage> Images { get; set; } = new List<DockerImage>();
 
diff --git a/build/docker/BuildLifetime.cs b/build/docker/BuildLifetime.cs
index 8b6e5c00f6..3b77e2dc0b 100644
--- a/build/docker/BuildLifetime.cs
+++ b/build/docker/BuildLifetime.cs
@@ -15,17 +15,20 @@ public override void Setup(BuildContext context)
 
             context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", "") == "linux";
 
+            var architecture = context.HasArgument(Arguments.Architecture) ? context.Argument<Architecture>(Arguments.Architecture) : (Architecture?)null;
             var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.DockerHub);
             var dotnetVersion = context.Argument(Arguments.DockerDotnetVersion, string.Empty).ToLower();
             var dockerDistro = context.Argument(Arguments.DockerDistro, string.Empty).ToLower();
 
             var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.VersionsToBuild : new[] { dotnetVersion };
             var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistrosToBuild : new[] { dockerDistro };
+            var archs = architecture.HasValue ? new[] { architecture.Value } : Constants.ArchToBuild;
 
             var registry = dockerRegistry == DockerRegistry.DockerHub ? Constants.DockerHubRegistry : Constants.GitHubContainerRegistry;
             context.Images = from version in versions
                              from distro in distros
-                             select new DockerImage(distro, version, registry, false);
+                             from arch in archs
+                             select new DockerImage(distro, version, arch, registry, false);
 
             context.StartGroup("Build Setup");
 
diff --git a/build/docker/Tasks/DockerBuild.cs b/build/docker/Tasks/DockerBuild.cs
index c660ad8f30..1c6429984a 100644
--- a/build/docker/Tasks/DockerBuild.cs
+++ b/build/docker/Tasks/DockerBuild.cs
@@ -9,11 +9,9 @@ namespace Docker.Tasks
     [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
     [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
     [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
+    [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
     public class DockerBuild : FrostingTask<BuildContext>
     {
-        protected bool PushImages { get; init; }
-        public DockerBuild() => this.PushImages = false;
-
         public override bool ShouldRun(BuildContext context)
         {
             var shouldRun = true;
@@ -31,7 +29,8 @@ public override void Run(BuildContext context)
 
             foreach (var dockerImage in context.Images)
             {
-                context.DockerBuild(dockerImage, PushImages);
+                if (context.SkipArm64Image(dockerImage)) continue;
+                context.DockerBuildImage(dockerImage);
             }
         }
     }
diff --git a/build/docker/Tasks/DockerManifest.cs b/build/docker/Tasks/DockerManifest.cs
new file mode 100644
index 0000000000..c52dde6cc8
--- /dev/null
+++ b/build/docker/Tasks/DockerManifest.cs
@@ -0,0 +1,49 @@
+using System.Linq;
+using Cake.Frosting;
+using Common.Utilities;
+using Constants = Common.Utilities.Constants;
+
+namespace Docker.Tasks
+{
+    [TaskName(nameof(DockerManifest))]
+    [TaskDescription("Publish the docker manifest containing the images for amd64 and arm64")]
+    [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
+    [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+    [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
+    [IsDependentOn(typeof(DockerManifestInternal))]
+    public class DockerManifest : FrostingTask<BuildContext>
+    {
+        public override bool ShouldRun(BuildContext context)
+        {
+            var shouldRun = true;
+            shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(DockerPublish)} works only on GitHub Actions.");
+            return shouldRun;
+        }
+    }
+
+    [TaskName(nameof(DockerManifestInternal))]
+    [TaskDescription("Publish the docker manifest containing the images for amd64 and arm64")]
+    public class DockerManifestInternal : FrostingTask<BuildContext>
+    {
+        public override bool ShouldRun(BuildContext context)
+        {
+            var shouldRun = true;
+            shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(DockerPublish)} works only on GitHub Actions.");
+            shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(DockerPublish)} works only on Docker on Linux agents.");
+            shouldRun &= context.ShouldRun(context.IsStableRelease || context.IsPreRelease, $"{nameof(DockerPublish)} works only for releases.");
+
+            return shouldRun;
+        }
+
+        public override void Run(BuildContext context)
+        {
+            foreach (var group in context.Images.GroupBy(x => new { x.Distro, x.TargetFramework }))
+            {
+                var dockerImage = group.First();
+                context.DockerCreateManifest(dockerImage, Constants.DistrosToSkip.Contains(dockerImage.Distro));
+                context.DockerPushManifest(dockerImage);
+                context.DockerRemoveManifest(dockerImage);
+            }
+        }
+    }
+}
diff --git a/build/docker/Tasks/DockerPublish.cs b/build/docker/Tasks/DockerPublish.cs
index 096868974f..f36f1c30ae 100644
--- a/build/docker/Tasks/DockerPublish.cs
+++ b/build/docker/Tasks/DockerPublish.cs
@@ -8,6 +8,7 @@ namespace Docker.Tasks
     [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
     [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
     [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
+    [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
     [IsDependentOn(typeof(DockerPublishInternal))]
     public class DockerPublish : FrostingTask<BuildContext>
     {
@@ -21,9 +22,9 @@ public override bool ShouldRun(BuildContext context)
 
     [TaskName(nameof(DockerPublishInternal))]
     [TaskDescription("Publish the docker images containing the GitVersion Tool")]
-    public class DockerPublishInternal : DockerBuild
+    [IsDependentOn(typeof(DockerTest))]
+    public class DockerPublishInternal : FrostingTask<BuildContext>
     {
-        public DockerPublishInternal() => this.PushImages = true;
         public override bool ShouldRun(BuildContext context)
         {
             var shouldRun = true;
@@ -33,5 +34,14 @@ public override bool ShouldRun(BuildContext context)
 
             return shouldRun;
         }
+
+        public override void Run(BuildContext context)
+        {
+            foreach (var dockerImage in context.Images)
+            {
+                if (context.SkipArm64Image(dockerImage)) continue;
+                context.DockerPushImage(dockerImage);
+            }
+        }
     }
 }
diff --git a/build/docker/Tasks/DockerTest.cs b/build/docker/Tasks/DockerTest.cs
index 6a0481d5c0..0330efd960 100644
--- a/build/docker/Tasks/DockerTest.cs
+++ b/build/docker/Tasks/DockerTest.cs
@@ -8,6 +8,7 @@ namespace Docker.Tasks
     [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
     [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
     [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
+    [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
     [IsDependentOn(typeof(DockerBuild))]
     public class DockerTest : FrostingTask<BuildContext>
     {
@@ -23,6 +24,7 @@ public override void Run(BuildContext context)
         {
             foreach (var dockerImage in context.Images)
             {
+                if (context.SkipArm64Image(dockerImage)) continue;
                 context.DockerTestImage(dockerImage);
             }
         }
diff --git a/src/Docker/prerequisites.md b/src/Docker/prerequisites.md
new file mode 100644
index 0000000000..f671ec6e65
--- /dev/null
+++ b/src/Docker/prerequisites.md
@@ -0,0 +1,9 @@
+# set buildx as the default docker builder
+docker buildx install
+
+# create and use a docker buildx context
+docker buildx create --name gitversion --use
+docker context use gitversion
+
+# install qemu static
+docker run --rm --privileged multiarch/qemu-user-static --reset -p yes

From 505e132c53a7e42f354f07b623396cea167af21e Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Wed, 29 Sep 2021 15:10:27 +0200
Subject: [PATCH 03/30] (build) added arm64 testing of artifacts

---
 .github/workflows/ci.yml                      | 38 ++++++++++++++++++-
 ....xml => Artifacts DotnetTool Test.run.xml} |  8 ++--
 build/.run/Artifacts Executable Test.run.xml  |  4 +-
 ...xml => Artifacts MsBuildCore Test.run.xml} |  8 ++--
 build/.run/Artifacts MsBuildFull Test.run.xml |  4 +-
 build/.run/Artifacts Native Test.run.xml      |  8 ++--
 ...pare.run.xml => Artifacts Prepare.run.xml} |  6 +--
 build/.run/Artifacts Test.run.xml             |  6 +--
 build/artifacts/BuildLifetime.cs              |  4 +-
 .../Tasks/ArtifactsDotnetToolTest.cs          |  2 +
 .../Tasks/ArtifactsMsBuildCoreTest.cs         |  2 +
 build/artifacts/Tasks/ArtifactsNativeTest.cs  |  4 +-
 build/artifacts/Tasks/ArtifactsPrepare.cs     |  1 +
 build/build/BuildContext.cs                   |  2 +-
 .../Utilities/DockerContextExtensions.cs      | 26 +++++--------
 build/common/Utilities/Extensions.cs          |  2 +
 build/docker/Tasks/DockerManifest.cs          |  9 +++--
 src/Docker/linux deps.md                      | 19 ----------
 18 files changed, 87 insertions(+), 66 deletions(-)
 rename build/.run/{ArtifactsDotnetToolTest.run.xml => Artifacts DotnetTool Test.run.xml} (86%)
 rename build/.run/{ArtifactsMsBuildCoreTest.run.xml => Artifacts MsBuildCore Test.run.xml} (85%)
 rename build/.run/{ArtifactsPrepare.run.xml => Artifacts Prepare.run.xml} (92%)
 delete mode 100644 src/Docker/linux deps.md

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8a456391fd..76e0bd3667 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -224,9 +224,21 @@ jobs:
         name: native-${{ runner.os }}
         path: ${{ github.workspace }}/artifacts/packages/native
     -
-      name: '[Test Artifacts]'
+      name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+    -
+      name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+      with:
+        install: true
+    -
+      name: '[Test Artifacts (amd64)]'
       shell: pwsh
       run: dotnet run/artifacts.dll --target=ArtifactsTest --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
+    -
+      name: '[Test Artifacts (arm64)]'
+      shell: pwsh
+      run: dotnet run/artifacts.dll --target=ArtifactsTest --arch arm64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
 
   docker_linux_images:
     name: Build, Test and Publish Docker Images
@@ -296,6 +308,30 @@ jobs:
       shell: pwsh
       run: dotnet run/docker.dll --target=DockerManifest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
 
+    -
+      name: Login to GitHub Container Registry
+      if: success() && github.event_name != 'pull_request'
+      uses: docker/login-action@v1
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.DOCKER_GITHUB_TOKEN }}
+    -
+      name: '[Docker Build/Test/Publish (amd64)] GitHub Container Registry'
+      if: success() && github.event_name != 'pull_request'
+      shell: pwsh
+      run: dotnet run/docker.dll --target=DockerPublish --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
+    -
+      name: '[Docker Build/Test/Publish (arm64)] GitHub Container Registry'
+      if: success() && github.event_name != 'pull_request'
+      shell: pwsh
+      run: dotnet run/docker.dll --target=DockerPublish --arch arm64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
+    -
+      name: '[Docker Publish Manifest] GitHub Container Registry'
+      if: success() && github.event_name != 'pull_request'
+      shell: pwsh
+      run: dotnet run/docker.dll --target=DockerManifest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
+
   publish:
     name: Publish
     needs: [artifacts_windows_test, artifacts_linux_test, docker_linux_images]
diff --git a/build/.run/ArtifactsDotnetToolTest.run.xml b/build/.run/Artifacts DotnetTool Test.run.xml
similarity index 86%
rename from build/.run/ArtifactsDotnetToolTest.run.xml
rename to build/.run/Artifacts DotnetTool Test.run.xml
index 768bab36a5..6fe96fbd30 100644
--- a/build/.run/ArtifactsDotnetToolTest.run.xml
+++ b/build/.run/Artifacts DotnetTool Test.run.xml	
@@ -1,7 +1,7 @@
-<component name="ProjectRunConfigurationManager">
+<component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts DotnetTool Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts-test.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --docker_dotnetversion=5.0 --docker_distro=debian.11" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -17,4 +17,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/build/.run/Artifacts Executable Test.run.xml b/build/.run/Artifacts Executable Test.run.xml
index e783aeaaa1..d7a2206f2c 100644
--- a/build/.run/Artifacts Executable Test.run.xml	
+++ b/build/.run/Artifacts Executable Test.run.xml	
@@ -1,6 +1,6 @@
-<component name="ProjectRunConfigurationManager">
+<component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Executable Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts-test.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
     <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsExecutableTest" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
diff --git a/build/.run/ArtifactsMsBuildCoreTest.run.xml b/build/.run/Artifacts MsBuildCore Test.run.xml
similarity index 85%
rename from build/.run/ArtifactsMsBuildCoreTest.run.xml
rename to build/.run/Artifacts MsBuildCore Test.run.xml
index e5c310574d..bef168922a 100644
--- a/build/.run/ArtifactsMsBuildCoreTest.run.xml
+++ b/build/.run/Artifacts MsBuildCore Test.run.xml	
@@ -1,7 +1,7 @@
-<component name="ProjectRunConfigurationManager">
+<component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts MsBuildCore Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts-test.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -17,4 +17,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/build/.run/Artifacts MsBuildFull Test.run.xml b/build/.run/Artifacts MsBuildFull Test.run.xml
index 49403ca754..d960af10a9 100644
--- a/build/.run/Artifacts MsBuildFull Test.run.xml	
+++ b/build/.run/Artifacts MsBuildFull Test.run.xml	
@@ -1,6 +1,6 @@
-<component name="ProjectRunConfigurationManager">
+<component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts MsBuildFull Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts-test.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
     <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildFullTest" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
diff --git a/build/.run/Artifacts Native Test.run.xml b/build/.run/Artifacts Native Test.run.xml
index 908aa9c193..3f9cc090c4 100644
--- a/build/.run/Artifacts Native Test.run.xml	
+++ b/build/.run/Artifacts Native Test.run.xml	
@@ -1,7 +1,7 @@
-<component name="ProjectRunConfigurationManager">
+<component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Native Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts-test.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsNativeTest --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsNativeTest --arch=amd64 --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -17,4 +17,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/build/.run/ArtifactsPrepare.run.xml b/build/.run/Artifacts Prepare.run.xml
similarity index 92%
rename from build/.run/ArtifactsPrepare.run.xml
rename to build/.run/Artifacts Prepare.run.xml
index dae8852b82..da6c3f188a 100644
--- a/build/.run/ArtifactsPrepare.run.xml
+++ b/build/.run/Artifacts Prepare.run.xml	
@@ -1,6 +1,6 @@
-<component name="ProjectRunConfigurationManager">
+<component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Prepare" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts-test.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
     <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsPrepare --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -17,4 +17,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/build/.run/Artifacts Test.run.xml b/build/.run/Artifacts Test.run.xml
index dc849df428..c0d9ec7de0 100644
--- a/build/.run/Artifacts Test.run.xml	
+++ b/build/.run/Artifacts Test.run.xml	
@@ -1,6 +1,6 @@
-<component name="ProjectRunConfigurationManager">
+<component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts-test.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
     <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsTest --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -17,4 +17,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/build/artifacts/BuildLifetime.cs b/build/artifacts/BuildLifetime.cs
index e2ee89c6b1..7663429c07 100644
--- a/build/artifacts/BuildLifetime.cs
+++ b/build/artifacts/BuildLifetime.cs
@@ -15,14 +15,14 @@ public override void Setup(BuildContext context)
 
             context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", string.Empty) == "linux";
 
-            var architecture = context.Argument(Arguments.Architecture, Architecture.Amd64);
+            var architecture = context.HasArgument(Arguments.Architecture) ? context.Argument<Architecture>(Arguments.Architecture) : (Architecture?)null;
             var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.DockerHub);
             var dotnetVersion = context.Argument(Arguments.DockerDotnetVersion, string.Empty).ToLower();
             var dockerDistro = context.Argument(Arguments.DockerDistro, string.Empty).ToLower();
 
             var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.VersionsToBuild : new[] { dotnetVersion };
             var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistrosToBuild : new[] { dockerDistro };
-            var archs = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.ArchToBuild : new[] { architecture };
+            var archs = architecture.HasValue ? new[] { architecture.Value } : Constants.ArchToBuild;
 
             var registry = dockerRegistry == DockerRegistry.DockerHub ? Constants.DockerHubRegistry : Constants.GitHubContainerRegistry;
             context.Images = from version in versions
diff --git a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs
index 6e45678c18..11392ff050 100644
--- a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs
+++ b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs
@@ -28,6 +28,8 @@ public override void Run(BuildContext context)
 
             foreach (var dockerImage in context.Images)
             {
+                if (context.SkipArm64Image(dockerImage)) continue;
+
                 var cmd = $"{rootPrefix}/scripts/test-global-tool.sh --version {version} --nugetPath {rootPrefix}/nuget --repoPath {rootPrefix}/repo";
 
                 context.DockerTestArtifact(dockerImage, cmd);
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
index 4bfc984c5f..f31636c44a 100644
--- a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
+++ b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
@@ -28,6 +28,8 @@ public override void Run(BuildContext context)
 
             foreach (var dockerImage in context.Images)
             {
+                if (context.SkipArm64Image(dockerImage)) continue;
+
                 string distro = dockerImage.Distro;
                 string targetFramework = dockerImage.TargetFramework;
 
diff --git a/build/artifacts/Tasks/ArtifactsNativeTest.cs b/build/artifacts/Tasks/ArtifactsNativeTest.cs
index c984e2f7d8..eecd254e44 100644
--- a/build/artifacts/Tasks/ArtifactsNativeTest.cs
+++ b/build/artifacts/Tasks/ArtifactsNativeTest.cs
@@ -28,7 +28,9 @@ public override void Run(BuildContext context)
 
             foreach (var dockerImage in context.Images)
             {
-                var runtime = "linux-x64";
+                if (context.SkipArm64Image(dockerImage)) continue;
+
+                var runtime = dockerImage.Architecture == Architecture.Amd64 ? "linux-x64" : "linux-arm64";
                 if (dockerImage.Distro.StartsWith("alpine"))
                 {
                     runtime = "linux-musl-x64";
diff --git a/build/artifacts/Tasks/ArtifactsPrepare.cs b/build/artifacts/Tasks/ArtifactsPrepare.cs
index 14c6cb087f..b96ac4ab8a 100644
--- a/build/artifacts/Tasks/ArtifactsPrepare.cs
+++ b/build/artifacts/Tasks/ArtifactsPrepare.cs
@@ -22,6 +22,7 @@ public override void Run(BuildContext context)
         {
             foreach (var dockerImage in context.Images)
             {
+                if (context.SkipArm64Image(dockerImage)) continue;
                 context.DockerPullImage(dockerImage);
             }
         }
diff --git a/build/build/BuildContext.cs b/build/build/BuildContext.cs
index 7a13e15734..562cc804f9 100644
--- a/build/build/BuildContext.cs
+++ b/build/build/BuildContext.cs
@@ -13,7 +13,7 @@ public class BuildContext : BuildContextBase
         public readonly Dictionary<PlatformFamily, string[]> NativeRuntimes = new()
         {
             [PlatformFamily.Windows] = new[] { "win-x64", "win-x86" },
-            [PlatformFamily.Linux] = new[] { "linux-x64", "linux-musl-x64" },
+            [PlatformFamily.Linux] = new[] { "linux-x64", "linux-musl-x64", "linux-arm64" },
             [PlatformFamily.OSX] = new[] { "osx-x64" },
         };
 
diff --git a/build/common/Utilities/DockerContextExtensions.cs b/build/common/Utilities/DockerContextExtensions.cs
index f060a32c13..5b898641cc 100644
--- a/build/common/Utilities/DockerContextExtensions.cs
+++ b/build/common/Utilities/DockerContextExtensions.cs
@@ -37,7 +37,7 @@ public static void DockerBuildImage(this BuildContextBase context, DockerImage d
             var workDir = Paths.Src.Combine("Docker");
             var tags = context.GetDockerTags(dockerImage, arch);
 
-            var suffix = GetArchitectureSuffix(arch);
+            var suffix = arch.ToSuffix();
             var platforms = new List<string> { $"linux/{suffix}" };
 
             var buildSettings = new DockerImageBuildSettings
@@ -74,14 +74,14 @@ public static void DockerCreateManifest(this BuildContextBase context, DockerIma
             var manifestTags = context.GetDockerTags(dockerImage);
             foreach (var tag in manifestTags)
             {
-                var amd64Tag = $"{tag}-{GetArchitectureSuffix(Architecture.Amd64)}";
+                var amd64Tag = $"{tag}-{Architecture.Amd64.ToSuffix()}";
                 if (skipArm64Image)
                 {
                     context.DockerManifestCreate(tag, amd64Tag);
                 }
                 else
                 {
-                    var arm64Tag = $"{tag}-{GetArchitectureSuffix(Architecture.Arm64)}";
+                    var arm64Tag = $"{tag}-{Architecture.Arm64.ToSuffix()}";
                     context.DockerManifestCreate(tag, amd64Tag, arm64Tag);
                 }
             }
@@ -109,7 +109,8 @@ public static void DockerRemoveManifest(this BuildContextBase context, DockerIma
         public static void DockerPullImage(this ICakeContext context, DockerImage dockerImage)
         {
             var tag = $"{dockerImage.DockerImageName()}:{dockerImage.Distro}-sdk-{dockerImage.TargetFramework}";
-            context.DockerPull(tag);
+            var platform = $"linux/{dockerImage.Architecture.ToString().ToLower()}";
+            context.DockerPull(new DockerImagePullSettings { Platform = platform }, tag);
         }
 
         public static void DockerTestImage(this BuildContextBase context, DockerImage dockerImage)
@@ -127,13 +128,6 @@ public static void DockerTestArtifact(this BuildContextBase context, DockerImage
             context.DockerTestRun(tag, dockerImage.Architecture, "sh", cmd);
         }
 
-        private static string GetArchitectureSuffix(Architecture arch) => arch switch
-        {
-            Architecture.Arm64 => "arm64",
-            Architecture.Amd64 => "amd64",
-            _ => "amd64"
-        };
-
         private static void DockerBuild(
             this ICakeContext context,
             DockerImageBuildSettings settings,
@@ -142,20 +136,20 @@ private static void DockerBuild(
             GenericDockerRunner<DockerImageBuildSettings> genericDockerRunner =
                 new(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
 
-            string str1;
+            string str;
             switch (string.IsNullOrEmpty(path))
             {
                 case false:
                     {
                         string str2 = path.Trim();
-                        str1 = str2.Length <= 1 || !str2.StartsWith("\"") || !str2.EndsWith("\"") ? "\"" + path + "\"" : path;
+                        str = str2.Length <= 1 || !str2.StartsWith("\"") || !str2.EndsWith("\"") ? "\"" + path + "\"" : path;
                         break;
                     }
                 default:
-                    str1 = path;
+                    str = path;
                     break;
             }
-            var additional = args.Concat(new[] { str1 }).ToArray();
+            var additional = args.Concat(new[] { str }).ToArray();
             genericDockerRunner.Run("buildx build", settings, additional);
         }
 
@@ -206,7 +200,7 @@ private static IEnumerable<string> GetDockerTags(this BuildContextBase context,
 
             if (!arch.HasValue) return tags;
 
-            var suffix = GetArchitectureSuffix(arch.Value);
+            var suffix = arch.Value.ToSuffix();
             return tags.Select(x => $"{x}-{suffix}");
 
         }
diff --git a/build/common/Utilities/Extensions.cs b/build/common/Utilities/Extensions.cs
index a1eb85f456..faa764cf0d 100644
--- a/build/common/Utilities/Extensions.cs
+++ b/build/common/Utilities/Extensions.cs
@@ -66,5 +66,7 @@ public static DirectoryPath GetRootDirectory()
 
             return currentPath;
         }
+
+        public static string ToSuffix(this Architecture arch) => arch.ToString().ToLower();
     }
 }
diff --git a/build/docker/Tasks/DockerManifest.cs b/build/docker/Tasks/DockerManifest.cs
index c52dde6cc8..a76b0a0eb4 100644
--- a/build/docker/Tasks/DockerManifest.cs
+++ b/build/docker/Tasks/DockerManifest.cs
@@ -39,10 +39,11 @@ public override void Run(BuildContext context)
         {
             foreach (var group in context.Images.GroupBy(x => new { x.Distro, x.TargetFramework }))
             {
-                var dockerImage = group.First();
-                context.DockerCreateManifest(dockerImage, Constants.DistrosToSkip.Contains(dockerImage.Distro));
-                context.DockerPushManifest(dockerImage);
-                context.DockerRemoveManifest(dockerImage);
+                var amd64DockerImage = group.First(x => x.Architecture == Architecture.Amd64);
+                var arm64DockerImage = group.First(x => x.Architecture == Architecture.Arm64);
+                context.DockerCreateManifest(amd64DockerImage, context.SkipArm64Image(arm64DockerImage));
+                context.DockerPushManifest(amd64DockerImage);
+                context.DockerRemoveManifest(amd64DockerImage);
             }
         }
     }
diff --git a/src/Docker/linux deps.md b/src/Docker/linux deps.md
deleted file mode 100644
index f2d5fe1a39..0000000000
--- a/src/Docker/linux deps.md	
+++ /dev/null
@@ -1,19 +0,0 @@
-# Linux dependencies
-
-**Alpine**
-`apk add libgcc libstdc++ krb5-libs icu-libs`
-
-**Centos 7 & 8**
-`yum install -y icu`
-
-**fedora 33**
-`dnf install -y icu`
-
-**debian 9 && 10**
-`sudo apt-get install -y libgssapi-krb5-2 libicu-dev`
-
-**opensuse 15.2**
-`zypper install -y libicu-devel`
-
-**ubuntu 16.04, 18.04, 20.04**
-`none`

From 1ea3c282f8a9b193e269654365986c5d514181a1 Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Fri, 1 Oct 2021 12:34:29 +0200
Subject: [PATCH 04/30] (build) publish docker images to GH on every commit to
 main, and to DockerHub on tagged commits

---
 build/docker/BuildContext.cs         |  2 +-
 build/docker/BuildLifetime.cs        |  1 +
 build/docker/Tasks/DockerManifest.cs | 10 +++++++++-
 build/docker/Tasks/DockerPublish.cs  |  9 ++++++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/build/docker/BuildContext.cs b/build/docker/BuildContext.cs
index 4389de39e2..c98a29762f 100644
--- a/build/docker/BuildContext.cs
+++ b/build/docker/BuildContext.cs
@@ -7,9 +7,9 @@ namespace Docker
     public class BuildContext : BuildContextBase
     {
         public bool IsDockerOnLinux { get; set; }
-        public Architecture Arch { get; set; }
 
         public IEnumerable<DockerImage> Images { get; set; } = new List<DockerImage>();
+        public DockerRegistry DockerRegistry { get; set; }
 
         public BuildContext(ICakeContext context) : base(context)
         {
diff --git a/build/docker/BuildLifetime.cs b/build/docker/BuildLifetime.cs
index 3b77e2dc0b..de399b88e1 100644
--- a/build/docker/BuildLifetime.cs
+++ b/build/docker/BuildLifetime.cs
@@ -25,6 +25,7 @@ public override void Setup(BuildContext context)
             var archs = architecture.HasValue ? new[] { architecture.Value } : Constants.ArchToBuild;
 
             var registry = dockerRegistry == DockerRegistry.DockerHub ? Constants.DockerHubRegistry : Constants.GitHubContainerRegistry;
+            context.DockerRegistry = dockerRegistry;
             context.Images = from version in versions
                              from distro in distros
                              from arch in archs
diff --git a/build/docker/Tasks/DockerManifest.cs b/build/docker/Tasks/DockerManifest.cs
index a76b0a0eb4..b7b1802803 100644
--- a/build/docker/Tasks/DockerManifest.cs
+++ b/build/docker/Tasks/DockerManifest.cs
@@ -30,7 +30,15 @@ public override bool ShouldRun(BuildContext context)
             var shouldRun = true;
             shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(DockerPublish)} works only on GitHub Actions.");
             shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(DockerPublish)} works only on Docker on Linux agents.");
-            shouldRun &= context.ShouldRun(context.IsStableRelease || context.IsPreRelease, $"{nameof(DockerPublish)} works only for releases.");
+
+            if (context.DockerRegistry == DockerRegistry.GitHub)
+            {
+                shouldRun &= context.ShouldRun(context.IsStableRelease || context.IsPreRelease, $"{nameof(DockerPublish)} to GitHub Package Registry works only for releases.");
+            }
+            if (context.DockerRegistry == DockerRegistry.DockerHub)
+            {
+                shouldRun &= context.ShouldRun(context.IsStableRelease, $"{nameof(DockerPublish)} DockerHub works only for tagged releases.");
+            }
 
             return shouldRun;
         }
diff --git a/build/docker/Tasks/DockerPublish.cs b/build/docker/Tasks/DockerPublish.cs
index f36f1c30ae..5a4bb8aa85 100644
--- a/build/docker/Tasks/DockerPublish.cs
+++ b/build/docker/Tasks/DockerPublish.cs
@@ -30,7 +30,14 @@ public override bool ShouldRun(BuildContext context)
             var shouldRun = true;
             shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(DockerPublish)} works only on GitHub Actions.");
             shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(DockerPublish)} works only on Docker on Linux agents.");
-            shouldRun &= context.ShouldRun(context.IsStableRelease || context.IsPreRelease, $"{nameof(DockerPublish)} works only for releases.");
+            if (context.DockerRegistry == DockerRegistry.GitHub)
+            {
+                shouldRun &= context.ShouldRun(context.IsStableRelease || context.IsPreRelease, $"{nameof(DockerPublish)} to GitHub Package Registry works only for releases.");
+            }
+            if (context.DockerRegistry == DockerRegistry.DockerHub)
+            {
+                shouldRun &= context.ShouldRun(context.IsStableRelease, $"{nameof(DockerPublish)} DockerHub works only for tagged releases.");
+            }
 
             return shouldRun;
         }

From 94600b97a4bcfe168a718d6304848e80c5b86189 Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Fri, 1 Oct 2021 21:48:03 +0200
Subject: [PATCH 05/30] (build) target build solution to net6.0, C#10

changed the namespaces to file-scoped
---
 build/Directory.Build.props                   |   7 +-
 build/artifacts/BuildContext.cs               |  19 +-
 build/artifacts/BuildLifetime.cs              |  47 +--
 build/artifacts/Startup.cs                    |  19 +-
 .../Tasks/ArtifactsDotnetToolTest.cs          |  51 ++-
 .../Tasks/ArtifactsExecutableTest.cs          |  85 ++--
 .../Tasks/ArtifactsMsBuildCoreTest.cs         |  71 ++--
 .../Tasks/ArtifactsMsBuildFullTest.cs         |  93 ++---
 build/artifacts/Tasks/ArtifactsNativeTest.cs  |  61 ++-
 build/artifacts/Tasks/ArtifactsPrepare.cs     |  39 +-
 build/artifacts/Tasks/ArtifactsTest.cs        |  31 +-
 build/artifacts/Tasks/Default.cs              |  11 +-
 build/artifacts/Utilities/IsExternalInit.cs   |  19 +-
 build/build/BuildContext.cs                   |  31 +-
 build/build/BuildLifetime.cs                  |  49 ++-
 build/build/Startup.cs                        |  23 +-
 build/build/Tasks/Build.cs                    |  49 ++-
 build/build/Tasks/Clean.cs                    |  31 +-
 build/build/Tasks/CodeFormat.cs               |  41 +-
 build/build/Tasks/Default.cs                  |  11 +-
 build/build/Tasks/Package.cs                  |  19 +-
 .../build/Tasks/Package/PackageChocolatey.cs  |  59 ++-
 build/build/Tasks/Package/PackageGZip.cs      |  45 +-
 build/build/Tasks/Package/PackageNuget.cs     | 103 +++--
 build/build/Tasks/Package/PackagePrepare.cs   |  99 +++--
 build/build/Tasks/Test.cs                     |  15 +-
 build/build/Tasks/Test/PublishCoverage.cs     |  55 ++-
 build/build/Tasks/Test/UnitTest.cs            | 143 ++++---
 build/build/Tasks/ValidateVersion.cs          |  21 +-
 build/build/Utilities/ContextExtensions.cs    |  13 +-
 build/build/Utilities/Credentials.cs          |  19 +-
 build/build/Utilities/EnvVars.cs              |  12 +-
 build/build/Utilities/IsExternalInit.cs       |  19 +-
 build/chores/BuildContext.cs                  |  11 +-
 build/chores/BuildLifetime.cs                 |  25 +-
 build/chores/Startup.cs                       |  15 +-
 build/chores/Tasks/Default.cs                 |  11 +-
 build/chores/Tasks/ToolsInstall.cs            |  29 +-
 build/chores/Tasks/ToolsUpdate.cs             |  27 +-
 .../DotNetCoreFormatAliases.cs                |  51 ++-
 .../DotNetCoreFormatSettings.cs               | 165 ++++----
 .../DotNetCoreFormatToolRunner.cs             | 115 +++--
 build/common/Addins/GitVersion/GitVersion.cs  | 261 ++++++------
 .../Addins/GitVersion/GitVersionAliases.cs    | 209 +++++----
 .../Addins/GitVersion/GitVersionOutput.cs     |  27 +-
 .../Addins/GitVersion/GitVersionRunner.cs     | 267 ++++++------
 .../Addins/GitVersion/GitVersionSettings.cs   | 125 +++---
 .../Addins/GitVersion/GitVersionVerbosity.cs  |  52 ++-
 build/common/Lifetime/BuildTaskLifetime.cs    |  17 +-
 build/common/Tasks/Default.cs                 |  47 +--
 build/common/Utilities/Arguments.cs           |  21 +-
 build/common/Utilities/BuildContextBase.cs    |  41 +-
 build/common/Utilities/BuildLifetimeBase.cs   |  89 ++--
 build/common/Utilities/Constants.cs           | 103 +++--
 build/common/Utilities/ContextExtensions.cs   | 243 ++++++-----
 .../Utilities/DockerContextExtensions.cs      | 395 +++++++++---------
 build/common/Utilities/Extensions.cs          |  95 +++--
 build/common/Utilities/IsExternalInit.cs      |  19 +-
 build/common/Utilities/Models.cs              |  63 ++-
 build/common/Utilities/Paths.cs               |  37 +-
 .../Utilities/TaskArgumentsAttribute.cs       |  29 +-
 build/docker/BuildContext.cs                  |  19 +-
 build/docker/BuildLifetime.cs                 |  49 ++-
 build/docker/Startup.cs                       |  19 +-
 build/docker/Tasks/Default.cs                 |  11 +-
 build/docker/Tasks/DockerBuild.cs             |  51 ++-
 build/docker/Tasks/DockerManifest.cs          |  81 ++--
 build/docker/Tasks/DockerPublish.cs           |  79 ++--
 build/docker/Tasks/DockerTest.cs              |  43 +-
 build/docker/Utilities/IsExternalInit.cs      |  19 +-
 build/docs/BuildContext.cs                    |  19 +-
 build/docs/BuildLifetime.cs                   |  49 ++-
 build/docs/Startup.cs                         |  19 +-
 build/docs/Tasks/BuildDocs.cs                 |  33 +-
 build/docs/Tasks/Clean.cs                     |  19 +-
 build/docs/Tasks/Default.cs                   |  11 +-
 build/docs/Tasks/PreviewDocs.cs               |  39 +-
 build/docs/Tasks/PublishDocs.cs               | 171 ++++----
 build/docs/Utilities/Credentials.cs           |  21 +-
 build/docs/Utilities/IsExternalInit.cs        |  19 +-
 build/publish/BuildContext.cs                 |  17 +-
 build/publish/BuildLifetime.cs                |  35 +-
 build/publish/Startup.cs                      |  19 +-
 build/publish/Tasks/Default.cs                |  11 +-
 build/publish/Tasks/PublishChocolatey.cs      |  91 ++--
 build/publish/Tasks/PublishNuget.cs           |  91 ++--
 build/publish/Utilities/Credentials.cs        |  27 +-
 build/publish/Utilities/IsExternalInit.cs     |  19 +-
 build/release/BuildContext.cs                 |  15 +-
 build/release/BuildLifetime.cs                |  21 +-
 build/release/Startup.cs                      |  21 +-
 build/release/Tasks/Default.cs                |  11 +-
 build/release/Tasks/PublishRelease.cs         |  77 ++--
 build/release/Utilities/Credentials.cs        |  17 +-
 build/release/Utilities/IsExternalInit.cs     |  19 +-
 95 files changed, 2583 insertions(+), 2678 deletions(-)

diff --git a/build/Directory.Build.props b/build/Directory.Build.props
index cf0319a29a..5eec18e97c 100644
--- a/build/Directory.Build.props
+++ b/build/Directory.Build.props
@@ -1,12 +1,13 @@
-<Project>
+<Project>
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
         <OutputPath>..\..\run\</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <Nullable>enable</Nullable>
-        <LangVersion>9</LangVersion>
+        <LangVersion>10</LangVersion>
         <NoWarn>NU1604</NoWarn>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 </Project>
diff --git a/build/artifacts/BuildContext.cs b/build/artifacts/BuildContext.cs
index 071c587dca..47c3fa57e7 100644
--- a/build/artifacts/BuildContext.cs
+++ b/build/artifacts/BuildContext.cs
@@ -2,18 +2,17 @@
 using Cake.Core;
 using Common.Utilities;
 
-namespace Artifacts
+namespace Artifacts;
+
+public class BuildContext : BuildContextBase
 {
-    public class BuildContext : BuildContextBase
-    {
-        public string MsBuildConfiguration { get; set; } = "Release";
+    public string MsBuildConfiguration { get; set; } = "Release";
 
-        public bool IsDockerOnLinux { get; set; }
+    public bool IsDockerOnLinux { get; set; }
 
-        public IEnumerable<DockerImage> Images { get; set; } = new List<DockerImage>();
+    public IEnumerable<DockerImage> Images { get; set; } = new List<DockerImage>();
 
-        public BuildContext(ICakeContext context) : base(context)
-        {
-        }
+    public BuildContext(ICakeContext context) : base(context)
+    {
     }
-}
+}
\ No newline at end of file
diff --git a/build/artifacts/BuildLifetime.cs b/build/artifacts/BuildLifetime.cs
index 7663429c07..13e32e720d 100644
--- a/build/artifacts/BuildLifetime.cs
+++ b/build/artifacts/BuildLifetime.cs
@@ -5,38 +5,37 @@
 using Common.Utilities;
 using Constants = Common.Utilities.Constants;
 
-namespace Artifacts
+namespace Artifacts;
+
+public class BuildLifetime : BuildLifetimeBase<BuildContext>
 {
-    public class BuildLifetime : BuildLifetimeBase<BuildContext>
+    public override void Setup(BuildContext context)
     {
-        public override void Setup(BuildContext context)
-        {
-            base.Setup(context);
+        base.Setup(context);
 
-            context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", string.Empty) == "linux";
+        context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", string.Empty) == "linux";
 
-            var architecture = context.HasArgument(Arguments.Architecture) ? context.Argument<Architecture>(Arguments.Architecture) : (Architecture?)null;
-            var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.DockerHub);
-            var dotnetVersion = context.Argument(Arguments.DockerDotnetVersion, string.Empty).ToLower();
-            var dockerDistro = context.Argument(Arguments.DockerDistro, string.Empty).ToLower();
+        var architecture = context.HasArgument(Arguments.Architecture) ? context.Argument<Architecture>(Arguments.Architecture) : (Architecture?)null;
+        var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.DockerHub);
+        var dotnetVersion = context.Argument(Arguments.DockerDotnetVersion, string.Empty).ToLower();
+        var dockerDistro = context.Argument(Arguments.DockerDistro, string.Empty).ToLower();
 
-            var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.VersionsToBuild : new[] { dotnetVersion };
-            var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistrosToBuild : new[] { dockerDistro };
-            var archs = architecture.HasValue ? new[] { architecture.Value } : Constants.ArchToBuild;
+        var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.VersionsToBuild : new[] { dotnetVersion };
+        var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistrosToBuild : new[] { dockerDistro };
+        var archs = architecture.HasValue ? new[] { architecture.Value } : Constants.ArchToBuild;
 
-            var registry = dockerRegistry == DockerRegistry.DockerHub ? Constants.DockerHubRegistry : Constants.GitHubContainerRegistry;
-            context.Images = from version in versions
-                             from distro in distros
-                             from arch in archs
-                             select new DockerImage(distro, version, arch, registry, true);
+        var registry = dockerRegistry == DockerRegistry.DockerHub ? Constants.DockerHubRegistry : Constants.GitHubContainerRegistry;
+        context.Images = from version in versions
+                         from distro in distros
+                         from arch in archs
+                         select new DockerImage(distro, version, arch, registry, true);
 
-            context.StartGroup("Build Setup");
+        context.StartGroup("Build Setup");
 
-            LogBuildInformation(context);
+        LogBuildInformation(context);
 
-            context.Information("IsDockerOnLinux:   {0}", context.IsDockerOnLinux);
-            context.Information($"Building for Version: {dotnetVersion}, Distro: {dockerDistro}");
-            context.EndGroup();
-        }
+        context.Information("IsDockerOnLinux:   {0}", context.IsDockerOnLinux);
+        context.Information($"Building for Version: {dotnetVersion}, Distro: {dockerDistro}");
+        context.EndGroup();
     }
 }
diff --git a/build/artifacts/Startup.cs b/build/artifacts/Startup.cs
index c0a30515f7..17dc570e97 100644
--- a/build/artifacts/Startup.cs
+++ b/build/artifacts/Startup.cs
@@ -4,18 +4,17 @@
 using Common.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Artifacts
+namespace Artifacts;
+
+public class Startup : IFrostingStartup
 {
-    public class Startup : IFrostingStartup
+    public void Configure(IServiceCollection services)
     {
-        public void Configure(IServiceCollection services)
-        {
-            services.UseLifetime<BuildLifetime>();
-            services.UseTaskLifetime<BuildTaskLifetime>();
+        services.UseLifetime<BuildLifetime>();
+        services.UseTaskLifetime<BuildTaskLifetime>();
 
-            services.UseWorkingDirectory(Extensions.GetRootDirectory());
+        services.UseWorkingDirectory(Extensions.GetRootDirectory());
 
-            services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
-        }
+        services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
     }
-}
+}
\ No newline at end of file
diff --git a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs
index 11392ff050..fa26e279a8 100644
--- a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs
+++ b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs
@@ -1,39 +1,38 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Artifacts.Tasks
+namespace Artifacts.Tasks;
+
+[TaskName(nameof(ArtifactsDotnetToolTest))]
+[TaskDescription("Tests the dotnet global tool in docker container")]
+[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
+[IsDependentOn(typeof(ArtifactsPrepare))]
+public class ArtifactsDotnetToolTest : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(ArtifactsDotnetToolTest))]
-    [TaskDescription("Tests the dotnet global tool in docker container")]
-    [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-    [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
-    [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
-    [IsDependentOn(typeof(ArtifactsPrepare))]
-    public class ArtifactsDotnetToolTest : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(ArtifactsDotnetToolTest)} works only on Docker on Linux agents.");
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(ArtifactsDotnetToolTest)} works only on Docker on Linux agents.");
 
-            return shouldRun;
-        }
+        return shouldRun;
+    }
 
-        public override void Run(BuildContext context)
-        {
-            if (context.Version == null)
-                return;
-            var rootPrefix = string.Empty;
-            var version = context.Version.NugetVersion;
+    public override void Run(BuildContext context)
+    {
+        if (context.Version == null)
+            return;
+        var rootPrefix = string.Empty;
+        var version = context.Version.NugetVersion;
 
-            foreach (var dockerImage in context.Images)
-            {
-                if (context.SkipArm64Image(dockerImage)) continue;
+        foreach (var dockerImage in context.Images)
+        {
+            if (context.SkipArm64Image(dockerImage)) continue;
 
-                var cmd = $"{rootPrefix}/scripts/test-global-tool.sh --version {version} --nugetPath {rootPrefix}/nuget --repoPath {rootPrefix}/repo";
+            var cmd = $"{rootPrefix}/scripts/test-global-tool.sh --version {version} --nugetPath {rootPrefix}/nuget --repoPath {rootPrefix}/repo";
 
-                context.DockerTestArtifact(dockerImage, cmd);
-            }
+            context.DockerTestArtifact(dockerImage, cmd);
         }
     }
 }
diff --git a/build/artifacts/Tasks/ArtifactsExecutableTest.cs b/build/artifacts/Tasks/ArtifactsExecutableTest.cs
index 2b12e33a2b..0248b474ed 100644
--- a/build/artifacts/Tasks/ArtifactsExecutableTest.cs
+++ b/build/artifacts/Tasks/ArtifactsExecutableTest.cs
@@ -7,60 +7,59 @@
 using Common.Utilities;
 using Xunit;
 
-namespace Artifacts.Tasks
+namespace Artifacts.Tasks;
+
+[TaskName(nameof(ArtifactsExecutableTest))]
+[TaskDescription("Tests the cmdline and portable packages on windows")]
+public class ArtifactsExecutableTest : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(ArtifactsExecutableTest))]
-    [TaskDescription("Tests the cmdline and portable packages on windows")]
-    public class ArtifactsExecutableTest : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsOnWindows, $"{nameof(ArtifactsExecutableTest)} works only on Windows agents.");
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsOnWindows, $"{nameof(ArtifactsExecutableTest)} works only on Windows agents.");
 
-            return shouldRun;
-        }
+        return shouldRun;
+    }
 
-        public override void Run(BuildContext context)
+    public override void Run(BuildContext context)
+    {
+        var packagesToTest = new[]
         {
-            var packagesToTest = new[]
-            {
-                "GitVersion.Commandline", "GitVersion.Portable"
-            };
-            foreach (var packageToTest in packagesToTest)
-            {
-                PackageTest(context, packageToTest);
-            }
-        }
-        private static void PackageTest(BuildContextBase context, string packageToTest)
+            "GitVersion.Commandline", "GitVersion.Portable"
+        };
+        foreach (var packageToTest in packagesToTest)
         {
-            if (context.Version == null)
-                return;
+            PackageTest(context, packageToTest);
+        }
+    }
+    private static void PackageTest(BuildContextBase context, string packageToTest)
+    {
+        if (context.Version == null)
+            return;
 
-            var outputDirectory = Paths.Packages.Combine("test");
+        var outputDirectory = Paths.Packages.Combine("test");
 
-            context.NuGetInstall(packageToTest, new NuGetInstallSettings
+        context.NuGetInstall(packageToTest, new NuGetInstallSettings
+        {
+            Source = new[]
             {
-                Source = new[]
-                {
-                    context.MakeAbsolute(Paths.Nuget).FullPath
-                },
-                ExcludeVersion = true,
-                Prerelease = true,
-                OutputDirectory = outputDirectory
-            });
+                context.MakeAbsolute(Paths.Nuget).FullPath
+            },
+            ExcludeVersion = true,
+            Prerelease = true,
+            OutputDirectory = outputDirectory
+        });
 
-            var settings = new GitVersionSettings
+        var settings = new GitVersionSettings
+        {
+            OutputTypes = new HashSet<GitVersionOutput>
             {
-                OutputTypes = new HashSet<GitVersionOutput>
-                {
-                    GitVersionOutput.Json
-                },
-                ToolPath = outputDirectory.Combine(packageToTest).Combine("tools").CombineWithFilePath("gitversion.exe").FullPath
-            };
-            var gitVersion = context.GitVersion(settings);
+                GitVersionOutput.Json
+            },
+            ToolPath = outputDirectory.Combine(packageToTest).Combine("tools").CombineWithFilePath("gitversion.exe").FullPath
+        };
+        var gitVersion = context.GitVersion(settings);
 
-            Assert.Equal(context.Version.GitVersion.FullSemVer, gitVersion.FullSemVer);
-        }
+        Assert.Equal(context.Version.GitVersion.FullSemVer, gitVersion.FullSemVer);
     }
 }
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
index f31636c44a..68a126faf5 100644
--- a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
+++ b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
@@ -1,50 +1,49 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Artifacts.Tasks
+namespace Artifacts.Tasks;
+
+[TaskName(nameof(ArtifactsMsBuildCoreTest))]
+[TaskDescription("Tests the msbuild package in docker container")]
+[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
+[IsDependentOn(typeof(ArtifactsPrepare))]
+public class ArtifactsMsBuildCoreTest : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(ArtifactsMsBuildCoreTest))]
-    [TaskDescription("Tests the msbuild package in docker container")]
-    [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-    [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
-    [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
-    [IsDependentOn(typeof(ArtifactsPrepare))]
-    public class ArtifactsMsBuildCoreTest : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(ArtifactsMsBuildCoreTest)} works only on Docker on Linux agents.");
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(ArtifactsMsBuildCoreTest)} works only on Docker on Linux agents.");
 
-            return shouldRun;
-        }
+        return shouldRun;
+    }
 
-        public override void Run(BuildContext context)
-        {
-            if (context.Version == null)
-                return;
-            var rootPrefix = string.Empty;
-            var version = context.Version.NugetVersion;
+    public override void Run(BuildContext context)
+    {
+        if (context.Version == null)
+            return;
+        var rootPrefix = string.Empty;
+        var version = context.Version.NugetVersion;
 
-            foreach (var dockerImage in context.Images)
-            {
-                if (context.SkipArm64Image(dockerImage)) continue;
+        foreach (var dockerImage in context.Images)
+        {
+            if (context.SkipArm64Image(dockerImage)) continue;
 
-                string distro = dockerImage.Distro;
-                string targetFramework = dockerImage.TargetFramework;
+            string distro = dockerImage.Distro;
+            string targetFramework = dockerImage.TargetFramework;
 
-                if (targetFramework == Constants.Version31 && distro == Constants.Centos8) continue; // TODO check why this one fails
-                targetFramework = targetFramework switch
-                {
-                    Constants.Version31 => $"netcoreapp{targetFramework}",
-                    Constants.Version50 => $"net{targetFramework}",
-                    _ => targetFramework
-                };
+            if (targetFramework == Constants.Version31 && distro == Constants.Centos8) continue; // TODO check why this one fails
+            targetFramework = targetFramework switch
+            {
+                Constants.Version31 => $"netcoreapp{targetFramework}",
+                Constants.Version50 => $"net{targetFramework}",
+                _ => targetFramework
+            };
 
-                var cmd = $"{rootPrefix}/scripts/test-msbuild-task.sh --version {version} --nugetPath {rootPrefix}/nuget --repoPath {rootPrefix}/repo/tests/integration/core --targetframework {targetFramework}";
+            var cmd = $"{rootPrefix}/scripts/test-msbuild-task.sh --version {version} --nugetPath {rootPrefix}/nuget --repoPath {rootPrefix}/repo/tests/integration/core --targetframework {targetFramework}";
 
-                context.DockerTestArtifact(dockerImage, cmd);
-            }
+            context.DockerTestArtifact(dockerImage, cmd);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
index 704c40e789..29ecdd804a 100644
--- a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
+++ b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
@@ -9,64 +9,63 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Artifacts.Tasks
+namespace Artifacts.Tasks;
+
+[TaskName(nameof(ArtifactsMsBuildFullTest))]
+[TaskDescription("Tests the msbuild package on windows")]
+public class ArtifactsMsBuildFullTest : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(ArtifactsMsBuildFullTest))]
-    [TaskDescription("Tests the msbuild package on windows")]
-    public class ArtifactsMsBuildFullTest : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsOnWindows, $"{nameof(ArtifactsMsBuildFullTest)} works only on windows agents.");
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsOnWindows, $"{nameof(ArtifactsMsBuildFullTest)} works only on windows agents.");
 
-            return shouldRun;
-        }
+        return shouldRun;
+    }
 
-        public override void Run(BuildContext context)
-        {
-            if (context.Version == null)
-                return;
-            var version = context.Version.NugetVersion;
+    public override void Run(BuildContext context)
+    {
+        if (context.Version == null)
+            return;
+        var version = context.Version.NugetVersion;
 
-            var nugetSource = context.MakeAbsolute(Paths.Nuget).FullPath;
+        var nugetSource = context.MakeAbsolute(Paths.Nuget).FullPath;
 
-            context.Information("\nTesting msbuild task with dotnet build (for .net core)\n");
-            var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion50 };
-            foreach (var framework in frameworks)
-            {
-                var dotnetCoreMsBuildSettings = new DotNetCoreMSBuildSettings();
-                dotnetCoreMsBuildSettings.WithProperty("TargetFramework", framework);
-                dotnetCoreMsBuildSettings.WithProperty("GitVersionMsBuildVersion", version);
-                var projPath = context.MakeAbsolute(Paths.Integration.Combine("core"));
+        context.Information("\nTesting msbuild task with dotnet build (for .net core)\n");
+        var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion50 };
+        foreach (var framework in frameworks)
+        {
+            var dotnetCoreMsBuildSettings = new DotNetCoreMSBuildSettings();
+            dotnetCoreMsBuildSettings.WithProperty("TargetFramework", framework);
+            dotnetCoreMsBuildSettings.WithProperty("GitVersionMsBuildVersion", version);
+            var projPath = context.MakeAbsolute(Paths.Integration.Combine("core"));
 
-                context.DotNetCoreBuild(projPath.FullPath, new DotNetCoreBuildSettings
-                {
-                    Verbosity = DotNetCoreVerbosity.Minimal,
-                    Configuration = context.MsBuildConfiguration,
-                    MSBuildSettings = dotnetCoreMsBuildSettings,
-                    ArgumentCustomization = args => args.Append($"--source {nugetSource}")
-                });
+            context.DotNetCoreBuild(projPath.FullPath, new DotNetCoreBuildSettings
+            {
+                Verbosity = DotNetCoreVerbosity.Minimal,
+                Configuration = context.MsBuildConfiguration,
+                MSBuildSettings = dotnetCoreMsBuildSettings,
+                ArgumentCustomization = args => args.Append($"--source {nugetSource}")
+            });
 
-                var netcoreExe = Paths.Integration.Combine("core").Combine("build").Combine(framework).CombineWithFilePath("app.dll");
-                context.ValidateOutput("dotnet", netcoreExe.FullPath, context.Version.GitVersion.FullSemVer);
-            }
+            var netcoreExe = Paths.Integration.Combine("core").Combine("build").Combine(framework).CombineWithFilePath("app.dll");
+            context.ValidateOutput("dotnet", netcoreExe.FullPath, context.Version.GitVersion.FullSemVer);
+        }
 
-            context.Information("\nTesting msbuild task with msbuild (for full framework)\n");
+        context.Information("\nTesting msbuild task with msbuild (for full framework)\n");
 
-            var msBuildSettings = new MSBuildSettings
-            {
-                Verbosity = Verbosity.Minimal,
-                Restore = true
-            };
+        var msBuildSettings = new MSBuildSettings
+        {
+            Verbosity = Verbosity.Minimal,
+            Restore = true
+        };
 
-            msBuildSettings.WithProperty("GitVersionMsBuildVersion", version);
-            msBuildSettings.WithProperty("RestoreSource", nugetSource);
+        msBuildSettings.WithProperty("GitVersionMsBuildVersion", version);
+        msBuildSettings.WithProperty("RestoreSource", nugetSource);
 
-            context.MSBuild("./tests/integration/full", msBuildSettings);
+        context.MSBuild("./tests/integration/full", msBuildSettings);
 
-            var fullExe = Paths.Integration.Combine("full").Combine("build").CombineWithFilePath("app.exe");
-            context.ValidateOutput(fullExe.FullPath, null, context.Version.GitVersion.FullSemVer);
-        }
+        var fullExe = Paths.Integration.Combine("full").Combine("build").CombineWithFilePath("app.exe");
+        context.ValidateOutput(fullExe.FullPath, null, context.Version.GitVersion.FullSemVer);
     }
-}
+}
\ No newline at end of file
diff --git a/build/artifacts/Tasks/ArtifactsNativeTest.cs b/build/artifacts/Tasks/ArtifactsNativeTest.cs
index eecd254e44..2f09b79ce0 100644
--- a/build/artifacts/Tasks/ArtifactsNativeTest.cs
+++ b/build/artifacts/Tasks/ArtifactsNativeTest.cs
@@ -1,45 +1,44 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Artifacts.Tasks
+namespace Artifacts.Tasks;
+
+[TaskName(nameof(ArtifactsNativeTest))]
+[TaskDescription("Tests the native executables in docker container")]
+[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
+[IsDependentOn(typeof(ArtifactsPrepare))]
+public class ArtifactsNativeTest : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(ArtifactsNativeTest))]
-    [TaskDescription("Tests the native executables in docker container")]
-    [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-    [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
-    [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
-    [IsDependentOn(typeof(ArtifactsPrepare))]
-    public class ArtifactsNativeTest : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(ArtifactsNativeTest)} works only on Docker on Linux agents.");
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(ArtifactsNativeTest)} works only on Docker on Linux agents.");
 
-            return shouldRun;
-        }
+        return shouldRun;
+    }
 
-        public override void Run(BuildContext context)
+    public override void Run(BuildContext context)
+    {
+        if (context.Version?.SemVersion == null)
+            return;
+        var version = context.Version.SemVersion.ToLower();
+        var rootPrefix = string.Empty;
+
+        foreach (var dockerImage in context.Images)
         {
-            if (context.Version?.SemVersion == null)
-                return;
-            var version = context.Version.SemVersion.ToLower();
-            var rootPrefix = string.Empty;
+            if (context.SkipArm64Image(dockerImage)) continue;
 
-            foreach (var dockerImage in context.Images)
+            var runtime = dockerImage.Architecture == Architecture.Amd64 ? "linux-x64" : "linux-arm64";
+            if (dockerImage.Distro.StartsWith("alpine"))
             {
-                if (context.SkipArm64Image(dockerImage)) continue;
-
-                var runtime = dockerImage.Architecture == Architecture.Amd64 ? "linux-x64" : "linux-arm64";
-                if (dockerImage.Distro.StartsWith("alpine"))
-                {
-                    runtime = "linux-musl-x64";
-                }
+                runtime = "linux-musl-x64";
+            }
 
-                var cmd = $"{rootPrefix}/scripts/test-native-tool.sh --version {version} --repoPath {rootPrefix}/repo --runtime {runtime}";
+            var cmd = $"{rootPrefix}/scripts/test-native-tool.sh --version {version} --repoPath {rootPrefix}/repo --runtime {runtime}";
 
-                context.DockerTestArtifact(dockerImage, cmd);
-            }
+            context.DockerTestArtifact(dockerImage, cmd);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/build/artifacts/Tasks/ArtifactsPrepare.cs b/build/artifacts/Tasks/ArtifactsPrepare.cs
index b96ac4ab8a..f0af17ae66 100644
--- a/build/artifacts/Tasks/ArtifactsPrepare.cs
+++ b/build/artifacts/Tasks/ArtifactsPrepare.cs
@@ -1,30 +1,29 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Artifacts.Tasks
+namespace Artifacts.Tasks;
+
+[TaskName(nameof(ArtifactsPrepare))]
+[TaskDescription("Pulls the docker images needed for testing the artifacts")]
+[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
+public class ArtifactsPrepare : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(ArtifactsPrepare))]
-    [TaskDescription("Pulls the docker images needed for testing the artifacts")]
-    [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-    [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
-    [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
-    public class ArtifactsPrepare : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(ArtifactsPrepare)} works only on Docker on Linux agents.");
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(ArtifactsPrepare)} works only on Docker on Linux agents.");
 
-            return shouldRun;
-        }
+        return shouldRun;
+    }
 
-        public override void Run(BuildContext context)
+    public override void Run(BuildContext context)
+    {
+        foreach (var dockerImage in context.Images)
         {
-            foreach (var dockerImage in context.Images)
-            {
-                if (context.SkipArm64Image(dockerImage)) continue;
-                context.DockerPullImage(dockerImage);
-            }
+            if (context.SkipArm64Image(dockerImage)) continue;
+            context.DockerPullImage(dockerImage);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/build/artifacts/Tasks/ArtifactsTest.cs b/build/artifacts/Tasks/ArtifactsTest.cs
index 3820d4b70f..9020adc009 100644
--- a/build/artifacts/Tasks/ArtifactsTest.cs
+++ b/build/artifacts/Tasks/ArtifactsTest.cs
@@ -1,24 +1,23 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Artifacts.Tasks
+namespace Artifacts.Tasks;
+
+[TaskName(nameof(ArtifactsTest))]
+[TaskDescription("Tests packages in docker container")]
+[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
+[IsDependentOn(typeof(ArtifactsNativeTest))]
+[IsDependentOn(typeof(ArtifactsDotnetToolTest))]
+[IsDependentOn(typeof(ArtifactsMsBuildCoreTest))]
+public class ArtifactsTest : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(ArtifactsTest))]
-    [TaskDescription("Tests packages in docker container")]
-    [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-    [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
-    [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
-    [IsDependentOn(typeof(ArtifactsNativeTest))]
-    [IsDependentOn(typeof(ArtifactsDotnetToolTest))]
-    [IsDependentOn(typeof(ArtifactsMsBuildCoreTest))]
-    public class ArtifactsTest : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(ArtifactsTest)} works only on Docker on Linux agents.");
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(ArtifactsTest)} works only on Docker on Linux agents.");
 
-            return shouldRun;
-        }
+        return shouldRun;
     }
 }
diff --git a/build/artifacts/Tasks/Default.cs b/build/artifacts/Tasks/Default.cs
index 5f654434f6..68a6eaebca 100644
--- a/build/artifacts/Tasks/Default.cs
+++ b/build/artifacts/Tasks/Default.cs
@@ -1,9 +1,8 @@
 using Cake.Frosting;
 
-namespace Artifacts.Tasks
+namespace Artifacts.Tasks;
+
+[TaskDescription("Shows this output")]
+public class Default : Common.Tasks.Default
 {
-    [TaskDescription("Shows this output")]
-    public class Default : Common.Tasks.Default
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/build/artifacts/Utilities/IsExternalInit.cs b/build/artifacts/Utilities/IsExternalInit.cs
index 5023ab29a8..ae51612719 100644
--- a/build/artifacts/Utilities/IsExternalInit.cs
+++ b/build/artifacts/Utilities/IsExternalInit.cs
@@ -1,13 +1,12 @@
 using System.ComponentModel;
 
-namespace System.Runtime.CompilerServices
+namespace System.Runtime.CompilerServices;
+
+/// <summary>
+/// Reserved to be used by the compiler for tracking metadata.
+/// This class should not be used by developers in source code.
+/// </summary>
+[EditorBrowsable(EditorBrowsableState.Never)]
+public static class IsExternalInit
 {
-    /// <summary>
-    /// Reserved to be used by the compiler for tracking metadata.
-    /// This class should not be used by developers in source code.
-    /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public static class IsExternalInit
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/build/build/BuildContext.cs b/build/build/BuildContext.cs
index 562cc804f9..fb5a7e3409 100644
--- a/build/build/BuildContext.cs
+++ b/build/build/BuildContext.cs
@@ -4,27 +4,26 @@
 using Cake.Core;
 using Common.Utilities;
 
-namespace Build
+namespace Build;
+
+public class BuildContext : BuildContextBase
 {
-    public class BuildContext : BuildContextBase
-    {
-        public string MsBuildConfiguration { get; set; } = "Release";
+    public string MsBuildConfiguration { get; set; } = "Release";
 
-        public readonly Dictionary<PlatformFamily, string[]> NativeRuntimes = new()
-        {
-            [PlatformFamily.Windows] = new[] { "win-x64", "win-x86" },
-            [PlatformFamily.Linux] = new[] { "linux-x64", "linux-musl-x64", "linux-arm64" },
-            [PlatformFamily.OSX] = new[] { "osx-x64" },
-        };
+    public readonly Dictionary<PlatformFamily, string[]> NativeRuntimes = new()
+    {
+        [PlatformFamily.Windows] = new[] { "win-x64", "win-x86" },
+        [PlatformFamily.Linux] = new[] { "linux-x64", "linux-musl-x64", "linux-arm64" },
+        [PlatformFamily.OSX] = new[] { "osx-x64" },
+    };
 
-        public bool EnabledUnitTests { get; set; }
+    public bool EnabledUnitTests { get; set; }
 
-        public Credentials? Credentials { get; set; }
+    public Credentials? Credentials { get; set; }
 
-        public DotNetCoreMSBuildSettings MsBuildSettings { get; } = new();
+    public DotNetCoreMSBuildSettings MsBuildSettings { get; } = new();
 
-        public BuildContext(ICakeContext context) : base(context)
-        {
-        }
+    public BuildContext(ICakeContext context) : base(context)
+    {
     }
 }
diff --git a/build/build/BuildLifetime.cs b/build/build/BuildLifetime.cs
index 4cbe45b4f8..c0aaf24c62 100644
--- a/build/build/BuildLifetime.cs
+++ b/build/build/BuildLifetime.cs
@@ -4,37 +4,36 @@
 using Cake.Common.Tools.DotNetCore.MSBuild;
 using Common.Utilities;
 
-namespace Build
+namespace Build;
+
+public class BuildLifetime : BuildLifetimeBase<BuildContext>
 {
-    public class BuildLifetime : BuildLifetimeBase<BuildContext>
+    public override void Setup(BuildContext context)
     {
-        public override void Setup(BuildContext context)
-        {
-            base.Setup(context);
+        base.Setup(context);
 
-            context.MsBuildConfiguration = context.Argument(Arguments.Configuration, "Release");
-            context.EnabledUnitTests = context.IsEnabled(EnvVars.EnabledUnitTests);
+        context.MsBuildConfiguration = context.Argument(Arguments.Configuration, "Release");
+        context.EnabledUnitTests = context.IsEnabled(EnvVars.EnabledUnitTests);
 
-            context.Credentials = Credentials.GetCredentials(context);
+        context.Credentials = Credentials.GetCredentials(context);
 
-            SetMsBuildSettingsVersion(context.MsBuildSettings, context.Version!);
+        SetMsBuildSettingsVersion(context.MsBuildSettings, context.Version!);
 
-            context.StartGroup("Build Setup");
-            LogBuildInformation(context);
-            context.Information("Configuration:     {0}", context.MsBuildConfiguration);
-            context.EndGroup();
-        }
+        context.StartGroup("Build Setup");
+        LogBuildInformation(context);
+        context.Information("Configuration:     {0}", context.MsBuildConfiguration);
+        context.EndGroup();
+    }
 
-        private static void SetMsBuildSettingsVersion(DotNetCoreMSBuildSettings msBuildSettings, BuildVersion version)
-        {
-            msBuildSettings.WithProperty("Version", version.SemVersion);
-            msBuildSettings.WithProperty("AssemblyVersion", version.Version);
-            msBuildSettings.WithProperty("PackageVersion", version.NugetVersion);
-            msBuildSettings.WithProperty("FileVersion", version.Version);
-            msBuildSettings.WithProperty("InformationalVersion", version.GitVersion.InformationalVersion);
-            msBuildSettings.WithProperty("RepositoryBranch", version.GitVersion.BranchName);
-            msBuildSettings.WithProperty("RepositoryCommit", version.GitVersion.Sha);
-            msBuildSettings.WithProperty("NoPackageAnalysis", "true");
-        }
+    private static void SetMsBuildSettingsVersion(DotNetCoreMSBuildSettings msBuildSettings, BuildVersion version)
+    {
+        msBuildSettings.WithProperty("Version", version.SemVersion);
+        msBuildSettings.WithProperty("AssemblyVersion", version.Version);
+        msBuildSettings.WithProperty("PackageVersion", version.NugetVersion);
+        msBuildSettings.WithProperty("FileVersion", version.Version);
+        msBuildSettings.WithProperty("InformationalVersion", version.GitVersion.InformationalVersion);
+        msBuildSettings.WithProperty("RepositoryBranch", version.GitVersion.BranchName);
+        msBuildSettings.WithProperty("RepositoryCommit", version.GitVersion.Sha);
+        msBuildSettings.WithProperty("NoPackageAnalysis", "true");
     }
 }
diff --git a/build/build/Startup.cs b/build/build/Startup.cs
index 2fc8b253ef..52ca4e0d73 100644
--- a/build/build/Startup.cs
+++ b/build/build/Startup.cs
@@ -4,20 +4,19 @@
 using Common.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Build
+namespace Build;
+
+public class Startup : IFrostingStartup
 {
-    public class Startup : IFrostingStartup
+    public void Configure(IServiceCollection services)
     {
-        public void Configure(IServiceCollection services)
-        {
-            services.UseLifetime<BuildLifetime>();
-            services.UseTaskLifetime<BuildTaskLifetime>();
+        services.UseLifetime<BuildLifetime>();
+        services.UseTaskLifetime<BuildTaskLifetime>();
 
-            services.UseWorkingDirectory(Extensions.GetRootDirectory());
+        services.UseWorkingDirectory(Extensions.GetRootDirectory());
 
-            services.UseTool(new Uri("dotnet:?package=Codecov.Tool&version=1.13.0"));
-            services.UseTool(new Uri("dotnet:?package=dotnet-format&version=5.0.211103"));
-            services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
-        }
+        services.UseTool(new Uri("dotnet:?package=Codecov.Tool&version=1.13.0"));
+        services.UseTool(new Uri("dotnet:?package=dotnet-format&version=5.0.211103"));
+        services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
     }
-}
+}
\ No newline at end of file
diff --git a/build/build/Tasks/Build.cs b/build/build/Tasks/Build.cs
index 3a67ea0df2..8f3112885f 100644
--- a/build/build/Tasks/Build.cs
+++ b/build/build/Tasks/Build.cs
@@ -4,33 +4,32 @@
 using Cake.Common.Tools.DotNetCore.Restore;
 using Cake.Frosting;
 
-namespace Build.Tasks
+namespace Build.Tasks;
+
+[TaskName(nameof(Build))]
+[TaskDescription("Builds the solution")]
+[IsDependentOn(typeof(Clean))]
+[IsDependentOn(typeof(CodeFormat))]
+public sealed class Build : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(Build))]
-    [TaskDescription("Builds the solution")]
-    [IsDependentOn(typeof(Clean))]
-    [IsDependentOn(typeof(CodeFormat))]
-    public sealed class Build : FrostingTask<BuildContext>
+    public override void Run(BuildContext context)
     {
-        public override void Run(BuildContext context)
-        {
-            context.Information("Builds solution...");
-            const string sln = "./src/GitVersion.sln";
+        context.Information("Builds solution...");
+        const string sln = "./src/GitVersion.sln";
 
-            context.DotNetCoreRestore(sln, new DotNetCoreRestoreSettings
-            {
-                Verbosity = DotNetCoreVerbosity.Minimal,
-                Sources = new[] { "https://api.nuget.org/v3/index.json" },
-                MSBuildSettings = context.MsBuildSettings
-            });
+        context.DotNetCoreRestore(sln, new DotNetCoreRestoreSettings
+        {
+            Verbosity = DotNetCoreVerbosity.Minimal,
+            Sources = new[] { "https://api.nuget.org/v3/index.json" },
+            MSBuildSettings = context.MsBuildSettings
+        });
 
-            context.DotNetCoreBuild(sln, new DotNetCoreBuildSettings
-            {
-                Verbosity = DotNetCoreVerbosity.Minimal,
-                Configuration = context.MsBuildConfiguration,
-                NoRestore = true,
-                MSBuildSettings = context.MsBuildSettings
-            });
-        }
+        context.DotNetCoreBuild(sln, new DotNetCoreBuildSettings
+        {
+            Verbosity = DotNetCoreVerbosity.Minimal,
+            Configuration = context.MsBuildConfiguration,
+            NoRestore = true,
+            MSBuildSettings = context.MsBuildSettings
+        });
     }
-}
+}
\ No newline at end of file
diff --git a/build/build/Tasks/Clean.cs b/build/build/Tasks/Clean.cs
index 15860d3fd0..40e2eceee5 100644
--- a/build/build/Tasks/Clean.cs
+++ b/build/build/Tasks/Clean.cs
@@ -3,23 +3,22 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Build.Tasks
+namespace Build.Tasks;
+
+[TaskName(nameof(Clean))]
+[TaskDescription("Cleans build artifacts")]
+public sealed class Clean : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(Clean))]
-    [TaskDescription("Cleans build artifacts")]
-    public sealed class Clean : FrostingTask<BuildContext>
+    public override void Run(BuildContext context)
     {
-        public override void Run(BuildContext context)
-        {
-            context.Information("Cleaning directories...");
+        context.Information("Cleaning directories...");
 
-            context.CleanDirectories(Paths.Src + "/**/bin/" + context.MsBuildConfiguration);
-            context.CleanDirectories(Paths.Src + "/**/obj");
-            context.CleanDirectory(Paths.TestOutput);
-            context.CleanDirectory(Paths.Nuget);
-            context.CleanDirectory(Paths.Native);
-            context.CleanDirectory(Paths.Packages);
-            context.CleanDirectory(Paths.Artifacts);
-        }
+        context.CleanDirectories(Paths.Src + "/**/bin/" + context.MsBuildConfiguration);
+        context.CleanDirectories(Paths.Src + "/**/obj");
+        context.CleanDirectory(Paths.TestOutput);
+        context.CleanDirectory(Paths.Nuget);
+        context.CleanDirectory(Paths.Native);
+        context.CleanDirectory(Paths.Packages);
+        context.CleanDirectory(Paths.Artifacts);
     }
-}
+}
\ No newline at end of file
diff --git a/build/build/Tasks/CodeFormat.cs b/build/build/Tasks/CodeFormat.cs
index 71f42f6973..6eab27a86f 100644
--- a/build/build/Tasks/CodeFormat.cs
+++ b/build/build/Tasks/CodeFormat.cs
@@ -4,29 +4,28 @@
 using Common.Addins.Cake.DotNetCoreFormat;
 using Common.Utilities;
 
-namespace Build.Tasks
+namespace Build.Tasks;
+
+[TaskName(nameof(CodeFormat))]
+[TaskDescription("Formats the code")]
+public class CodeFormat : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(CodeFormat))]
-    [TaskDescription("Formats the code")]
-    public class CodeFormat : FrostingTask<BuildContext>
+    public override void Run(BuildContext context)
     {
-        public override void Run(BuildContext context)
+        context.Information("Code format...");
+        context.DotNetCoreFormat(new DotNetCoreFormatSettings
         {
-            context.Information("Code format...");
-            context.DotNetCoreFormat(new DotNetCoreFormatSettings
-            {
-                Workspace = Paths.Build,
-                Folder = true,
-                FixWhitespaces = true,
-            });
+            Workspace = Paths.Build,
+            Folder = true,
+            FixWhitespaces = true,
+        });
 
-            context.DotNetCoreFormat(new DotNetCoreFormatSettings
-            {
-                Workspace = Paths.Src,
-                Folder = true,
-                FixWhitespaces = true,
-                Exclude = new List<string> { " **/AddFormats/" }
-            });
-        }
+        context.DotNetCoreFormat(new DotNetCoreFormatSettings
+        {
+            Workspace = Paths.Src,
+            Folder = true,
+            FixWhitespaces = true,
+            Exclude = new List<string> { " **/AddFormats/" }
+        });
     }
-}
+}
\ No newline at end of file
diff --git a/build/build/Tasks/Default.cs b/build/build/Tasks/Default.cs
index f00695e8e7..d1349c3e10 100644
--- a/build/build/Tasks/Default.cs
+++ b/build/build/Tasks/Default.cs
@@ -1,9 +1,8 @@
 using Cake.Frosting;
 
-namespace Build.Tasks
+namespace Build.Tasks;
+
+[TaskDescription("Shows this output")]
+public class Default : Common.Tasks.Default
 {
-    [TaskDescription("Shows this output")]
-    public class Default : Common.Tasks.Default
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/build/build/Tasks/Package.cs b/build/build/Tasks/Package.cs
index 7bf507c2a4..4da2ce58be 100644
--- a/build/build/Tasks/Package.cs
+++ b/build/build/Tasks/Package.cs
@@ -1,13 +1,12 @@
 using Cake.Frosting;
 
-namespace Build.Tasks
+namespace Build.Tasks;
+
+[TaskName(nameof(Package))]
+[TaskDescription("Creates the packages (nuget, chocolatey or tar.gz)")]
+[IsDependentOn(typeof(PackageChocolatey))]
+[IsDependentOn(typeof(PackageNuget))]
+[IsDependentOn(typeof(PackageGZip))]
+public class Package : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(Package))]
-    [TaskDescription("Creates the packages (nuget, chocolatey or tar.gz)")]
-    [IsDependentOn(typeof(PackageChocolatey))]
-    [IsDependentOn(typeof(PackageNuget))]
-    [IsDependentOn(typeof(PackageGZip))]
-    public class Package : FrostingTask<BuildContext>
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/build/build/Tasks/Package/PackageChocolatey.cs b/build/build/Tasks/Package/PackageChocolatey.cs
index 3912fcbf42..8cc8f3a5e2 100644
--- a/build/build/Tasks/Package/PackageChocolatey.cs
+++ b/build/build/Tasks/Package/PackageChocolatey.cs
@@ -5,41 +5,40 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Build.Tasks
+namespace Build.Tasks;
+
+[TaskName(nameof(PackageChocolatey))]
+[TaskDescription("Creates the chocolatey packages")]
+[IsDependentOn(typeof(PackagePrepare))]
+public class PackageChocolatey : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(PackageChocolatey))]
-    [TaskDescription("Creates the chocolatey packages")]
-    [IsDependentOn(typeof(PackagePrepare))]
-    public class PackageChocolatey : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsOnWindows, $"{nameof(PackageChocolatey)} works only on Windows agents.");
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsOnWindows, $"{nameof(PackageChocolatey)} works only on Windows agents.");
 
-            return shouldRun;
-        }
+        return shouldRun;
+    }
 
-        public override void Run(BuildContext context)
-        {
-            context.EnsureDirectoryExists(Paths.Nuget);
+    public override void Run(BuildContext context)
+    {
+        context.EnsureDirectoryExists(Paths.Nuget);
 
-            var portableNuspecFile = Paths.Nuspec.CombineWithFilePath("GitVersion.Portable.nuspec");
-            if (!context.FileExists(portableNuspecFile))
-                return;
+        var portableNuspecFile = Paths.Nuspec.CombineWithFilePath("GitVersion.Portable.nuspec");
+        if (!context.FileExists(portableNuspecFile))
+            return;
 
-            var artifactPath = context.MakeAbsolute(Paths.ArtifactsBinPortable).FullPath;
+        var artifactPath = context.MakeAbsolute(Paths.ArtifactsBinPortable).FullPath;
 
-            var chocolateySettings = new ChocolateyPackSettings
-            {
-                LimitOutput = true,
-                Version = context.Version?.SemVersion,
-                OutputDirectory = Paths.Nuget,
-                Files = context.GetFiles(artifactPath + "/**/*.*")
-                    .Select(file => new ChocolateyNuSpecContent { Source = file.FullPath, Target = file.FullPath.Replace(artifactPath, "") })
-                    .ToArray()
-            };
-            context.ChocolateyPack(portableNuspecFile, chocolateySettings);
-        }
+        var chocolateySettings = new ChocolateyPackSettings
+        {
+            LimitOutput = true,
+            Version = context.Version?.SemVersion,
+            OutputDirectory = Paths.Nuget,
+            Files = context.GetFiles(artifactPath + "/**/*.*")
+                .Select(file => new ChocolateyNuSpecContent { Source = file.FullPath, Target = file.FullPath.Replace(artifactPath, "") })
+                .ToArray()
+        };
+        context.ChocolateyPack(portableNuspecFile, chocolateySettings);
     }
-}
+}
\ No newline at end of file
diff --git a/build/build/Tasks/Package/PackageGZip.cs b/build/build/Tasks/Package/PackageGZip.cs
index 776b064558..546eb28dcd 100644
--- a/build/build/Tasks/Package/PackageGZip.cs
+++ b/build/build/Tasks/Package/PackageGZip.cs
@@ -4,34 +4,33 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Build.Tasks
+namespace Build.Tasks;
+
+[TaskName(nameof(PackageGZip))]
+[TaskDescription("Creates the tar.gz packages")]
+[IsDependentOn(typeof(PackagePrepare))]
+public class PackageGZip : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(PackageGZip))]
-    [TaskDescription("Creates the tar.gz packages")]
-    [IsDependentOn(typeof(PackagePrepare))]
-    public class PackageGZip : FrostingTask<BuildContext>
+    public override void Run(BuildContext context)
     {
-        public override void Run(BuildContext context)
-        {
-            context.EnsureDirectoryExists(Paths.Native);
+        context.EnsureDirectoryExists(Paths.Native);
 
-            var platform = context.Environment.Platform.Family;
-            var runtimes = context.NativeRuntimes[platform];
+        var platform = context.Environment.Platform.Family;
+        var runtimes = context.NativeRuntimes[platform];
 
-            foreach (var runtime in runtimes)
-            {
-                var sourceDir = Paths.Native.Combine(platform.ToString().ToLower()).Combine(runtime);
-                var targetDir = Paths.Native;
-                context.EnsureDirectoryExists(targetDir);
+        foreach (var runtime in runtimes)
+        {
+            var sourceDir = Paths.Native.Combine(platform.ToString().ToLower()).Combine(runtime);
+            var targetDir = Paths.Native;
+            context.EnsureDirectoryExists(targetDir);
 
-                var fileName = $"gitversion-{runtime}-{context.Version?.SemVersion}.tar.gz".ToLower();
-                var tarFile = targetDir.CombineWithFilePath(fileName);
-                var filePaths = context.GetFiles($"{sourceDir}/**/*");
-                context.GZipCompress(sourceDir, tarFile, filePaths);
+            var fileName = $"gitversion-{runtime}-{context.Version?.SemVersion}.tar.gz".ToLower();
+            var tarFile = targetDir.CombineWithFilePath(fileName);
+            var filePaths = context.GetFiles($"{sourceDir}/**/*");
+            context.GZipCompress(sourceDir, tarFile, filePaths);
 
-                context.Information($"Created {tarFile}");
-            }
-            base.Run(context);
+            context.Information($"Created {tarFile}");
         }
+        base.Run(context);
     }
-}
+}
\ No newline at end of file
diff --git a/build/build/Tasks/Package/PackageNuget.cs b/build/build/Tasks/Package/PackageNuget.cs
index faba64cb31..27f4bcf614 100644
--- a/build/build/Tasks/Package/PackageNuget.cs
+++ b/build/build/Tasks/Package/PackageNuget.cs
@@ -8,66 +8,65 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Build.Tasks
+namespace Build.Tasks;
+
+[TaskName(nameof(PackageNuget))]
+[TaskDescription("Creates the nuget packages")]
+[IsDependentOn(typeof(PackagePrepare))]
+public class PackageNuget : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(PackageNuget))]
-    [TaskDescription("Creates the nuget packages")]
-    [IsDependentOn(typeof(PackagePrepare))]
-    public class PackageNuget : FrostingTask<BuildContext>
+    public override void Run(BuildContext context)
     {
-        public override void Run(BuildContext context)
-        {
-            context.EnsureDirectoryExists(Paths.Nuget);
+        context.EnsureDirectoryExists(Paths.Nuget);
 
-            PackageWithCli(context);
-            PackageUsingNuspec(context);
-        }
-        private static void PackageWithCli(BuildContext context)
+        PackageWithCli(context);
+        PackageUsingNuspec(context);
+    }
+    private static void PackageWithCli(BuildContext context)
+    {
+        var settings = new DotNetCorePackSettings
         {
-            var settings = new DotNetCorePackSettings
-            {
-                Configuration = context.MsBuildConfiguration,
-                OutputDirectory = Paths.Nuget,
-                MSBuildSettings = context.MsBuildSettings,
-                ArgumentCustomization = arg => arg.Append("/p:PackAsTool=true")
-            };
+            Configuration = context.MsBuildConfiguration,
+            OutputDirectory = Paths.Nuget,
+            MSBuildSettings = context.MsBuildSettings,
+            ArgumentCustomization = arg => arg.Append("/p:PackAsTool=true")
+        };
 
-            // GitVersion.MsBuild, global tool & core
-            context.DotNetCorePack("./src/GitVersion.App/GitVersion.App.csproj", settings);
+        // GitVersion.MsBuild, global tool & core
+        context.DotNetCorePack("./src/GitVersion.App/GitVersion.App.csproj", settings);
 
-            settings.ArgumentCustomization = arg => arg.Append("/p:IsPackaging=true");
-            context.DotNetCorePack("./src/GitVersion.MsBuild", settings);
+        settings.ArgumentCustomization = arg => arg.Append("/p:IsPackaging=true");
+        context.DotNetCorePack("./src/GitVersion.MsBuild", settings);
 
-            settings.ArgumentCustomization = null;
-            context.DotNetCorePack("./src/GitVersion.Core", settings);
-        }
-        private static void PackageUsingNuspec(BuildContextBase context)
-        {
-            var cmdlineNuspecFile = Paths.Nuspec.CombineWithFilePath("GitVersion.CommandLine.nuspec");
-            if (!context.FileExists(cmdlineNuspecFile))
-                return;
+        settings.ArgumentCustomization = null;
+        context.DotNetCorePack("./src/GitVersion.Core", settings);
+    }
+    private static void PackageUsingNuspec(BuildContextBase context)
+    {
+        var cmdlineNuspecFile = Paths.Nuspec.CombineWithFilePath("GitVersion.CommandLine.nuspec");
+        if (!context.FileExists(cmdlineNuspecFile))
+            return;
 
-            var artifactPath = context.MakeAbsolute(Paths.ArtifactsBinCmdline).FullPath;
-            var version = context.Version;
-            var gitVersion = version?.GitVersion;
-            var nugetSettings = new NuGetPackSettings
+        var artifactPath = context.MakeAbsolute(Paths.ArtifactsBinCmdline).FullPath;
+        var version = context.Version;
+        var gitVersion = version?.GitVersion;
+        var nugetSettings = new NuGetPackSettings
+        {
+            // KeepTemporaryNuSpecFile = true,
+            Version = version?.NugetVersion,
+            NoPackageAnalysis = true,
+            OutputDirectory = Paths.Nuget,
+            Repository = new NuGetRepository
             {
-                // KeepTemporaryNuSpecFile = true,
-                Version = version?.NugetVersion,
-                NoPackageAnalysis = true,
-                OutputDirectory = Paths.Nuget,
-                Repository = new NuGetRepository
-                {
-                    Branch = gitVersion?.BranchName,
-                    Commit = gitVersion?.Sha
-                },
-                Files = context.GetFiles(artifactPath + "/**/*.*")
-                    .Select(file => new NuSpecContent { Source = file.FullPath, Target = file.FullPath.Replace(artifactPath, "") })
-                    .Concat(context.GetFiles("docs/**/package_icon.png").Select(file => new NuSpecContent { Source = file.FullPath, Target = "package_icon.png" }))
-                    .ToArray()
-            };
+                Branch = gitVersion?.BranchName,
+                Commit = gitVersion?.Sha
+            },
+            Files = context.GetFiles(artifactPath + "/**/*.*")
+                .Select(file => new NuSpecContent { Source = file.FullPath, Target = file.FullPath.Replace(artifactPath, "") })
+                .Concat(context.GetFiles("docs/**/package_icon.png").Select(file => new NuSpecContent { Source = file.FullPath, Target = "package_icon.png" }))
+                .ToArray()
+        };
 
-            context.NuGetPack(cmdlineNuspecFile, nugetSettings);
-        }
+        context.NuGetPack(cmdlineNuspecFile, nugetSettings);
     }
-}
+}
\ No newline at end of file
diff --git a/build/build/Tasks/Package/PackagePrepare.cs b/build/build/Tasks/Package/PackagePrepare.cs
index 38cf581f30..988c79413c 100644
--- a/build/build/Tasks/Package/PackagePrepare.cs
+++ b/build/build/Tasks/Package/PackagePrepare.cs
@@ -7,70 +7,69 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Build.Tasks
+namespace Build.Tasks;
+
+[TaskName(nameof(PackagePrepare))]
+[TaskDescription("Prepares for packaging")]
+[IsDependentOn(typeof(ValidateVersion))]
+public class PackagePrepare : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(PackagePrepare))]
-    [TaskDescription("Prepares for packaging")]
-    [IsDependentOn(typeof(ValidateVersion))]
-    public class PackagePrepare : FrostingTask<BuildContext>
+    public override void Run(BuildContext context)
     {
-        public override void Run(BuildContext context)
-        {
-            PackPrepareNative(context);
+        PackPrepareNative(context);
 
-            var sourceDir = Paths.Native.Combine(PlatformFamily.Windows.ToString()).Combine("win-x64");
-            var sourceFiles = context.GetFiles(sourceDir + "/*.*");
+        var sourceDir = Paths.Native.Combine(PlatformFamily.Windows.ToString()).Combine("win-x64");
+        var sourceFiles = context.GetFiles(sourceDir + "/*.*");
 
-            var cmdlineDir = Paths.ArtifactsBinCmdline.Combine("tools");
+        var cmdlineDir = Paths.ArtifactsBinCmdline.Combine("tools");
 
-            context.EnsureDirectoryExists(cmdlineDir);
-            context.CopyFiles(sourceFiles, cmdlineDir);
+        context.EnsureDirectoryExists(cmdlineDir);
+        context.CopyFiles(sourceFiles, cmdlineDir);
 
-            var portableDir = Paths.ArtifactsBinPortable.Combine("tools");
-            context.EnsureDirectoryExists(portableDir);
+        var portableDir = Paths.ArtifactsBinPortable.Combine("tools");
+        context.EnsureDirectoryExists(portableDir);
 
-            sourceFiles += context.GetFiles("./build/nuspec/*.ps1") + context.GetFiles("./build/nuspec/*.txt");
-            context.CopyFiles(sourceFiles, portableDir);
-        }
+        sourceFiles += context.GetFiles("./build/nuspec/*.ps1") + context.GetFiles("./build/nuspec/*.txt");
+        context.CopyFiles(sourceFiles, portableDir);
+    }
 
-        private static void PackPrepareNative(BuildContext context)
-        {
-            // publish single file for all native runtimes (self contained)
-            var platform = context.Environment.Platform.Family;
-            var runtimes = context.NativeRuntimes[platform];
+    private static void PackPrepareNative(BuildContext context)
+    {
+        // publish single file for all native runtimes (self contained)
+        var platform = context.Environment.Platform.Family;
+        var runtimes = context.NativeRuntimes[platform];
 
-            foreach (var runtime in runtimes)
-            {
-                var outputPath = PackPrepareNative(context, runtime);
+        foreach (var runtime in runtimes)
+        {
+            var outputPath = PackPrepareNative(context, runtime);
 
-                // testing windows and macos artifacts, the linux is tested with docker
-                if (platform == PlatformFamily.Linux) continue;
+            // testing windows and macos artifacts, the linux is tested with docker
+            if (platform == PlatformFamily.Linux) continue;
 
-                context.Information("Validating native lib:");
-                var nativeExe = outputPath.CombineWithFilePath(context.IsOnWindows ? "gitversion.exe" : "gitversion");
-                context.ValidateOutput(nativeExe.FullPath, "/showvariable FullSemver", context.Version?.GitVersion?.FullSemVer);
-            }
+            context.Information("Validating native lib:");
+            var nativeExe = outputPath.CombineWithFilePath(context.IsOnWindows ? "gitversion.exe" : "gitversion");
+            context.ValidateOutput(nativeExe.FullPath, "/showvariable FullSemver", context.Version?.GitVersion?.FullSemVer);
         }
+    }
 
-        private static DirectoryPath PackPrepareNative(BuildContext context, string runtime)
-        {
-            var platform = context.Environment.Platform.Family;
-            var outputPath = Paths.Native.Combine(platform.ToString().ToLower()).Combine(runtime);
+    private static DirectoryPath PackPrepareNative(BuildContext context, string runtime)
+    {
+        var platform = context.Environment.Platform.Family;
+        var outputPath = Paths.Native.Combine(platform.ToString().ToLower()).Combine(runtime);
 
-            var settings = new DotNetCorePublishSettings
-            {
-                Framework = Constants.NetVersion50,
-                Runtime = runtime,
-                NoRestore = false,
-                Configuration = context.MsBuildConfiguration,
-                OutputDirectory = outputPath,
-                MSBuildSettings = context.MsBuildSettings,
-                ArgumentCustomization = arg => arg.Append("/p:PublishSingleFile=true"),
-            };
+        var settings = new DotNetCorePublishSettings
+        {
+            Framework = Constants.NetVersion50,
+            Runtime = runtime,
+            NoRestore = false,
+            Configuration = context.MsBuildConfiguration,
+            OutputDirectory = outputPath,
+            MSBuildSettings = context.MsBuildSettings,
+            ArgumentCustomization = arg => arg.Append("/p:PublishSingleFile=true"),
+        };
 
-            context.DotNetCorePublish("./src/GitVersion.App/GitVersion.App.csproj", settings);
+        context.DotNetCorePublish("./src/GitVersion.App/GitVersion.App.csproj", settings);
 
-            return outputPath;
-        }
+        return outputPath;
     }
-}
+}
\ No newline at end of file
diff --git a/build/build/Tasks/Test.cs b/build/build/Tasks/Test.cs
index 0f4024beb1..9f95567cc4 100644
--- a/build/build/Tasks/Test.cs
+++ b/build/build/Tasks/Test.cs
@@ -1,11 +1,10 @@
 using Cake.Frosting;
 
-namespace Build.Tasks
+namespace Build.Tasks;
+
+[TaskName(nameof(Test))]
+[TaskDescription("(CI only) Run the tests and publish the results")]
+[IsDependentOn(typeof(PublishCoverage))]
+public class Test : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(Test))]
-    [TaskDescription("(CI only) Run the tests and publish the results")]
-    [IsDependentOn(typeof(PublishCoverage))]
-    public class Test : FrostingTask<BuildContext>
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/build/build/Tasks/Test/PublishCoverage.cs b/build/build/Tasks/Test/PublishCoverage.cs
index 740ab06dc5..6c88601f15 100644
--- a/build/build/Tasks/Test/PublishCoverage.cs
+++ b/build/build/Tasks/Test/PublishCoverage.cs
@@ -4,40 +4,39 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Build.Tasks
+namespace Build.Tasks;
+
+[TaskName(nameof(PublishCoverage))]
+[TaskDescription("Publishes the test coverage")]
+[IsDependentOn(typeof(UnitTest))]
+public class PublishCoverage : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(PublishCoverage))]
-    [TaskDescription("Publishes the test coverage")]
-    [IsDependentOn(typeof(UnitTest))]
-    public class PublishCoverage : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsOnWindows, $"{nameof(PublishCoverage)} works only on Windows agents.");
-            shouldRun &= context.ShouldRun(context.IsOnMainBranchOriginalRepo, $"{nameof(PublishCoverage)} works only for on main branch original repository.");
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsOnWindows, $"{nameof(PublishCoverage)} works only on Windows agents.");
+        shouldRun &= context.ShouldRun(context.IsOnMainBranchOriginalRepo, $"{nameof(PublishCoverage)} works only for on main branch original repository.");
 
-            return shouldRun;
-        }
+        return shouldRun;
+    }
 
-        public override void Run(BuildContext context)
-        {
-            var coverageFiles = context.GetFiles($"{Paths.TestOutput}/*.coverage.*.xml");
+    public override void Run(BuildContext context)
+    {
+        var coverageFiles = context.GetFiles($"{Paths.TestOutput}/*.coverage.*.xml");
 
-            var token = context.Credentials?.CodeCov?.Token;
-            if (string.IsNullOrEmpty(token))
-            {
-                throw new InvalidOperationException("Could not resolve CodeCov token.");
-            }
+        var token = context.Credentials?.CodeCov?.Token;
+        if (string.IsNullOrEmpty(token))
+        {
+            throw new InvalidOperationException("Could not resolve CodeCov token.");
+        }
 
-            foreach (var coverageFile in coverageFiles)
+        foreach (var coverageFile in coverageFiles)
+        {
+            context.Codecov(new CodecovSettings
             {
-                context.Codecov(new CodecovSettings
-                {
-                    Files = new[] { coverageFile.ToString() },
-                    Token = token
-                });
-            }
+                Files = new[] { coverageFile.ToString() },
+                Token = token
+            });
         }
     }
-}
+}
\ No newline at end of file
diff --git a/build/build/Tasks/Test/UnitTest.cs b/build/build/Tasks/Test/UnitTest.cs
index a2e2e1a8b0..a34babef8f 100644
--- a/build/build/Tasks/Test/UnitTest.cs
+++ b/build/build/Tasks/Test/UnitTest.cs
@@ -13,95 +13,94 @@
 using Cake.Incubator.LoggingExtensions;
 using Common.Utilities;
 
-namespace Build.Tasks
+namespace Build.Tasks;
+
+[TaskName(nameof(UnitTest))]
+[TaskDescription("Run the unit tests")]
+[TaskArgument(Arguments.DotnetTarget, Constants.NetVersion50, Constants.CoreFxVersion31, Constants.FullFxVersion48)]
+[IsDependentOn(typeof(Build))]
+public class UnitTest : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(UnitTest))]
-    [TaskDescription("Run the unit tests")]
-    [TaskArgument(Arguments.DotnetTarget, Constants.NetVersion50, Constants.CoreFxVersion31, Constants.FullFxVersion48)]
-    [IsDependentOn(typeof(Build))]
-    public class UnitTest : FrostingTask<BuildContext>
-    {
-        public override bool ShouldRun(BuildContext context) => context.EnabledUnitTests;
+    public override bool ShouldRun(BuildContext context) => context.EnabledUnitTests;
 
-        public override void Run(BuildContext context)
+    public override void Run(BuildContext context)
+    {
+        var dotnetTarget = context.Argument(Arguments.DotnetTarget, string.Empty);
+        var frameworks = new[] { Constants.CoreFxVersion31, Constants.FullFxVersion48, Constants.NetVersion50 };
+        if (!string.IsNullOrWhiteSpace(dotnetTarget))
         {
-            var dotnetTarget = context.Argument(Arguments.DotnetTarget, string.Empty);
-            var frameworks = new[] { Constants.CoreFxVersion31, Constants.FullFxVersion48, Constants.NetVersion50 };
-            if (!string.IsNullOrWhiteSpace(dotnetTarget))
+            if (!frameworks.Contains(dotnetTarget, StringComparer.OrdinalIgnoreCase))
             {
-                if (!frameworks.Contains(dotnetTarget, StringComparer.OrdinalIgnoreCase))
-                {
-                    throw new Exception($"Dotnet Target {dotnetTarget} is not supported at the moment");
-                }
-                frameworks = new[] { dotnetTarget };
+                throw new Exception($"Dotnet Target {dotnetTarget} is not supported at the moment");
             }
+            frameworks = new[] { dotnetTarget };
+        }
 
-            foreach (var framework in frameworks)
+        foreach (var framework in frameworks)
+        {
+            // run using dotnet test
+            var projects = context.GetFiles($"{Paths.Src}/**/*.Tests.csproj");
+            foreach (var project in projects)
             {
-                // run using dotnet test
-                var projects = context.GetFiles($"{Paths.Src}/**/*.Tests.csproj");
-                foreach (var project in projects)
-                {
-                    TestProjectForTarget(context, project, framework);
-                }
+                TestProjectForTarget(context, project, framework);
             }
         }
+    }
+
+    public override void OnError(Exception exception, BuildContext context)
+    {
+        var error = (exception as AggregateException)?.InnerExceptions[0];
+        context.Error(error.Dump());
+        throw exception;
+    }
+
+    public override void Finally(BuildContext context)
+    {
+        var testResultsFiles = context.GetFiles($"{Paths.TestOutput}/*.results.xml");
+        if (!context.IsAzurePipelineBuild || !testResultsFiles.Any()) return;
 
-        public override void OnError(Exception exception, BuildContext context)
+        var data = new AzurePipelinesPublishTestResultsData
         {
-            var error = (exception as AggregateException)?.InnerExceptions[0];
-            context.Error(error.Dump());
-            throw exception;
-        }
+            TestResultsFiles = testResultsFiles.ToArray(),
+            Platform = context.Environment.Platform.Family.ToString(),
+            TestRunner = AzurePipelinesTestRunnerType.NUnit
+        };
+        context.BuildSystem().AzurePipelines.Commands.PublishTestResults(data);
+    }
 
-        public override void Finally(BuildContext context)
+    private static void TestProjectForTarget(BuildContext context, FilePath project, string framework)
+    {
+        var testResultsPath = Paths.TestOutput;
+        var projectName = $"{project.GetFilenameWithoutExtension()}.{framework}";
+        var settings = new DotNetCoreTestSettings
         {
-            var testResultsFiles = context.GetFiles($"{Paths.TestOutput}/*.results.xml");
-            if (!context.IsAzurePipelineBuild || !testResultsFiles.Any()) return;
+            Framework = framework,
+            NoBuild = true,
+            NoRestore = true,
+            Configuration = context.MsBuildConfiguration,
+        };
 
-            var data = new AzurePipelinesPublishTestResultsData
-            {
-                TestResultsFiles = testResultsFiles.ToArray(),
-                Platform = context.Environment.Platform.Family.ToString(),
-                TestRunner = AzurePipelinesTestRunnerType.NUnit
-            };
-            context.BuildSystem().AzurePipelines.Commands.PublishTestResults(data);
+        if (!context.IsRunningOnMacOs())
+        {
+            settings.TestAdapterPath = new DirectoryPath(".");
+            var resultsPath = context.MakeAbsolute(testResultsPath.CombineWithFilePath($"{projectName}.results.xml"));
+            settings.Loggers = new[] { $"nunit;LogFilePath={resultsPath}" };
         }
 
-        private static void TestProjectForTarget(BuildContext context, FilePath project, string framework)
+        var coverletSettings = new CoverletSettings
         {
-            var testResultsPath = Paths.TestOutput;
-            var projectName = $"{project.GetFilenameWithoutExtension()}.{framework}";
-            var settings = new DotNetCoreTestSettings
-            {
-                Framework = framework,
-                NoBuild = true,
-                NoRestore = true,
-                Configuration = context.MsBuildConfiguration,
-            };
+            CollectCoverage = true,
+            CoverletOutputFormat = CoverletOutputFormat.cobertura,
+            CoverletOutputDirectory = testResultsPath,
+            CoverletOutputName = $"{projectName}.coverage.xml",
+            Exclude = new List<string> { "[GitVersion*.Tests]*", "[GitTools.Testing]*" }
+        };
 
-            if (!context.IsRunningOnMacOs())
-            {
-                settings.TestAdapterPath = new DirectoryPath(".");
-                var resultsPath = context.MakeAbsolute(testResultsPath.CombineWithFilePath($"{projectName}.results.xml"));
-                settings.Loggers = new[] { $"nunit;LogFilePath={resultsPath}" };
-            }
-
-            var coverletSettings = new CoverletSettings
-            {
-                CollectCoverage = true,
-                CoverletOutputFormat = CoverletOutputFormat.cobertura,
-                CoverletOutputDirectory = testResultsPath,
-                CoverletOutputName = $"{projectName}.coverage.xml",
-                Exclude = new List<string> { "[GitVersion*.Tests]*", "[GitTools.Testing]*" }
-            };
-
-            if (string.Equals(framework, Constants.FullFxVersion48))
-            {
-                settings.Filter = context.IsRunningOnUnix() ? "TestCategory!=NoMono" : "TestCategory!=NoNet48";
-            }
-
-            context.DotNetCoreTest(project.FullPath, settings, coverletSettings);
+        if (string.Equals(framework, Constants.FullFxVersion48))
+        {
+            settings.Filter = context.IsRunningOnUnix() ? "TestCategory!=NoMono" : "TestCategory!=NoNet48";
         }
+
+        context.DotNetCoreTest(project.FullPath, settings, coverletSettings);
     }
-}
+}
\ No newline at end of file
diff --git a/build/build/Tasks/ValidateVersion.cs b/build/build/Tasks/ValidateVersion.cs
index 4f9d49c776..39dfdcc77b 100644
--- a/build/build/Tasks/ValidateVersion.cs
+++ b/build/build/Tasks/ValidateVersion.cs
@@ -2,17 +2,16 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Build.Tasks
+namespace Build.Tasks;
+
+[TaskName(nameof(ValidateVersion))]
+[TaskDescription("Validates built assembly version")]
+[IsDependentOn(typeof(Build))]
+public class ValidateVersion : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(ValidateVersion))]
-    [TaskDescription("Validates built assembly version")]
-    [IsDependentOn(typeof(Build))]
-    public class ValidateVersion : FrostingTask<BuildContext>
+    public override void Run(BuildContext context)
     {
-        public override void Run(BuildContext context)
-        {
-            var gitversionTool = context.GetGitVersionToolLocation();
-            context.ValidateOutput("dotnet", $"\"{gitversionTool}\" -version", context.Version!.GitVersion!.InformationalVersion!);
-        }
+        var gitversionTool = context.GetGitVersionToolLocation();
+        context.ValidateOutput("dotnet", $"\"{gitversionTool}\" -version", context.Version!.GitVersion!.InformationalVersion!);
     }
-}
+}
\ No newline at end of file
diff --git a/build/build/Utilities/ContextExtensions.cs b/build/build/Utilities/ContextExtensions.cs
index a795957d7d..7fc73bc125 100644
--- a/build/build/Utilities/ContextExtensions.cs
+++ b/build/build/Utilities/ContextExtensions.cs
@@ -3,11 +3,10 @@
 using Cake.Core.IO;
 using Common.Utilities;
 
-namespace Build.Utilities
+namespace Build.Utilities;
+
+public static class ContextExtensions
 {
-    public static class ContextExtensions
-    {
-        public static FilePath? GetGitVersionToolLocation(this BuildContext context) =>
-            context.GetFiles($"src/GitVersion.App/bin/{context.MsBuildConfiguration}/{Constants.NetVersion50}/gitversion.dll").SingleOrDefault();
-    }
-}
+    public static FilePath? GetGitVersionToolLocation(this BuildContext context) =>
+        context.GetFiles($"src/GitVersion.App/bin/{context.MsBuildConfiguration}/{Constants.NetVersion50}/gitversion.dll").SingleOrDefault();
+}
\ No newline at end of file
diff --git a/build/build/Utilities/Credentials.cs b/build/build/Utilities/Credentials.cs
index 7c64c4e1b9..3c80a19d47 100644
--- a/build/build/Utilities/Credentials.cs
+++ b/build/build/Utilities/Credentials.cs
@@ -2,15 +2,14 @@
 using Cake.Core;
 using Common.Utilities;
 
-namespace Build.Utilities
+namespace Build.Utilities;
+
+public class Credentials
 {
-    public class Credentials
-    {
-        public CodeCovCredentials? CodeCov { get; private set; }
+    public CodeCovCredentials? CodeCov { get; private set; }
 
-        public static Credentials GetCredentials(ICakeContext context) => new()
-        {
-            CodeCov = new CodeCovCredentials(context.EnvironmentVariable("CODECOV_TOKEN")),
-        };
-    }
-}
+    public static Credentials GetCredentials(ICakeContext context) => new()
+    {
+        CodeCov = new CodeCovCredentials(context.EnvironmentVariable("CODECOV_TOKEN")),
+    };
+}
\ No newline at end of file
diff --git a/build/build/Utilities/EnvVars.cs b/build/build/Utilities/EnvVars.cs
index 19ca1152f5..4f31f3edca 100644
--- a/build/build/Utilities/EnvVars.cs
+++ b/build/build/Utilities/EnvVars.cs
@@ -1,8 +1,6 @@
-namespace Build.Utilities
-{
-    public class EnvVars
-    {
-        public const string EnabledUnitTests = "ENABLED_UNIT_TESTS";
-    }
+namespace Build.Utilities;
 
-}
+public class EnvVars
+{
+    public const string EnabledUnitTests = "ENABLED_UNIT_TESTS";
+}
\ No newline at end of file
diff --git a/build/build/Utilities/IsExternalInit.cs b/build/build/Utilities/IsExternalInit.cs
index 5023ab29a8..ae51612719 100644
--- a/build/build/Utilities/IsExternalInit.cs
+++ b/build/build/Utilities/IsExternalInit.cs
@@ -1,13 +1,12 @@
 using System.ComponentModel;
 
-namespace System.Runtime.CompilerServices
+namespace System.Runtime.CompilerServices;
+
+/// <summary>
+/// Reserved to be used by the compiler for tracking metadata.
+/// This class should not be used by developers in source code.
+/// </summary>
+[EditorBrowsable(EditorBrowsableState.Never)]
+public static class IsExternalInit
 {
-    /// <summary>
-    /// Reserved to be used by the compiler for tracking metadata.
-    /// This class should not be used by developers in source code.
-    /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public static class IsExternalInit
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/build/chores/BuildContext.cs b/build/chores/BuildContext.cs
index a3baba6b3c..033dfe158d 100644
--- a/build/chores/BuildContext.cs
+++ b/build/chores/BuildContext.cs
@@ -1,12 +1,11 @@
 using Cake.Core;
 using Cake.Frosting;
 
-namespace Chores
+namespace Chores;
+
+public class BuildContext : FrostingContext
 {
-    public class BuildContext : FrostingContext
+    public BuildContext(ICakeContext context) : base(context)
     {
-        public BuildContext(ICakeContext context) : base(context)
-        {
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/build/chores/BuildLifetime.cs b/build/chores/BuildLifetime.cs
index 3f124b9092..e23c08a315 100644
--- a/build/chores/BuildLifetime.cs
+++ b/build/chores/BuildLifetime.cs
@@ -2,19 +2,18 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Chores
+namespace Chores;
+
+public class BuildLifetime : FrostingLifetime<BuildContext>
 {
-    public class BuildLifetime : FrostingLifetime<BuildContext>
+    public override void Setup(BuildContext context)
+    {
+        context.StartGroup("Build Setup");
+        context.EndGroup();
+    }
+    public override void Teardown(BuildContext context, ITeardownContext info)
     {
-        public override void Setup(BuildContext context)
-        {
-            context.StartGroup("Build Setup");
-            context.EndGroup();
-        }
-        public override void Teardown(BuildContext context, ITeardownContext info)
-        {
-            context.StartGroup("Build Teardown");
-            context.EndGroup();
-        }
+        context.StartGroup("Build Teardown");
+        context.EndGroup();
     }
-}
+}
\ No newline at end of file
diff --git a/build/chores/Startup.cs b/build/chores/Startup.cs
index 35b4428d16..eae706c98e 100644
--- a/build/chores/Startup.cs
+++ b/build/chores/Startup.cs
@@ -2,14 +2,13 @@
 using Common.Lifetime;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Chores
+namespace Chores;
+
+public class Startup : IFrostingStartup
 {
-    public class Startup : IFrostingStartup
+    public void Configure(IServiceCollection services)
     {
-        public void Configure(IServiceCollection services)
-        {
-            services.UseLifetime<BuildLifetime>();
-            services.UseTaskLifetime<BuildTaskLifetime>();
-        }
+        services.UseLifetime<BuildLifetime>();
+        services.UseTaskLifetime<BuildTaskLifetime>();
     }
-}
+}
\ No newline at end of file
diff --git a/build/chores/Tasks/Default.cs b/build/chores/Tasks/Default.cs
index 43d8a5b4d1..f6c30d9c64 100644
--- a/build/chores/Tasks/Default.cs
+++ b/build/chores/Tasks/Default.cs
@@ -1,9 +1,8 @@
 using Cake.Frosting;
 
-namespace Chores.Tasks
+namespace Chores.Tasks;
+
+[TaskDescription("Shows this output")]
+public class Default : Common.Tasks.Default
 {
-    [TaskDescription("Shows this output")]
-    public class Default : Common.Tasks.Default
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/build/chores/Tasks/ToolsInstall.cs b/build/chores/Tasks/ToolsInstall.cs
index a4cc2dbd87..8932698692 100644
--- a/build/chores/Tasks/ToolsInstall.cs
+++ b/build/chores/Tasks/ToolsInstall.cs
@@ -3,23 +3,22 @@
 using Cake.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Chores.Tasks
+namespace Chores.Tasks;
+
+[TaskName(nameof(ToolsInstall))]
+[TaskDescription("Install dotnet global tools to 'tools' folder")]
+public class ToolsInstall : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(ToolsInstall))]
-    [TaskDescription("Install dotnet global tools to 'tools' folder")]
-    public class ToolsInstall : FrostingTask<BuildContext>
+    public override void Run(BuildContext context)
     {
-        public override void Run(BuildContext context)
-        {
-            var json = context.ParseJsonFromFile("dotnet-tools.json");
-            var jToken = json["tools"];
-            if (jToken == null) return;
+        var json = context.ParseJsonFromFile("dotnet-tools.json");
+        var jToken = json["tools"];
+        if (jToken == null) return;
 
-            var tools = jToken.Select(x => (JProperty)x).ToDictionary(x => x.Name, x => x.Value["version"]?.Value<string>());
-            foreach (var (toolName, version) in tools)
-            {
-                // context.DotNetCoreTool($"tool update --tool-path {context.Configuration.GetToolPath()} --version {version} {toolName}");
-            }
+        var tools = jToken.Select(x => (JProperty)x).ToDictionary(x => x.Name, x => x.Value["version"]?.Value<string>());
+        foreach (var (toolName, version) in tools)
+        {
+            // context.DotNetCoreTool($"tool update --tool-path {context.Configuration.GetToolPath()} --version {version} {toolName}");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/build/chores/Tasks/ToolsUpdate.cs b/build/chores/Tasks/ToolsUpdate.cs
index c91f29fedb..f5091a812a 100644
--- a/build/chores/Tasks/ToolsUpdate.cs
+++ b/build/chores/Tasks/ToolsUpdate.cs
@@ -4,24 +4,23 @@
 using Cake.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Chores.Tasks
+namespace Chores.Tasks;
+
+[TaskName(nameof(ToolsUpdate))]
+[TaskDescription("Update dotnet local tools")]
+public class ToolsUpdate : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(ToolsUpdate))]
-    [TaskDescription("Update dotnet local tools")]
-    public class ToolsUpdate : FrostingTask<BuildContext>
+    public override void Run(BuildContext context)
     {
-        public override void Run(BuildContext context)
+        var json = context.ParseJsonFromFile("dotnet-tools.json");
+        var jToken = json["tools"];
+        if (jToken != null)
         {
-            var json = context.ParseJsonFromFile("dotnet-tools.json");
-            var jToken = json["tools"];
-            if (jToken != null)
+            var tools = jToken.Select(x => ((JProperty)x).Name).ToArray();
+            foreach (var tool in tools)
             {
-                var tools = jToken.Select(x => ((JProperty)x).Name).ToArray();
-                foreach (var tool in tools)
-                {
-                    context.DotNetCoreTool($"tool update --local {tool}");
-                }
+                context.DotNetCoreTool($"tool update --local {tool}");
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatAliases.cs b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatAliases.cs
index 25b42eeee7..6e87e9b65b 100644
--- a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatAliases.cs
+++ b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatAliases.cs
@@ -1,36 +1,35 @@
 using Cake.Core;
 using Cake.Core.Annotations;
 
-namespace Common.Addins.Cake.DotNetCoreFormat
+namespace Common.Addins.Cake.DotNetCoreFormat;
+
+/// <summary>
+/// <para>Contains aliases related to <see href="https://github.com/dotnet/format">dotnet format</see>.</para>
+/// <para>
+/// In order to use the commands for this addin, you will need to include the following in your build.cake file to download and
+/// reference from NuGet.org:
+/// <code>
+/// #addin Cake.DotNetFormat
+/// </code>
+/// </para>
+/// </summary>
+[CakeAliasCategory("DotNetCoreFormat")]
+public static class DotNetCoreFormatAliases
 {
     /// <summary>
-    /// <para>Contains aliases related to <see href="https://github.com/dotnet/format">dotnet format</see>.</para>
-    /// <para>
-    /// In order to use the commands for this addin, you will need to include the following in your build.cake file to download and
-    /// reference from NuGet.org:
-    /// <code>
-    /// #addin Cake.DotNetFormat
-    /// </code>
-    /// </para>
+    /// Formats the code using the given settings.
     /// </summary>
-    [CakeAliasCategory("DotNetCoreFormat")]
-    public static class DotNetCoreFormatAliases
+    /// <param name="context">The context.</param>
+    /// <param name="settings">The settings.</param>
+    [CakeMethodAlias]
+    public static void DotNetCoreFormat(this ICakeContext context, DotNetCoreFormatSettings settings)
     {
-        /// <summary>
-        /// Formats the code using the given settings.
-        /// </summary>
-        /// <param name="context">The context.</param>
-        /// <param name="settings">The settings.</param>
-        [CakeMethodAlias]
-        public static void DotNetCoreFormat(this ICakeContext context, DotNetCoreFormatSettings settings)
+        if (context is null)
         {
-            if (context is null)
-            {
-                throw new System.ArgumentNullException(nameof(context));
-            }
-
-            var runner = new DotNetCoreFormatToolRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
-            runner.Run(settings);
+            throw new System.ArgumentNullException(nameof(context));
         }
+
+        var runner = new DotNetCoreFormatToolRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
+        runner.Run(settings);
     }
-}
+}
\ No newline at end of file
diff --git a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatSettings.cs b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatSettings.cs
index ce318952b2..af9b5ab8c8 100644
--- a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatSettings.cs
+++ b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatSettings.cs
@@ -1,91 +1,90 @@
 using System.Collections.Generic;
 using Cake.Common.Tools.DotNetCore;
-using Cake.Core.IO;
+using Path = Cake.Core.IO.Path;
 
-namespace Common.Addins.Cake.DotNetCoreFormat
+namespace Common.Addins.Cake.DotNetCoreFormat;
+
+public sealed class DotNetCoreFormatSettings : DotNetCoreSettings
+{
+    /// <summary>
+    /// A path to a solution file, a project file, or a folder containing a solution or project file.
+    /// If a path is not specified then the current directory is used.
+    /// </summary>
+    public Path? Workspace { get; set; }
+
+    /// <summary>
+    /// Whether to treat the <see cref="Workspace"/> argument as a simple folder of files.
+    /// </summary>
+    public bool Folder { get; set; }
+
+    /// <summary>
+    /// Run whitespace formatting. Run by default when not applying fixes.
+    /// </summary>
+    public bool FixWhitespaces { get; set; }
+
+    /// <summary>
+    /// Run code style analyzers and apply fixes.
+    /// </summary>
+    public string? FixStyle { get; set; }
+
+    /// <summary>
+    /// Run 3rd party analyzers and apply fixes.
+    /// </summary>
+    public string? FixAnalyzers { get; set; }
+
+    /// <summary>
+    /// A list of diagnostic ids to use as a filter when fixing code style or 3rd party analyzers.
+    /// </summary>
+    public List<string>? Diagnostics { get; set; }
+
+    /// <summary>
+    /// A list of relative file or folder paths to include in formatting. All files are formatted if empty
+    /// </summary>
+    public List<string>? Include { get; set; }
+
+    /// <summary>
+    /// A list of relative file or folder paths to exclude from formatting.
+    /// </summary>
+    public List<string>? Exclude { get; set; }
+
+    /// <summary>
+    /// Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted.
+    /// </summary>
+    public bool Check { get; set; }
+
+    /// <summary>
+    /// Set the verbosity level. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]
+    /// </summary>
+    public new DotNetFormatVerbosity Verbosity { get; set; } = DotNetFormatVerbosity.Normal;
+}
+
+/// <summary>
+/// Represents verbosity.
+/// </summary>
+public enum DotNetFormatVerbosity
 {
-    public sealed class DotNetCoreFormatSettings : DotNetCoreSettings
-    {
-        /// <summary>
-        /// A path to a solution file, a project file, or a folder containing a solution or project file.
-        /// If a path is not specified then the current directory is used.
-        /// </summary>
-        public Path? Workspace { get; set; }
-
-        /// <summary>
-        /// Whether to treat the <see cref="Workspace"/> argument as a simple folder of files.
-        /// </summary>
-        public bool Folder { get; set; }
-
-        /// <summary>
-        /// Run whitespace formatting. Run by default when not applying fixes.
-        /// </summary>
-        public bool FixWhitespaces { get; set; }
-
-        /// <summary>
-        /// Run code style analyzers and apply fixes.
-        /// </summary>
-        public string? FixStyle { get; set; }
-
-        /// <summary>
-        /// Run 3rd party analyzers and apply fixes.
-        /// </summary>
-        public string? FixAnalyzers { get; set; }
-
-        /// <summary>
-        /// A list of diagnostic ids to use as a filter when fixing code style or 3rd party analyzers.
-        /// </summary>
-        public List<string>? Diagnostics { get; set; }
-
-        /// <summary>
-        /// A list of relative file or folder paths to include in formatting. All files are formatted if empty
-        /// </summary>
-        public List<string>? Include { get; set; }
-
-        /// <summary>
-        /// A list of relative file or folder paths to exclude from formatting.
-        /// </summary>
-        public List<string>? Exclude { get; set; }
-
-        /// <summary>
-        /// Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted.
-        /// </summary>
-        public bool Check { get; set; }
-
-        /// <summary>
-        /// Set the verbosity level. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]
-        /// </summary>
-        public new DotNetFormatVerbosity Verbosity { get; set; } = DotNetFormatVerbosity.Normal;
-    }
+    /// <summary>
+    /// Quiet verbosity.
+    /// </summary>
+    Quiet = 0,
+
+    /// <summary>
+    /// Minimal verbosity.
+    /// </summary>
+    Minimal = 1,
+
+    /// <summary>
+    /// Normal verbosity.
+    /// </summary>
+    Normal = 2,
+
+    /// <summary>
+    /// Detailed verbosity.
+    /// </summary>
+    Detailed = 3,
 
     /// <summary>
-    /// Represents verbosity.
+    /// Diagnostic verbosity.
     /// </summary>
-    public enum DotNetFormatVerbosity
-    {
-        /// <summary>
-        /// Quiet verbosity.
-        /// </summary>
-        Quiet = 0,
-
-        /// <summary>
-        /// Minimal verbosity.
-        /// </summary>
-        Minimal = 1,
-
-        /// <summary>
-        /// Normal verbosity.
-        /// </summary>
-        Normal = 2,
-
-        /// <summary>
-        /// Detailed verbosity.
-        /// </summary>
-        Detailed = 3,
-
-        /// <summary>
-        /// Diagnostic verbosity.
-        /// </summary>
-        Diagnostic = 4
-    }
+    Diagnostic = 4
 }
diff --git a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatToolRunner.cs b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatToolRunner.cs
index 9a0727cc56..cb27f20735 100644
--- a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatToolRunner.cs
+++ b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatToolRunner.cs
@@ -4,75 +4,74 @@
 using Cake.Core.IO;
 using Cake.Core.Tooling;
 
-namespace Common.Addins.Cake.DotNetCoreFormat
+namespace Common.Addins.Cake.DotNetCoreFormat;
+
+public sealed class DotNetCoreFormatToolRunner : Tool<DotNetCoreFormatSettings>
 {
-    public sealed class DotNetCoreFormatToolRunner : Tool<DotNetCoreFormatSettings>
+    public DotNetCoreFormatToolRunner(
+        IFileSystem fileSystem,
+        ICakeEnvironment environment,
+        IProcessRunner processRunner,
+        IToolLocator tools) : base(fileSystem, environment, processRunner, tools)
+    {
+    }
+
+    public void Run(DotNetCoreFormatSettings settings)
     {
-        public DotNetCoreFormatToolRunner(
-            IFileSystem fileSystem,
-            ICakeEnvironment environment,
-            IProcessRunner processRunner,
-            IToolLocator tools) : base(fileSystem, environment, processRunner, tools)
+        if (settings == null)
         {
+            throw new ArgumentNullException(nameof(settings));
         }
+        Run(settings, GetArguments(settings));
+    }
+
+    protected override string GetToolName()
+    {
+        return "Format";
+    }
+
+    protected override IEnumerable<string> GetToolExecutableNames()
+    {
+        return new[] { "dotnet-format", "dotnet-format.exe" };
+    }
+
+    private static ProcessArgumentBuilder GetArguments(DotNetCoreFormatSettings settings)
+    {
+        ProcessArgumentBuilder arguments = new();
+        arguments.Append(settings.Workspace != null ? settings.Workspace.ToString() : settings.WorkingDirectory.ToString());
 
-        public void Run(DotNetCoreFormatSettings settings)
+        if (settings.Folder)
         {
-            if (settings == null)
-            {
-                throw new ArgumentNullException(nameof(settings));
-            }
-            Run(settings, GetArguments(settings));
+            arguments.Append("--folder");
         }
-
-        protected override string GetToolName()
+        if (settings.FixWhitespaces)
         {
-            return "Format";
+            arguments.Append("--fix-whitespace");
         }
-
-        protected override IEnumerable<string> GetToolExecutableNames()
+        if (settings.FixStyle != null)
         {
-            return new[] { "dotnet-format", "dotnet-format.exe" };
+            arguments.AppendSwitch("--fix-style", " ", settings.FixStyle);
         }
-
-        private static ProcessArgumentBuilder GetArguments(DotNetCoreFormatSettings settings)
+        if (settings.FixAnalyzers != null)
         {
-            ProcessArgumentBuilder arguments = new();
-            arguments.Append(settings.Workspace != null ? settings.Workspace.ToString() : settings.WorkingDirectory.ToString());
-
-            if (settings.Folder)
-            {
-                arguments.Append("--folder");
-            }
-            if (settings.FixWhitespaces)
-            {
-                arguments.Append("--fix-whitespace");
-            }
-            if (settings.FixStyle != null)
-            {
-                arguments.AppendSwitch("--fix-style", " ", settings.FixStyle);
-            }
-            if (settings.FixAnalyzers != null)
-            {
-                arguments.AppendSwitch("--fix-analyzers", " ", settings.FixAnalyzers);
-            }
-            if (settings.Diagnostics != null)
-            {
-                arguments.AppendSwitch("--diagnostics", " ", string.Join(" ", settings.Diagnostics));
-            }
-            if (settings.Include != null)
-            {
-                arguments.AppendSwitch("--include", " ", string.Join(" ", settings.Include));
-            }
-            if (settings.Exclude != null)
-            {
-                arguments.AppendSwitch("--exclude", " ", string.Join(" ", settings.Exclude));
-            }
-            if (settings.Check)
-            {
-                arguments.Append("--check");
-            }
-            return arguments;
+            arguments.AppendSwitch("--fix-analyzers", " ", settings.FixAnalyzers);
+        }
+        if (settings.Diagnostics != null)
+        {
+            arguments.AppendSwitch("--diagnostics", " ", string.Join(" ", settings.Diagnostics));
+        }
+        if (settings.Include != null)
+        {
+            arguments.AppendSwitch("--include", " ", string.Join(" ", settings.Include));
+        }
+        if (settings.Exclude != null)
+        {
+            arguments.AppendSwitch("--exclude", " ", string.Join(" ", settings.Exclude));
+        }
+        if (settings.Check)
+        {
+            arguments.Append("--check");
         }
+        return arguments;
     }
-}
+}
\ No newline at end of file
diff --git a/build/common/Addins/GitVersion/GitVersion.cs b/build/common/Addins/GitVersion/GitVersion.cs
index 88ad875fb4..a194cffc19 100644
--- a/build/common/Addins/GitVersion/GitVersion.cs
+++ b/build/common/Addins/GitVersion/GitVersion.cs
@@ -1,133 +1,132 @@
-namespace Common.Addins.GitVersion
+namespace Common.Addins.GitVersion;
+
+/// <summary>
+/// GitVersion information.
+/// </summary>
+public sealed class GitVersion
 {
     /// <summary>
-    /// GitVersion information.
-    /// </summary>
-    public sealed class GitVersion
-    {
-        /// <summary>
-        /// Gets or sets the major version.
-        /// </summary>
-        public int Major { get; set; }
-
-        /// <summary>
-        /// Gets or sets the minor version.
-        /// </summary>
-        public int Minor { get; set; }
-
-        /// <summary>
-        /// Gets or sets the patch version.
-        /// </summary>
-        public int Patch { get; set; }
-
-        /// <summary>
-        /// Gets or sets the pre-release tag.
-        /// </summary>
-        public string? PreReleaseTag { get; set; }
-
-        /// <summary>
-        /// Gets or sets the pre-release tag with dash.
-        /// </summary>
-        public string? PreReleaseTagWithDash { get; set; }
-
-        /// <summary>
-        /// Gets or sets the pre-release label.
-        /// </summary>
-        public string? PreReleaseLabel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the pre-release number.
-        /// </summary>
-        public int? PreReleaseNumber { get; set; }
-
-        /// <summary>
-        /// Gets or sets the build metadata.
-        /// </summary>
-        public string? BuildMetaData { get; set; }
-
-        /// <summary>
-        /// Gets or sets the build metadata padded.
-        /// </summary>
-        public string? BuildMetaDataPadded { get; set; }
-
-        /// <summary>
-        /// Gets or sets the major version.
-        /// </summary>
-        public string? FullBuildMetaData { get; set; }
-
-        /// <summary>
-        /// Gets or sets the major, minor, and path.
-        /// </summary>
-        public string? MajorMinorPatch { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Semantic Version.
-        /// </summary>
-        public string? SemVer { get; set; }
-
-        /// <summary>
-        /// Gets or sets the legacy Semantic Version.
-        /// </summary>
-        public string? LegacySemVer { get; set; }
-
-        /// <summary>
-        /// Gets or sets the padded legacy Semantic Version.
-        /// </summary>
-        public string? LegacySemVerPadded { get; set; }
-
-        /// <summary>
-        /// Gets or sets the assembly Semantic Version.
-        /// </summary>
-        public string? AssemblySemVer { get; set; }
-
-        /// <summary>
-        /// Gets or sets the assembly semantic file version.
-        /// </summary>
-        public string? AssemblySemFileVer { get; set; }
-
-        /// <summary>
-        /// Gets or sets the full Semantic Version.
-        /// </summary>
-        public string? FullSemVer { get; set; }
-
-        /// <summary>
-        /// Gets or sets the informational version.
-        /// </summary>
-        public string? InformationalVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets the branch name.
-        /// </summary>
-        public string? BranchName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Git SHA.
-        /// </summary>
-        public string? Sha { get; set; }
-
-        /// <summary>
-        /// Gets or sets the NuGet version for v2.
-        /// </summary>
-        public string? NuGetVersionV2 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the NuGet version.
-        /// </summary>
-        public string? NuGetVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets the commits since version source.
-        /// </summary>
-        public int? CommitsSinceVersionSource { get; set; }
-
-        /// <summary>
-        /// Gets or sets the commits since version source padded.
-        /// </summary>
-        public string? CommitsSinceVersionSourcePadded { get; set; }
-
-        /// <summary>
-        /// Gets or sets the commit date.
-        /// </summary>
-        public string? CommitDate { get; set; }
-    }
-}
+    /// Gets or sets the major version.
+    /// </summary>
+    public int Major { get; set; }
+
+    /// <summary>
+    /// Gets or sets the minor version.
+    /// </summary>
+    public int Minor { get; set; }
+
+    /// <summary>
+    /// Gets or sets the patch version.
+    /// </summary>
+    public int Patch { get; set; }
+
+    /// <summary>
+    /// Gets or sets the pre-release tag.
+    /// </summary>
+    public string? PreReleaseTag { get; set; }
+
+    /// <summary>
+    /// Gets or sets the pre-release tag with dash.
+    /// </summary>
+    public string? PreReleaseTagWithDash { get; set; }
+
+    /// <summary>
+    /// Gets or sets the pre-release label.
+    /// </summary>
+    public string? PreReleaseLabel { get; set; }
+
+    /// <summary>
+    /// Gets or sets the pre-release number.
+    /// </summary>
+    public int? PreReleaseNumber { get; set; }
+
+    /// <summary>
+    /// Gets or sets the build metadata.
+    /// </summary>
+    public string? BuildMetaData { get; set; }
+
+    /// <summary>
+    /// Gets or sets the build metadata padded.
+    /// </summary>
+    public string? BuildMetaDataPadded { get; set; }
+
+    /// <summary>
+    /// Gets or sets the major version.
+    /// </summary>
+    public string? FullBuildMetaData { get; set; }
+
+    /// <summary>
+    /// Gets or sets the major, minor, and path.
+    /// </summary>
+    public string? MajorMinorPatch { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Semantic Version.
+    /// </summary>
+    public string? SemVer { get; set; }
+
+    /// <summary>
+    /// Gets or sets the legacy Semantic Version.
+    /// </summary>
+    public string? LegacySemVer { get; set; }
+
+    /// <summary>
+    /// Gets or sets the padded legacy Semantic Version.
+    /// </summary>
+    public string? LegacySemVerPadded { get; set; }
+
+    /// <summary>
+    /// Gets or sets the assembly Semantic Version.
+    /// </summary>
+    public string? AssemblySemVer { get; set; }
+
+    /// <summary>
+    /// Gets or sets the assembly semantic file version.
+    /// </summary>
+    public string? AssemblySemFileVer { get; set; }
+
+    /// <summary>
+    /// Gets or sets the full Semantic Version.
+    /// </summary>
+    public string? FullSemVer { get; set; }
+
+    /// <summary>
+    /// Gets or sets the informational version.
+    /// </summary>
+    public string? InformationalVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the branch name.
+    /// </summary>
+    public string? BranchName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Git SHA.
+    /// </summary>
+    public string? Sha { get; set; }
+
+    /// <summary>
+    /// Gets or sets the NuGet version for v2.
+    /// </summary>
+    public string? NuGetVersionV2 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the NuGet version.
+    /// </summary>
+    public string? NuGetVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the commits since version source.
+    /// </summary>
+    public int? CommitsSinceVersionSource { get; set; }
+
+    /// <summary>
+    /// Gets or sets the commits since version source padded.
+    /// </summary>
+    public string? CommitsSinceVersionSourcePadded { get; set; }
+
+    /// <summary>
+    /// Gets or sets the commit date.
+    /// </summary>
+    public string? CommitDate { get; set; }
+}
\ No newline at end of file
diff --git a/build/common/Addins/GitVersion/GitVersionAliases.cs b/build/common/Addins/GitVersion/GitVersionAliases.cs
index 2e4b178feb..a3a98fb545 100644
--- a/build/common/Addins/GitVersion/GitVersionAliases.cs
+++ b/build/common/Addins/GitVersion/GitVersionAliases.cs
@@ -2,119 +2,118 @@
 using Cake.Core;
 using Cake.Core.Annotations;
 
-namespace Common.Addins.GitVersion
+namespace Common.Addins.GitVersion;
+
+/// <summary>
+/// <para>Contains functionality related to <see href="https://github.com/gittools/gitversion">GitVersion</see>.</para>
+/// <para>
+/// In order to use the commands for this alias, include the following in your build.cake file to download and
+/// install from nuget.org, or specify the ToolPath within the <see cref="GitVersionSettings" /> class:
+/// <code>
+/// #tool "nuget:?package=GitVersion.CommandLine"
+/// </code>
+/// </para>
+/// </summary>
+[CakeAliasCategory("GitVersion")]
+public static class GitVersionAliases
 {
     /// <summary>
-    /// <para>Contains functionality related to <see href="https://github.com/gittools/gitversion">GitVersion</see>.</para>
-    /// <para>
-    /// In order to use the commands for this alias, include the following in your build.cake file to download and
-    /// install from nuget.org, or specify the ToolPath within the <see cref="GitVersionSettings" /> class:
+    /// Retrieves the GitVersion output.
+    /// </summary>
+    /// <param name="context">The context.</param>
+    /// <returns>The Git version info.</returns>
+    /// <example>
+    /// <para>Update the assembly info files for the project.</para>
+    /// <para>Cake task:</para>
     /// <code>
-    /// #tool "nuget:?package=GitVersion.CommandLine"
+    /// <![CDATA[
+    /// Task("UpdateAssemblyInfo")
+    ///     .Does(() =>
+    /// {
+    ///     GitVersion(new GitVersionSettings {
+    ///         UpdateAssemblyInfo = true
+    ///     });
+    /// });
+    /// ]]>
     /// </code>
-    /// </para>
-    /// </summary>
-    [CakeAliasCategory("GitVersion")]
-    public static class GitVersionAliases
+    /// <para>Get the Git version info for the project using a dynamic repository.</para>
+    /// <para>Cake task:</para>
+    /// <code>
+    /// <![CDATA[
+    /// Task("GetVersionInfo")
+    ///     .Does(() =>
+    /// {
+    ///     var result = GitVersion(new GitVersionSettings {
+    ///         UserName = "MyUser",
+    ///         Password = "MyPassword,
+    ///         Url = "http://git.myhost.com/myproject.git"
+    ///         Branch = "develop"
+    ///         Commit = EnvironmentVariable("MY_COMMIT")
+    ///     });
+    ///     // Use result for building NuGet packages, setting build server version, etc...
+    /// });
+    /// ]]>
+    /// </code>
+    /// </example>
+    [CakeMethodAlias]
+    public static GitVersion GitVersion(this ICakeContext context)
     {
-        /// <summary>
-        /// Retrieves the GitVersion output.
-        /// </summary>
-        /// <param name="context">The context.</param>
-        /// <returns>The Git version info.</returns>
-        /// <example>
-        /// <para>Update the assembly info files for the project.</para>
-        /// <para>Cake task:</para>
-        /// <code>
-        /// <![CDATA[
-        /// Task("UpdateAssemblyInfo")
-        ///     .Does(() =>
-        /// {
-        ///     GitVersion(new GitVersionSettings {
-        ///         UpdateAssemblyInfo = true
-        ///     });
-        /// });
-        /// ]]>
-        /// </code>
-        /// <para>Get the Git version info for the project using a dynamic repository.</para>
-        /// <para>Cake task:</para>
-        /// <code>
-        /// <![CDATA[
-        /// Task("GetVersionInfo")
-        ///     .Does(() =>
-        /// {
-        ///     var result = GitVersion(new GitVersionSettings {
-        ///         UserName = "MyUser",
-        ///         Password = "MyPassword,
-        ///         Url = "http://git.myhost.com/myproject.git"
-        ///         Branch = "develop"
-        ///         Commit = EnvironmentVariable("MY_COMMIT")
-        ///     });
-        ///     // Use result for building NuGet packages, setting build server version, etc...
-        /// });
-        /// ]]>
-        /// </code>
-        /// </example>
-        [CakeMethodAlias]
-        public static GitVersion GitVersion(this ICakeContext context)
+        if (context == null)
         {
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
-            return GitVersion(context, new GitVersionSettings());
+            throw new ArgumentNullException(nameof(context));
         }
 
-        /// <summary>
-        /// Retrieves the GitVersion output.
-        /// </summary>
-        /// <param name="context">The context.</param>
-        /// <param name="settings">The GitVersion settings.</param>
-        /// <returns>The Git version info.</returns>
-        /// <example>
-        /// <para>Update the assembly info files for the project.</para>
-        /// <para>Cake task:</para>
-        /// <code>
-        /// <![CDATA[
-        /// Task("UpdateAssemblyInfo")
-        ///     .Does(() =>
-        /// {
-        ///     GitVersion(new GitVersionSettings {
-        ///         UpdateAssemblyInfo = true
-        ///     });
-        /// });
-        /// ]]>
-        /// </code>
-        /// <para>Get the Git version info for the project using a dynamic repository.</para>
-        /// <para>Cake task:</para>
-        /// <code>
-        /// <![CDATA[
-        /// Task("GetVersionInfo")
-        ///     .Does(() =>
-        /// {
-        ///     var result = GitVersion(new GitVersionSettings {
-        ///         UserName = "MyUser",
-        ///         Password = "MyPassword,
-        ///         Url = "http://git.myhost.com/myproject.git"
-        ///         Branch = "develop"
-        ///         Commit = EnvironmentVariable("MY_COMMIT")
-        ///     });
-        ///     // Use result for building NuGet packages, setting build server version, etc...
-        /// });
-        /// ]]>
-        /// </code>
-        /// </example>
-        [CakeMethodAlias]
-        public static GitVersion GitVersion(this ICakeContext context, GitVersionSettings settings)
-        {
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
+        return GitVersion(context, new GitVersionSettings());
+    }
 
-            var gitVersionRunner = new GitVersionRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools, context.Log);
-            return gitVersionRunner.Run(settings);
+    /// <summary>
+    /// Retrieves the GitVersion output.
+    /// </summary>
+    /// <param name="context">The context.</param>
+    /// <param name="settings">The GitVersion settings.</param>
+    /// <returns>The Git version info.</returns>
+    /// <example>
+    /// <para>Update the assembly info files for the project.</para>
+    /// <para>Cake task:</para>
+    /// <code>
+    /// <![CDATA[
+    /// Task("UpdateAssemblyInfo")
+    ///     .Does(() =>
+    /// {
+    ///     GitVersion(new GitVersionSettings {
+    ///         UpdateAssemblyInfo = true
+    ///     });
+    /// });
+    /// ]]>
+    /// </code>
+    /// <para>Get the Git version info for the project using a dynamic repository.</para>
+    /// <para>Cake task:</para>
+    /// <code>
+    /// <![CDATA[
+    /// Task("GetVersionInfo")
+    ///     .Does(() =>
+    /// {
+    ///     var result = GitVersion(new GitVersionSettings {
+    ///         UserName = "MyUser",
+    ///         Password = "MyPassword,
+    ///         Url = "http://git.myhost.com/myproject.git"
+    ///         Branch = "develop"
+    ///         Commit = EnvironmentVariable("MY_COMMIT")
+    ///     });
+    ///     // Use result for building NuGet packages, setting build server version, etc...
+    /// });
+    /// ]]>
+    /// </code>
+    /// </example>
+    [CakeMethodAlias]
+    public static GitVersion GitVersion(this ICakeContext context, GitVersionSettings settings)
+    {
+        if (context == null)
+        {
+            throw new ArgumentNullException(nameof(context));
         }
+
+        var gitVersionRunner = new GitVersionRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools, context.Log);
+        return gitVersionRunner.Run(settings);
     }
-}
+}
\ No newline at end of file
diff --git a/build/common/Addins/GitVersion/GitVersionOutput.cs b/build/common/Addins/GitVersion/GitVersionOutput.cs
index e8051a7e0a..1425687bd3 100644
--- a/build/common/Addins/GitVersion/GitVersionOutput.cs
+++ b/build/common/Addins/GitVersion/GitVersionOutput.cs
@@ -1,18 +1,17 @@
-namespace Common.Addins.GitVersion
+namespace Common.Addins.GitVersion;
+
+/// <summary>
+/// The Git version output type.
+/// </summary>
+public enum GitVersionOutput
 {
     /// <summary>
-    /// The Git version output type.
+    /// Outputs to the stdout using json.
     /// </summary>
-    public enum GitVersionOutput
-    {
-        /// <summary>
-        /// Outputs to the stdout using json.
-        /// </summary>
-        Json,
+    Json,
 
-        /// <summary>
-        /// Outputs to the stdout in a way usable by a detected build server.
-        /// </summary>
-        BuildServer
-    }
-}
+    /// <summary>
+    /// Outputs to the stdout in a way usable by a detected build server.
+    /// </summary>
+    BuildServer
+}
\ No newline at end of file
diff --git a/build/common/Addins/GitVersion/GitVersionRunner.cs b/build/common/Addins/GitVersion/GitVersionRunner.cs
index 5f255845be..a6db863a91 100644
--- a/build/common/Addins/GitVersion/GitVersionRunner.cs
+++ b/build/common/Addins/GitVersion/GitVersionRunner.cs
@@ -8,180 +8,179 @@
 using Cake.Core.Tooling;
 using Newtonsoft.Json;
 
-namespace Common.Addins.GitVersion
+namespace Common.Addins.GitVersion;
+
+/// <summary>
+/// The GitVersion runner.
+/// </summary>
+public sealed class GitVersionRunner : Tool<GitVersionSettings>
 {
+    private readonly ICakeLog log;
+
     /// <summary>
-    /// The GitVersion runner.
+    /// Initializes a new instance of the <see cref="GitVersionRunner"/> class.
     /// </summary>
-    public sealed class GitVersionRunner : Tool<GitVersionSettings>
+    /// <param name="fileSystem">The file system.</param>
+    /// <param name="environment">The environment.</param>
+    /// <param name="processRunner">The process runner.</param>
+    /// <param name="tools">The tool locator.</param>
+    /// <param name="log">The log.</param>
+    public GitVersionRunner(
+        IFileSystem fileSystem,
+        ICakeEnvironment environment,
+        IProcessRunner processRunner,
+        IToolLocator tools,
+        ICakeLog log) : base(fileSystem, environment, processRunner, tools)
     {
-        private readonly ICakeLog log;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GitVersionRunner"/> class.
-        /// </summary>
-        /// <param name="fileSystem">The file system.</param>
-        /// <param name="environment">The environment.</param>
-        /// <param name="processRunner">The process runner.</param>
-        /// <param name="tools">The tool locator.</param>
-        /// <param name="log">The log.</param>
-        public GitVersionRunner(
-            IFileSystem fileSystem,
-            ICakeEnvironment environment,
-            IProcessRunner processRunner,
-            IToolLocator tools,
-            ICakeLog log) : base(fileSystem, environment, processRunner, tools)
+        this.log = log;
+    }
+
+    /// <summary>
+    /// Runs GitVersion and processes the results.
+    /// </summary>
+    /// <param name="settings">The settings.</param>
+    /// <returns>A task with the GitVersion results.</returns>
+    public GitVersion Run(GitVersionSettings settings)
+    {
+        if (settings == null)
         {
-            this.log = log;
+            throw new ArgumentNullException(nameof(settings));
         }
 
-        /// <summary>
-        /// Runs GitVersion and processes the results.
-        /// </summary>
-        /// <param name="settings">The settings.</param>
-        /// <returns>A task with the GitVersion results.</returns>
-        public GitVersion Run(GitVersionSettings settings)
+        var output = string.Empty;
+        Run(settings, GetArguments(settings), new ProcessSettings { RedirectStandardOutput = true }, process =>
         {
-            if (settings == null)
+            output = string.Join("\n", process.GetStandardOutput());
+            if (log.Verbosity < Verbosity.Diagnostic)
             {
-                throw new ArgumentNullException(nameof(settings));
-            }
-
-            var output = string.Empty;
-            Run(settings, GetArguments(settings), new ProcessSettings { RedirectStandardOutput = true }, process =>
-            {
-                output = string.Join("\n", process.GetStandardOutput());
-                if (log.Verbosity < Verbosity.Diagnostic)
+                var errors = Regex.Matches(output, @"( *ERROR:? [^\n]*)\n([^\n]*)").Cast<Match>()
+                    .SelectMany(match => new[] { match.Groups[1].Value, match.Groups[2].Value });
+                foreach (var error in errors)
                 {
-                    var errors = Regex.Matches(output, @"( *ERROR:? [^\n]*)\n([^\n]*)").Cast<Match>()
-                        .SelectMany(match => new[] { match.Groups[1].Value, match.Groups[2].Value });
-                    foreach (var error in errors)
-                    {
-                        log.Error(error);
-                    }
+                    log.Error(error);
                 }
-            });
+            }
+        });
 
-            if (!settings.OutputTypes.Contains(GitVersionOutput.Json))
-                return new GitVersion();
+        if (!settings.OutputTypes.Contains(GitVersionOutput.Json))
+            return new GitVersion();
 
-            var jsonStartIndex = output.IndexOf("{", StringComparison.Ordinal);
-            var jsonEndIndex = output.IndexOf("}", StringComparison.Ordinal);
-            var json = output.Substring(jsonStartIndex, jsonEndIndex - jsonStartIndex + 1);
+        var jsonStartIndex = output.IndexOf("{", StringComparison.Ordinal);
+        var jsonEndIndex = output.IndexOf("}", StringComparison.Ordinal);
+        var json = output.Substring(jsonStartIndex, jsonEndIndex - jsonStartIndex + 1);
 
-            return JsonConvert.DeserializeObject<GitVersion>(json);
-        }
+        return JsonConvert.DeserializeObject<GitVersion>(json);
+    }
 
-        private ProcessArgumentBuilder GetArguments(GitVersionSettings settings)
+    private ProcessArgumentBuilder GetArguments(GitVersionSettings settings)
+    {
+        var builder = new ProcessArgumentBuilder();
+
+        if (settings.OutputTypes.Contains(GitVersionOutput.Json))
+        {
+            builder.Append("-output");
+            builder.Append("json");
+        }
+        if (settings.OutputTypes.Contains(GitVersionOutput.BuildServer))
         {
-            var builder = new ProcessArgumentBuilder();
+            builder.Append("-output");
+            builder.Append("buildserver");
+        }
 
-            if (settings.OutputTypes.Contains(GitVersionOutput.Json))
-            {
-                builder.Append("-output");
-                builder.Append("json");
-            }
-            if (settings.OutputTypes.Contains(GitVersionOutput.BuildServer))
-            {
-                builder.Append("-output");
-                builder.Append("buildserver");
-            }
+        if (!string.IsNullOrWhiteSpace(settings.ShowVariable))
+        {
+            builder.Append("-showvariable");
+            builder.Append(settings.ShowVariable);
+        }
 
-            if (!string.IsNullOrWhiteSpace(settings.ShowVariable))
-            {
-                builder.Append("-showvariable");
-                builder.Append(settings.ShowVariable);
-            }
+        if (!string.IsNullOrWhiteSpace(settings.UserName))
+        {
+            builder.Append("-u");
+            builder.AppendQuoted(settings.UserName);
 
-            if (!string.IsNullOrWhiteSpace(settings.UserName))
-            {
-                builder.Append("-u");
-                builder.AppendQuoted(settings.UserName);
+            builder.Append("-p");
+            builder.AppendQuotedSecret(settings.Password);
+        }
 
-                builder.Append("-p");
-                builder.AppendQuotedSecret(settings.Password);
-            }
+        if (settings.UpdateAssemblyInfo)
+        {
+            builder.Append("-updateassemblyinfo");
 
-            if (settings.UpdateAssemblyInfo)
+            if (settings.UpdateAssemblyInfoFilePath != null)
             {
-                builder.Append("-updateassemblyinfo");
-
-                if (settings.UpdateAssemblyInfoFilePath != null)
-                {
-                    builder.AppendQuoted(settings.UpdateAssemblyInfoFilePath.FullPath);
-                }
+                builder.AppendQuoted(settings.UpdateAssemblyInfoFilePath.FullPath);
             }
+        }
 
-            if (settings.RepositoryPath != null)
+        if (settings.RepositoryPath != null)
+        {
+            builder.Append("-targetpath");
+            builder.AppendQuoted(settings.RepositoryPath.FullPath);
+        }
+        else if (!string.IsNullOrWhiteSpace(settings.Url))
+        {
+            builder.Append("-url");
+            builder.AppendQuoted(settings.Url);
+
+            if (!string.IsNullOrWhiteSpace(settings.Branch))
             {
-                builder.Append("-targetpath");
-                builder.AppendQuoted(settings.RepositoryPath.FullPath);
+                builder.Append("-b");
+                builder.Append(settings.Branch);
             }
-            else if (!string.IsNullOrWhiteSpace(settings.Url))
+            else
             {
-                builder.Append("-url");
-                builder.AppendQuoted(settings.Url);
-
-                if (!string.IsNullOrWhiteSpace(settings.Branch))
-                {
-                    builder.Append("-b");
-                    builder.Append(settings.Branch);
-                }
-                else
-                {
-                    log.Warning("If you leave the branch name for GitVersion unset, it will fallback to the default branch for the repository.");
-                }
-
-                if (!string.IsNullOrWhiteSpace(settings.Commit))
-                {
-                    builder.Append("-c");
-                    builder.AppendQuoted(settings.Commit);
-                }
-
-                if (settings.DynamicRepositoryPath != null)
-                {
-                    builder.Append("-dynamicRepoLocation");
-                    builder.AppendQuoted(settings.DynamicRepositoryPath.FullPath);
-                }
+                log.Warning("If you leave the branch name for GitVersion unset, it will fallback to the default branch for the repository.");
             }
 
-            if (settings.LogFilePath != null)
+            if (!string.IsNullOrWhiteSpace(settings.Commit))
             {
-                builder.Append("-l");
-                builder.AppendQuoted(settings.LogFilePath.FullPath);
+                builder.Append("-c");
+                builder.AppendQuoted(settings.Commit);
             }
 
-            if (settings.NoFetch)
+            if (settings.DynamicRepositoryPath != null)
             {
-                builder.Append("-nofetch");
+                builder.Append("-dynamicRepoLocation");
+                builder.AppendQuoted(settings.DynamicRepositoryPath.FullPath);
             }
+        }
 
-            var verbosity = settings.Verbosity ?? log.Verbosity;
-
-            if (verbosity != Verbosity.Normal)
-            {
-                builder.Append("-verbosity");
-                builder.Append(verbosity.ToString());
-            }
-            return builder;
+        if (settings.LogFilePath != null)
+        {
+            builder.Append("-l");
+            builder.AppendQuoted(settings.LogFilePath.FullPath);
         }
 
-        /// <summary>
-        /// Gets the name of the tool.
-        /// </summary>
-        /// <returns>The name of the tool.</returns>
-        protected override string GetToolName()
+        if (settings.NoFetch)
         {
-            return "GitVersion";
+            builder.Append("-nofetch");
         }
 
-        /// <summary>
-        /// Gets the possible names of the tool executable.
-        /// </summary>
-        /// <returns>The tool executable name.</returns>
-        protected override IEnumerable<string> GetToolExecutableNames()
+        var verbosity = settings.Verbosity ?? log.Verbosity;
+
+        if (verbosity != Verbosity.Normal)
         {
-            return new[] { "GitVersion.exe", "dotnet-gitversion", "dotnet-gitversion.exe", "gitversion" };
+            builder.Append("-verbosity");
+            builder.Append(verbosity.ToString());
         }
+        return builder;
+    }
+
+    /// <summary>
+    /// Gets the name of the tool.
+    /// </summary>
+    /// <returns>The name of the tool.</returns>
+    protected override string GetToolName()
+    {
+        return "GitVersion";
+    }
+
+    /// <summary>
+    /// Gets the possible names of the tool executable.
+    /// </summary>
+    /// <returns>The tool executable name.</returns>
+    protected override IEnumerable<string> GetToolExecutableNames()
+    {
+        return new[] { "GitVersion.exe", "dotnet-gitversion", "dotnet-gitversion.exe", "gitversion" };
     }
-}
+}
\ No newline at end of file
diff --git a/build/common/Addins/GitVersion/GitVersionSettings.cs b/build/common/Addins/GitVersion/GitVersionSettings.cs
index 5f463a098a..6140ef5537 100644
--- a/build/common/Addins/GitVersion/GitVersionSettings.cs
+++ b/build/common/Addins/GitVersion/GitVersionSettings.cs
@@ -3,82 +3,81 @@
 using Cake.Core.IO;
 using Cake.Core.Tooling;
 
-namespace Common.Addins.GitVersion
+namespace Common.Addins.GitVersion;
+
+/// <summary>
+/// Contains settings used by <see cref="GitVersionRunner" />.
+/// </summary>
+public sealed class GitVersionSettings : ToolSettings
 {
     /// <summary>
-    /// Contains settings used by <see cref="GitVersionRunner" />.
+    /// Gets or sets the path for the Git repository to use.
     /// </summary>
-    public sealed class GitVersionSettings : ToolSettings
-    {
-        /// <summary>
-        /// Gets or sets the path for the Git repository to use.
-        /// </summary>
-        public DirectoryPath? RepositoryPath { get; set; }
+    public DirectoryPath? RepositoryPath { get; set; }
 
-        /// <summary>
-        /// Gets or sets the output type.
-        /// </summary>
-        public HashSet<GitVersionOutput> OutputTypes { get; set; } = new() { GitVersionOutput.Json };
+    /// <summary>
+    /// Gets or sets the output type.
+    /// </summary>
+    public HashSet<GitVersionOutput> OutputTypes { get; set; } = new() { GitVersionOutput.Json };
 
-        /// <summary>
-        /// Gets or sets a value indicating whether to update all the AssemblyInfo files.
-        /// </summary>
-        public bool UpdateAssemblyInfo { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether to update all the AssemblyInfo files.
+    /// </summary>
+    public bool UpdateAssemblyInfo { get; set; }
 
-        /// <summary>
-        /// Gets or sets whether to update all the AssemblyInfo files.
-        /// </summary>
-        public FilePath? UpdateAssemblyInfoFilePath { get; set; }
+    /// <summary>
+    /// Gets or sets whether to update all the AssemblyInfo files.
+    /// </summary>
+    public FilePath? UpdateAssemblyInfoFilePath { get; set; }
 
-        /// <summary>
-        /// Gets or sets whether to only show a specific variable.
-        /// </summary>
-        public string? ShowVariable { get; set; }
+    /// <summary>
+    /// Gets or sets whether to only show a specific variable.
+    /// </summary>
+    public string? ShowVariable { get; set; }
 
-        /// <summary>
-        /// Gets or sets the username for the target repository.
-        /// </summary>
-        public string? UserName { get; set; }
+    /// <summary>
+    /// Gets or sets the username for the target repository.
+    /// </summary>
+    public string? UserName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the password for the target repository.
-        /// </summary>
-        public string? Password { get; set; }
+    /// <summary>
+    /// Gets or sets the password for the target repository.
+    /// </summary>
+    public string? Password { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Git URL to use if using dynamic repositories.
-        /// </summary>
-        public string? Url { get; set; }
+    /// <summary>
+    /// Gets or sets the Git URL to use if using dynamic repositories.
+    /// </summary>
+    public string? Url { get; set; }
 
-        /// <summary>
-        /// Gets or sets the branch to use if using dynamic repositories.
-        /// </summary>
-        public string? Branch { get; set; }
+    /// <summary>
+    /// Gets or sets the branch to use if using dynamic repositories.
+    /// </summary>
+    public string? Branch { get; set; }
 
-        /// <summary>
-        /// Gets or sets the branch to use if using dynamic repositories.
-        /// </summary>
-        public string? Commit { get; set; }
+    /// <summary>
+    /// Gets or sets the branch to use if using dynamic repositories.
+    /// </summary>
+    public string? Commit { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether to fetch repository information from remote when calculating version.
-        /// </summary>
-        /// <remarks>If your CI server clones the entire repository you can set this to 'true' to prevent GitVersion attempting any remote repository fetching.</remarks>
-        public bool NoFetch { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether to fetch repository information from remote when calculating version.
+    /// </summary>
+    /// <remarks>If your CI server clones the entire repository you can set this to 'true' to prevent GitVersion attempting any remote repository fetching.</remarks>
+    public bool NoFetch { get; set; }
 
-        /// <summary>
-        /// Gets or sets the dynamic repository path. Defaults to %TEMP%.
-        /// </summary>
-        public DirectoryPath? DynamicRepositoryPath { get; set; }
+    /// <summary>
+    /// Gets or sets the dynamic repository path. Defaults to %TEMP%.
+    /// </summary>
+    public DirectoryPath? DynamicRepositoryPath { get; set; }
 
-        /// <summary>
-        /// Gets or sets the path to the log file.
-        /// </summary>
-        public FilePath? LogFilePath { get; set; }
+    /// <summary>
+    /// Gets or sets the path to the log file.
+    /// </summary>
+    public FilePath? LogFilePath { get; set; }
 
-        /// <summary>
-        /// Gets or sets the logging verbosity.
-        /// </summary>
-        public Verbosity? Verbosity { get; set; }
-    }
-}
+    /// <summary>
+    /// Gets or sets the logging verbosity.
+    /// </summary>
+    public Verbosity? Verbosity { get; set; }
+}
\ No newline at end of file
diff --git a/build/common/Addins/GitVersion/GitVersionVerbosity.cs b/build/common/Addins/GitVersion/GitVersionVerbosity.cs
index f98c297899..6ec33fc7b4 100644
--- a/build/common/Addins/GitVersion/GitVersionVerbosity.cs
+++ b/build/common/Addins/GitVersion/GitVersionVerbosity.cs
@@ -1,34 +1,32 @@
-namespace Common.Addins.GitVersion
+namespace Common.Addins.GitVersion;
+
+/// <summary>
+/// The GitVersion verbosity.
+/// </summary>
+public enum GitVersionVerbosity
 {
     /// <summary>
-    /// The GitVersion verbosity.
+    /// No messages will be logged.
     /// </summary>
-    public enum GitVersionVerbosity
-    {
-        /// <summary>
-        /// No messages will be logged.
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// Log error messages.
-        /// </summary>
-        Error,
+    None,
 
-        /// <summary>
-        /// Log error and warning messages.
-        /// </summary>
-        Warn,
+    /// <summary>
+    /// Log error messages.
+    /// </summary>
+    Error,
 
-        /// <summary>
-        /// Log error, warning and info messages.
-        /// </summary>
-        Info,
+    /// <summary>
+    /// Log error and warning messages.
+    /// </summary>
+    Warn,
 
-        /// <summary>
-        /// Log error, warning, info and debug messages (log all).
-        /// </summary>
-        Debug
-    }
+    /// <summary>
+    /// Log error, warning and info messages.
+    /// </summary>
+    Info,
 
-}
+    /// <summary>
+    /// Log error, warning, info and debug messages (log all).
+    /// </summary>
+    Debug
+}
\ No newline at end of file
diff --git a/build/common/Lifetime/BuildTaskLifetime.cs b/build/common/Lifetime/BuildTaskLifetime.cs
index b73674175a..87b183bd44 100644
--- a/build/common/Lifetime/BuildTaskLifetime.cs
+++ b/build/common/Lifetime/BuildTaskLifetime.cs
@@ -2,15 +2,14 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Common.Lifetime
+namespace Common.Lifetime;
+
+public class BuildTaskLifetime : FrostingTaskLifetime
 {
-    public class BuildTaskLifetime : FrostingTaskLifetime
+    public override void Setup(ICakeContext context, ITaskSetupContext info)
     {
-        public override void Setup(ICakeContext context, ITaskSetupContext info)
-        {
-            var message = $"Task: {info.Task.Name}";
-            context.StartGroup(message);
-        }
-        public override void Teardown(ICakeContext context, ITaskTeardownContext info) => context.EndGroup();
+        var message = $"Task: {info.Task.Name}";
+        context.StartGroup(message);
     }
-}
+    public override void Teardown(ICakeContext context, ITaskTeardownContext info) => context.EndGroup();
+}
\ No newline at end of file
diff --git a/build/common/Tasks/Default.cs b/build/common/Tasks/Default.cs
index 6c090a2891..b7ea0f3a37 100644
--- a/build/common/Tasks/Default.cs
+++ b/build/common/Tasks/Default.cs
@@ -6,34 +6,33 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Common.Tasks
+namespace Common.Tasks;
+
+[TaskName(nameof(Default))]
+[TaskDescription("Shows this output")]
+public class Default : FrostingTask
 {
-    [TaskName(nameof(Default))]
-    [TaskDescription("Shows this output")]
-    public class Default : FrostingTask
+    public override void Run(ICakeContext context)
     {
-        public override void Run(ICakeContext context)
-        {
-            var entryAssembly = Assembly.GetEntryAssembly();
-            var tasks = entryAssembly?.FindAllDerivedTypes(typeof(IFrostingTask)).Where(x => !x.Name.Contains("Internal")).ToList();
-            if (tasks == null) return;
+        var entryAssembly = Assembly.GetEntryAssembly();
+        var tasks = entryAssembly?.FindAllDerivedTypes(typeof(IFrostingTask)).Where(x => !x.Name.Contains("Internal")).ToList();
+        if (tasks == null) return;
 
-            var defaultTask = tasks.Find(x => x.Name.Contains(nameof(Default)));
-            if (tasks.Remove(defaultTask))
-            {
-                tasks.Insert(0, defaultTask);
-            }
+        var defaultTask = tasks.Find(x => x.Name.Contains(nameof(Default)));
+        if (tasks.Remove(defaultTask))
+        {
+            tasks.Insert(0, defaultTask);
+        }
 
-            context.Information($"Available targets:{Environment.NewLine}");
-            foreach (var task in tasks)
-            {
-                var arguments = task.GetTaskArguments();
-                context.Information($"# {task.GetTaskDescription()}");
+        context.Information($"Available targets:{Environment.NewLine}");
+        foreach (var task in tasks)
+        {
+            var arguments = task.GetTaskArguments();
+            context.Information($"# {task.GetTaskDescription()}");
 
-                var taskName = task.GetTaskName();
-                string target = taskName != nameof(Default) ? $"-Target {taskName}" : string.Empty;
-                context.Information($"  ./build.ps1 -Stage {entryAssembly?.GetName().Name} {target} {arguments}\n");
-            }
+            var taskName = task.GetTaskName();
+            string target = taskName != nameof(Default) ? $"-Target {taskName}" : string.Empty;
+            context.Information($"  ./build.ps1 -Stage {entryAssembly?.GetName().Name} {target} {arguments}\n");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/build/common/Utilities/Arguments.cs b/build/common/Utilities/Arguments.cs
index 5413abb2a6..2282b1de2e 100644
--- a/build/common/Utilities/Arguments.cs
+++ b/build/common/Utilities/Arguments.cs
@@ -1,12 +1,11 @@
-namespace Common.Utilities
+namespace Common.Utilities;
+
+public class Arguments
 {
-    public class Arguments
-    {
-        public const string Configuration = "configuration";
-        public const string Architecture = "arch";
-        public const string DotnetTarget = "dotnet_target";
-        public const string DockerRegistry = "docker_registry";
-        public const string DockerDotnetVersion = "docker_dotnetversion";
-        public const string DockerDistro = "docker_distro";
-    }
-}
+    public const string Configuration = "configuration";
+    public const string Architecture = "arch";
+    public const string DotnetTarget = "dotnet_target";
+    public const string DockerRegistry = "docker_registry";
+    public const string DockerDotnetVersion = "docker_dotnetversion";
+    public const string DockerDistro = "docker_distro";
+}
\ No newline at end of file
diff --git a/build/common/Utilities/BuildContextBase.cs b/build/common/Utilities/BuildContextBase.cs
index f1dbcad935..d21049ff9b 100644
--- a/build/common/Utilities/BuildContextBase.cs
+++ b/build/common/Utilities/BuildContextBase.cs
@@ -1,27 +1,26 @@
 using Cake.Core;
 using Cake.Frosting;
 
-namespace Common.Utilities
+namespace Common.Utilities;
+
+public class BuildContextBase : FrostingContext
 {
-    public class BuildContextBase : FrostingContext
+    protected BuildContextBase(ICakeContext context) : base(context)
     {
-        protected BuildContextBase(ICakeContext context) : base(context)
-        {
-        }
-        public BuildVersion? Version { get; set; }
-
-        public bool IsOriginalRepo { get; set; }
-        public bool IsMainBranch { get; set; }
-        public bool IsPullRequest { get; set; }
-        public bool IsTagged { get; set; }
-        public bool IsLocalBuild { get; set; }
-        public bool IsAzurePipelineBuild { get; set; }
-        public bool IsGitHubActionsBuild { get; set; }
-        public bool IsOnWindows { get; set; }
-        public bool IsOnLinux { get; set; }
-        public bool IsOnMacOS { get; set; }
-        public bool IsOnMainBranchOriginalRepo => !IsLocalBuild && IsOriginalRepo && IsMainBranch && !IsPullRequest;
-        public bool IsStableRelease => IsOnMainBranchOriginalRepo && IsTagged;
-        public bool IsPreRelease => IsOnMainBranchOriginalRepo && !IsTagged;
     }
-}
+    public BuildVersion? Version { get; set; }
+
+    public bool IsOriginalRepo { get; set; }
+    public bool IsMainBranch { get; set; }
+    public bool IsPullRequest { get; set; }
+    public bool IsTagged { get; set; }
+    public bool IsLocalBuild { get; set; }
+    public bool IsAzurePipelineBuild { get; set; }
+    public bool IsGitHubActionsBuild { get; set; }
+    public bool IsOnWindows { get; set; }
+    public bool IsOnLinux { get; set; }
+    public bool IsOnMacOS { get; set; }
+    public bool IsOnMainBranchOriginalRepo => !IsLocalBuild && IsOriginalRepo && IsMainBranch && !IsPullRequest;
+    public bool IsStableRelease => IsOnMainBranchOriginalRepo && IsTagged;
+    public bool IsPreRelease => IsOnMainBranchOriginalRepo && !IsTagged;
+}
\ No newline at end of file
diff --git a/build/common/Utilities/BuildLifetimeBase.cs b/build/common/Utilities/BuildLifetimeBase.cs
index 3acbdbb720..9cb703f146 100644
--- a/build/common/Utilities/BuildLifetimeBase.cs
+++ b/build/common/Utilities/BuildLifetimeBase.cs
@@ -8,62 +8,61 @@
 using Cake.Incubator.LoggingExtensions;
 using Common.Addins.GitVersion;
 
-namespace Common.Utilities
+namespace Common.Utilities;
+
+public class BuildLifetimeBase<T> : FrostingLifetime<T> where T : BuildContextBase
 {
-    public class BuildLifetimeBase<T> : FrostingLifetime<T> where T : BuildContextBase
+    public override void Setup(T context)
     {
-        public override void Setup(T context)
-        {
-            var buildSystem = context.BuildSystem();
-            context.IsLocalBuild = buildSystem.IsLocalBuild;
-            context.IsAzurePipelineBuild = buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted;
-            context.IsGitHubActionsBuild = buildSystem.IsRunningOnGitHubActions;
+        var buildSystem = context.BuildSystem();
+        context.IsLocalBuild = buildSystem.IsLocalBuild;
+        context.IsAzurePipelineBuild = buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted;
+        context.IsGitHubActionsBuild = buildSystem.IsRunningOnGitHubActions;
 
-            context.IsPullRequest = buildSystem.IsPullRequest;
-            context.IsOriginalRepo = context.IsOriginalRepo();
-            context.IsMainBranch = context.IsMainBranch();
-            context.IsTagged = context.IsTagged();
+        context.IsPullRequest = buildSystem.IsPullRequest;
+        context.IsOriginalRepo = context.IsOriginalRepo();
+        context.IsMainBranch = context.IsMainBranch();
+        context.IsTagged = context.IsTagged();
 
-            context.IsOnWindows = context.IsRunningOnWindows();
-            context.IsOnLinux = context.IsRunningOnLinux();
-            context.IsOnMacOS = context.IsRunningOnMacOs();
+        context.IsOnWindows = context.IsRunningOnWindows();
+        context.IsOnLinux = context.IsRunningOnLinux();
+        context.IsOnMacOS = context.IsRunningOnMacOs();
 
-            var gitVersion = context.GitVersion(new GitVersionSettings
-            {
-                OutputTypes = new HashSet<GitVersionOutput> { GitVersionOutput.Json, GitVersionOutput.BuildServer }
-            });
-
-            context.Version = BuildVersion.Calculate(gitVersion);
-        }
-        public override void Teardown(T context, ITeardownContext info)
+        var gitVersion = context.GitVersion(new GitVersionSettings
         {
-            context.StartGroup("Build Teardown");
-            try
-            {
-                context.Information("Starting Teardown...");
+            OutputTypes = new HashSet<GitVersionOutput> { GitVersionOutput.Json, GitVersionOutput.BuildServer }
+        });
 
-                context.Information("Pull Request:      {0}", context.IsPullRequest);
-                context.Information("Original Repo:     {0}", context.IsOriginalRepo);
-                context.Information("Main Branch:       {0}", context.IsMainBranch);
-                context.Information("Tagged:            {0}", context.IsTagged);
-
-                context.Information("Finished running tasks.");
-            }
-            catch (Exception exception)
-            {
-                context.Error(exception.Dump());
-            }
-            context.EndGroup();
-        }
-        protected void LogBuildInformation(T context)
+        context.Version = BuildVersion.Calculate(gitVersion);
+    }
+    public override void Teardown(T context, ITeardownContext info)
+    {
+        context.StartGroup("Build Teardown");
+        try
         {
-            context.Information("Version:           {0}", context.Version?.SemVersion);
-            context.Information("Build Agent:       {0}", context.GetBuildAgent());
-            context.Information("OS:                {0}", context.GetOS());
+            context.Information("Starting Teardown...");
+
             context.Information("Pull Request:      {0}", context.IsPullRequest);
             context.Information("Original Repo:     {0}", context.IsOriginalRepo);
             context.Information("Main Branch:       {0}", context.IsMainBranch);
             context.Information("Tagged:            {0}", context.IsTagged);
+
+            context.Information("Finished running tasks.");
         }
+        catch (Exception exception)
+        {
+            context.Error(exception.Dump());
+        }
+        context.EndGroup();
+    }
+    protected void LogBuildInformation(T context)
+    {
+        context.Information("Version:           {0}", context.Version?.SemVersion);
+        context.Information("Build Agent:       {0}", context.GetBuildAgent());
+        context.Information("OS:                {0}", context.GetOS());
+        context.Information("Pull Request:      {0}", context.IsPullRequest);
+        context.Information("Original Repo:     {0}", context.IsOriginalRepo);
+        context.Information("Main Branch:       {0}", context.IsMainBranch);
+        context.Information("Tagged:            {0}", context.IsTagged);
     }
-}
+}
\ No newline at end of file
diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs
index 330c707848..895ba5099d 100644
--- a/build/common/Utilities/Constants.cs
+++ b/build/common/Utilities/Constants.cs
@@ -1,59 +1,58 @@
-namespace Common.Utilities
+namespace Common.Utilities;
+
+public class Constants
 {
-    public class Constants
-    {
-        public const string RepoOwner = "GitTools";
-        public const string Repository = "GitVersion";
+    public const string RepoOwner = "GitTools";
+    public const string Repository = "GitVersion";
 
-        public const string Version50 = "5.0";
-        public const string Version31 = "3.1";
+    public const string Version50 = "5.0";
+    public const string Version31 = "3.1";
 
-        public const string NetVersion50 = "net5.0";
-        public const string CoreFxVersion31 = "netcoreapp3.1";
-        public const string FullFxVersion48 = "net48";
-        public static readonly string[] VersionsToBuild = { Version50, Version31 };
-        public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };
-        public static readonly string[] DistrosToSkip = { Alpine312, Alpine313, Alpine314, Centos7 };
+    public const string NetVersion50 = "net5.0";
+    public const string CoreFxVersion31 = "netcoreapp3.1";
+    public const string FullFxVersion48 = "net48";
+    public static readonly string[] VersionsToBuild = { Version50, Version31 };
+    public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };
+    public static readonly string[] DistrosToSkip = { Alpine312, Alpine313, Alpine314, Centos7 };
 
-        public const string DockerBaseImageName = "gittools/build-images";
-        public const string DockerImageName = "gittools/gitversion";
+    public const string DockerBaseImageName = "gittools/build-images";
+    public const string DockerImageName = "gittools/gitversion";
 
-        public const string DockerHub = "dockerhub";
-        public const string GitHub = "github";
-        public const string DockerHubRegistry = "docker.io";
-        public const string GitHubContainerRegistry = "ghcr.io";
+    public const string DockerHub = "dockerhub";
+    public const string GitHub = "github";
+    public const string DockerHubRegistry = "docker.io";
+    public const string GitHubContainerRegistry = "ghcr.io";
 
-        public const string Arm64 = "arm64";
-        public const string Amd64 = "amd64";
+    public const string Arm64 = "arm64";
+    public const string Amd64 = "amd64";
 
-        public const string Alpine312 = "alpine.3.12";
-        public const string Alpine313 = "alpine.3.13";
-        public const string Alpine314 = "alpine.3.14";
-        public const string Centos7 = "centos.7";
-        public const string Centos8 = "centos.8";
-        public const string Debian9 = "debian.9";
-        public const string Debian10 = "debian.10";
-        public const string Debian11 = "debian.11";
-        public const string Fedora33 = "fedora.33";
-        public const string Ubuntu1804 = "ubuntu.18.04";
-        public const string Ubuntu2004 = "ubuntu.20.04";
-        public const string DockerDistroLatest = Debian10;
-        public static readonly string[] DockerDistrosToBuild =
-        {
-            Alpine312,
-            Alpine313,
-            Alpine314,
-            Centos7,
-            Centos8,
-            Debian9,
-            Debian10,
-            Debian11,
-            Fedora33,
-            Ubuntu1804,
-            Ubuntu2004
-        };
-        public const string NugetOrgUrl = "https://api.nuget.org/v3/index.json";
-        public const string GithubPackagesUrl = "https://nuget.pkg.github.com/gittools/index.json";
-        public const string ChocolateyUrl = "https://push.chocolatey.org/";
-    }
-}
+    public const string Alpine312 = "alpine.3.12";
+    public const string Alpine313 = "alpine.3.13";
+    public const string Alpine314 = "alpine.3.14";
+    public const string Centos7 = "centos.7";
+    public const string Centos8 = "centos.8";
+    public const string Debian9 = "debian.9";
+    public const string Debian10 = "debian.10";
+    public const string Debian11 = "debian.11";
+    public const string Fedora33 = "fedora.33";
+    public const string Ubuntu1804 = "ubuntu.18.04";
+    public const string Ubuntu2004 = "ubuntu.20.04";
+    public const string DockerDistroLatest = Debian10;
+    public static readonly string[] DockerDistrosToBuild =
+    {
+        Alpine312,
+        Alpine313,
+        Alpine314,
+        Centos7,
+        Centos8,
+        Debian9,
+        Debian10,
+        Debian11,
+        Fedora33,
+        Ubuntu1804,
+        Ubuntu2004
+    };
+    public const string NugetOrgUrl = "https://api.nuget.org/v3/index.json";
+    public const string GithubPackagesUrl = "https://nuget.pkg.github.com/gittools/index.json";
+    public const string ChocolateyUrl = "https://push.chocolatey.org/";
+}
\ No newline at end of file
diff --git a/build/common/Utilities/ContextExtensions.cs b/build/common/Utilities/ContextExtensions.cs
index 5541c320ed..fa0240491c 100644
--- a/build/common/Utilities/ContextExtensions.cs
+++ b/build/common/Utilities/ContextExtensions.cs
@@ -8,157 +8,156 @@
 using Cake.Core.IO;
 using Xunit;
 
-namespace Common.Utilities
+namespace Common.Utilities;
+
+public static class ContextExtensions
 {
-    public static class ContextExtensions
+    public static IEnumerable<string> ExecuteCommand(this ICakeContext context, FilePath exe, string? args, DirectoryPath? workDir = null)
     {
-        public static IEnumerable<string> ExecuteCommand(this ICakeContext context, FilePath exe, string? args, DirectoryPath? workDir = null)
+        var processSettings = new ProcessSettings { Arguments = args, RedirectStandardOutput = true };
+        if (workDir is not null)
         {
-            var processSettings = new ProcessSettings { Arguments = args, RedirectStandardOutput = true };
-            if (workDir is not null)
-            {
-                processSettings.WorkingDirectory = workDir;
-            }
-            context.StartProcess(exe, processSettings, out var redirectedOutput);
-            return redirectedOutput.ToList();
+            processSettings.WorkingDirectory = workDir;
         }
+        context.StartProcess(exe, processSettings, out var redirectedOutput);
+        return redirectedOutput.ToList();
+    }
 
-        private static IEnumerable<string> ExecGitCmd(this ICakeContext context, string? cmd, DirectoryPath? workDir = null)
+    private static IEnumerable<string> ExecGitCmd(this ICakeContext context, string? cmd, DirectoryPath? workDir = null)
+    {
+        var gitExe = context.Tools.Resolve(context.IsRunningOnWindows() ? "git.exe" : "git");
+        return context.ExecuteCommand(gitExe, cmd, workDir);
+    }
+
+    public static void GitPushBranch(this ICakeContext context, DirectoryPath repositoryDirectoryPath, string username, string token, string branchName)
+    {
+        var pushUrl = $"https://{username}:{token}@github.com/{Constants.RepoOwner}/{Constants.Repository}";
+        context.ExecGitCmd($"push {pushUrl} {branchName}", workDir: repositoryDirectoryPath);
+    }
+
+    public static bool IsOriginalRepo(this ICakeContext context)
+    {
+        var buildSystem = context.BuildSystem();
+        string repositoryName = string.Empty;
+        if (buildSystem.IsRunningOnAppVeyor)
         {
-            var gitExe = context.Tools.Resolve(context.IsRunningOnWindows() ? "git.exe" : "git");
-            return context.ExecuteCommand(gitExe, cmd, workDir);
+            repositoryName = buildSystem.AppVeyor.Environment.Repository.Name;
         }
-
-        public static void GitPushBranch(this ICakeContext context, DirectoryPath repositoryDirectoryPath, string username, string token, string branchName)
+        else if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
         {
-            var pushUrl = $"https://{username}:{token}@github.com/{Constants.RepoOwner}/{Constants.Repository}";
-            context.ExecGitCmd($"push {pushUrl} {branchName}", workDir: repositoryDirectoryPath);
+            repositoryName = buildSystem.AzurePipelines.Environment.Repository.RepoName;
         }
-
-        public static bool IsOriginalRepo(this ICakeContext context)
+        else if (buildSystem.IsRunningOnGitHubActions)
         {
-            var buildSystem = context.BuildSystem();
-            string repositoryName = string.Empty;
-            if (buildSystem.IsRunningOnAppVeyor)
-            {
-                repositoryName = buildSystem.AppVeyor.Environment.Repository.Name;
-            }
-            else if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
-            {
-                repositoryName = buildSystem.AzurePipelines.Environment.Repository.RepoName;
-            }
-            else if (buildSystem.IsRunningOnGitHubActions)
-            {
-                repositoryName = buildSystem.GitHubActions.Environment.Workflow.Repository;
-            }
-            context.Information("Repository Name:   {0}", repositoryName);
-
-            return !string.IsNullOrWhiteSpace(repositoryName) && StringComparer.OrdinalIgnoreCase.Equals("gittools/GitVersion", repositoryName);
+            repositoryName = buildSystem.GitHubActions.Environment.Workflow.Repository;
         }
+        context.Information("Repository Name:   {0}", repositoryName);
+
+        return !string.IsNullOrWhiteSpace(repositoryName) && StringComparer.OrdinalIgnoreCase.Equals("gittools/GitVersion", repositoryName);
+    }
 
-        public static bool IsMainBranch(this ICakeContext context)
+    public static bool IsMainBranch(this ICakeContext context)
+    {
+        var buildSystem = context.BuildSystem();
+        string repositoryBranch = context.ExecGitCmd("rev-parse --abbrev-ref HEAD").Single();
+        if (buildSystem.IsRunningOnAppVeyor)
         {
-            var buildSystem = context.BuildSystem();
-            string repositoryBranch = context.ExecGitCmd("rev-parse --abbrev-ref HEAD").Single();
-            if (buildSystem.IsRunningOnAppVeyor)
-            {
-                repositoryBranch = buildSystem.AppVeyor.Environment.Repository.Branch;
-            }
-            else if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
-            {
-                repositoryBranch = buildSystem.AzurePipelines.Environment.Repository.SourceBranchName;
-            }
-            else if (buildSystem.IsRunningOnGitHubActions)
-            {
-                repositoryBranch = buildSystem.GitHubActions.Environment.Workflow.Ref.Replace("refs/heads/", "");
-            }
-
-            context.Information("Repository Branch: {0}", repositoryBranch);
-
-            return !string.IsNullOrWhiteSpace(repositoryBranch) && StringComparer.OrdinalIgnoreCase.Equals("main", repositoryBranch);
+            repositoryBranch = buildSystem.AppVeyor.Environment.Repository.Branch;
         }
-
-        public static bool IsTagged(this ICakeContext context)
+        else if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
         {
-            var sha = context.ExecGitCmd("rev-parse --verify HEAD").Single();
-            var isTagged = context.ExecGitCmd("tag --points-at " + sha).Any();
-
-            return isTagged;
+            repositoryBranch = buildSystem.AzurePipelines.Environment.Repository.SourceBranchName;
         }
-
-        public static void ValidateOutput(this ICakeContext context, string cmd, string? args, string? expected)
+        else if (buildSystem.IsRunningOnGitHubActions)
         {
-            var output = context.ExecuteCommand(cmd, args);
-            var outputStr = string.Concat(output);
-            context.Information(outputStr);
-
-            Assert.Equal(expected, outputStr);
+            repositoryBranch = buildSystem.GitHubActions.Environment.Workflow.Ref.Replace("refs/heads/", "");
         }
 
-        public static bool IsEnabled(this ICakeContext context, string envVar, bool nullOrEmptyAsEnabled = true)
-        {
-            var value = context.EnvironmentVariable(envVar);
+        context.Information("Repository Branch: {0}", repositoryBranch);
 
-            return string.IsNullOrWhiteSpace(value) ? nullOrEmptyAsEnabled : bool.Parse(value);
-        }
+        return !string.IsNullOrWhiteSpace(repositoryBranch) && StringComparer.OrdinalIgnoreCase.Equals("main", repositoryBranch);
+    }
+
+    public static bool IsTagged(this ICakeContext context)
+    {
+        var sha = context.ExecGitCmd("rev-parse --verify HEAD").Single();
+        var isTagged = context.ExecGitCmd("tag --points-at " + sha).Any();
+
+        return isTagged;
+    }
 
-        public static string GetOS(this ICakeContext context)
+    public static void ValidateOutput(this ICakeContext context, string cmd, string? args, string? expected)
+    {
+        var output = context.ExecuteCommand(cmd, args);
+        var outputStr = string.Concat(output);
+        context.Information(outputStr);
+
+        Assert.Equal(expected, outputStr);
+    }
+
+    public static bool IsEnabled(this ICakeContext context, string envVar, bool nullOrEmptyAsEnabled = true)
+    {
+        var value = context.EnvironmentVariable(envVar);
+
+        return string.IsNullOrWhiteSpace(value) ? nullOrEmptyAsEnabled : bool.Parse(value);
+    }
+
+    public static string GetOS(this ICakeContext context)
+    {
+        if (context.IsRunningOnWindows()) return "Windows";
+        if (context.IsRunningOnLinux()) return "Linux";
+        if (context.IsRunningOnMacOs()) return "macOs";
+        return string.Empty;
+    }
+
+    public static string GetBuildAgent(this ICakeContext context)
+    {
+        var buildSystem = context.BuildSystem();
+        return buildSystem.Provider switch
         {
-            if (context.IsRunningOnWindows()) return "Windows";
-            if (context.IsRunningOnLinux()) return "Linux";
-            if (context.IsRunningOnMacOs()) return "macOs";
-            return string.Empty;
-        }
+            BuildProvider.Local => "Local",
+            BuildProvider.AppVeyor => "AppVeyor",
+            BuildProvider.AzurePipelines => "AzurePipelines",
+            BuildProvider.AzurePipelinesHosted => "AzurePipelines",
+            BuildProvider.GitHubActions => "GitHubActions",
+            _ => string.Empty
+        };
+    }
 
-        public static string GetBuildAgent(this ICakeContext context)
+    public static void StartGroup(this ICakeContext context, string title)
+    {
+        var buildSystem = context.BuildSystem();
+        var startGroup = "[group]";
+        if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
         {
-            var buildSystem = context.BuildSystem();
-            return buildSystem.Provider switch
-            {
-                BuildProvider.Local => "Local",
-                BuildProvider.AppVeyor => "AppVeyor",
-                BuildProvider.AzurePipelines => "AzurePipelines",
-                BuildProvider.AzurePipelinesHosted => "AzurePipelines",
-                BuildProvider.GitHubActions => "GitHubActions",
-                _ => string.Empty
-            };
+            startGroup = "##[group]";
         }
-
-        public static void StartGroup(this ICakeContext context, string title)
+        else if (buildSystem.IsRunningOnGitHubActions)
+        {
+            startGroup = "::group::";
+        }
+        context.Information($"{startGroup}{title}");
+    }
+    public static void EndGroup(this ICakeContext context)
+    {
+        var buildSystem = context.BuildSystem();
+        var endgroup = "[endgroup]";
+        if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
         {
-            var buildSystem = context.BuildSystem();
-            var startGroup = "[group]";
-            if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
-            {
-                startGroup = "##[group]";
-            }
-            else if (buildSystem.IsRunningOnGitHubActions)
-            {
-                startGroup = "::group::";
-            }
-            context.Information($"{startGroup}{title}");
+            endgroup = "##[endgroup]";
         }
-        public static void EndGroup(this ICakeContext context)
+        else if (buildSystem.IsRunningOnGitHubActions)
         {
-            var buildSystem = context.BuildSystem();
-            var endgroup = "[endgroup]";
-            if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
-            {
-                endgroup = "##[endgroup]";
-            }
-            else if (buildSystem.IsRunningOnGitHubActions)
-            {
-                endgroup = "::endgroup::";
-            }
-            context.Information($"{endgroup}");
+            endgroup = "::endgroup::";
         }
+        context.Information($"{endgroup}");
+    }
 
-        public static bool ShouldRun(this ICakeContext context, bool criteria, string skipMessage)
-        {
-            if (criteria) return true;
+    public static bool ShouldRun(this ICakeContext context, bool criteria, string skipMessage)
+    {
+        if (criteria) return true;
 
-            context.Information(skipMessage);
-            return false;
-        }
+        context.Information(skipMessage);
+        return false;
     }
-}
+}
\ No newline at end of file
diff --git a/build/common/Utilities/DockerContextExtensions.cs b/build/common/Utilities/DockerContextExtensions.cs
index 5b898641cc..2b8d6f5818 100644
--- a/build/common/Utilities/DockerContextExtensions.cs
+++ b/build/common/Utilities/DockerContextExtensions.cs
@@ -8,261 +8,260 @@
 using Cake.Docker;
 using Xunit;
 
-namespace Common.Utilities
+namespace Common.Utilities;
+
+public enum Architecture
 {
-    public enum Architecture
-    {
-        Arm64,
-        Amd64
-    }
-    public static class DockerContextExtensions
+    Arm64,
+    Amd64
+}
+public static class DockerContextExtensions
+{
+    public static bool SkipArm64Image(this ICakeContext context, DockerImage dockerImage)
     {
-        public static bool SkipArm64Image(this ICakeContext context, DockerImage dockerImage)
-        {
-            if (dockerImage.Architecture != Architecture.Arm64) return false;
-            if (!Constants.DistrosToSkip.Contains(dockerImage.Distro)) return false;
+        if (dockerImage.Architecture != Architecture.Arm64) return false;
+        if (!Constants.DistrosToSkip.Contains(dockerImage.Distro)) return false;
 
-            context.Information($"Skipping Target: {dockerImage.TargetFramework}, Distro: {dockerImage.Distro}, Arch: {dockerImage.Architecture}");
-            return true;
-        }
+        context.Information($"Skipping Target: {dockerImage.TargetFramework}, Distro: {dockerImage.Distro}, Arch: {dockerImage.Architecture}");
+        return true;
+    }
 
-        public static void DockerBuildImage(this BuildContextBase context, DockerImage dockerImage)
-        {
-            if (context.Version == null) return;
+    public static void DockerBuildImage(this BuildContextBase context, DockerImage dockerImage)
+    {
+        if (context.Version == null) return;
 
-            var (distro, targetFramework, arch, registry, _) = dockerImage;
+        var (distro, targetFramework, arch, registry, _) = dockerImage;
 
-            context.Information($"Building image: {dockerImage}");
+        context.Information($"Building image: {dockerImage}");
 
-            var workDir = Paths.Src.Combine("Docker");
-            var tags = context.GetDockerTags(dockerImage, arch);
+        var workDir = Paths.Src.Combine("Docker");
+        var tags = context.GetDockerTags(dockerImage, arch);
 
-            var suffix = arch.ToSuffix();
-            var platforms = new List<string> { $"linux/{suffix}" };
+        var suffix = arch.ToSuffix();
+        var platforms = new List<string> { $"linux/{suffix}" };
 
-            var buildSettings = new DockerImageBuildSettings
+        var buildSettings = new DockerImageBuildSettings
+        {
+            Rm = true,
+            Tag = tags.ToArray(),
+            File = workDir.CombineWithFilePath("Dockerfile").FullPath,
+            BuildArg = new[]
             {
-                Rm = true,
-                Tag = tags.ToArray(),
-                File = workDir.CombineWithFilePath("Dockerfile").FullPath,
-                BuildArg = new[]
-                {
-                    $"contentFolder=/content",
-                    $"REGISTRY={registry}",
-                    $"DOTNET_VERSION={targetFramework}",
-                    $"DISTRO={distro}",
-                    $"VERSION={context.Version.NugetVersion}"
-                },
-                Pull = true,
-                Platform = string.Join(",", platforms),
-            };
+                $"contentFolder=/content",
+                $"REGISTRY={registry}",
+                $"DOTNET_VERSION={targetFramework}",
+                $"DISTRO={distro}",
+                $"VERSION={context.Version.NugetVersion}"
+            },
+            Pull = true,
+            Platform = string.Join(",", platforms),
+        };
 
-            context.DockerBuild(buildSettings, workDir.ToString(), "--output type=docker");
-        }
+        context.DockerBuild(buildSettings, workDir.ToString(), "--output type=docker");
+    }
 
-        public static void DockerPushImage(this BuildContextBase context, DockerImage dockerImage)
+    public static void DockerPushImage(this BuildContextBase context, DockerImage dockerImage)
+    {
+        var tags = context.GetDockerTags(dockerImage, dockerImage.Architecture);
+        foreach (var tag in tags)
         {
-            var tags = context.GetDockerTags(dockerImage, dockerImage.Architecture);
-            foreach (var tag in tags)
-            {
-                context.DockerPush(tag);
-            }
+            context.DockerPush(tag);
         }
+    }
 
-        public static void DockerCreateManifest(this BuildContextBase context, DockerImage dockerImage, bool skipArm64Image)
+    public static void DockerCreateManifest(this BuildContextBase context, DockerImage dockerImage, bool skipArm64Image)
+    {
+        var manifestTags = context.GetDockerTags(dockerImage);
+        foreach (var tag in manifestTags)
         {
-            var manifestTags = context.GetDockerTags(dockerImage);
-            foreach (var tag in manifestTags)
+            var amd64Tag = $"{tag}-{Architecture.Amd64.ToSuffix()}";
+            if (skipArm64Image)
             {
-                var amd64Tag = $"{tag}-{Architecture.Amd64.ToSuffix()}";
-                if (skipArm64Image)
-                {
-                    context.DockerManifestCreate(tag, amd64Tag);
-                }
-                else
-                {
-                    var arm64Tag = $"{tag}-{Architecture.Arm64.ToSuffix()}";
-                    context.DockerManifestCreate(tag, amd64Tag, arm64Tag);
-                }
+                context.DockerManifestCreate(tag, amd64Tag);
+            }
+            else
+            {
+                var arm64Tag = $"{tag}-{Architecture.Arm64.ToSuffix()}";
+                context.DockerManifestCreate(tag, amd64Tag, arm64Tag);
             }
         }
+    }
 
-        public static void DockerPushManifest(this BuildContextBase context, DockerImage dockerImage)
+    public static void DockerPushManifest(this BuildContextBase context, DockerImage dockerImage)
+    {
+        var manifestTags = context.GetDockerTags(dockerImage);
+        foreach (var tag in manifestTags)
         {
-            var manifestTags = context.GetDockerTags(dockerImage);
-            foreach (var tag in manifestTags)
-            {
-                context.DockerManifestPush(tag);
-            }
+            context.DockerManifestPush(tag);
         }
-        public static void DockerRemoveManifest(this BuildContextBase context, DockerImage dockerImage)
+    }
+    public static void DockerRemoveManifest(this BuildContextBase context, DockerImage dockerImage)
+    {
+        var manifestTags = context.GetDockerTags(dockerImage);
+        foreach (var tag in manifestTags)
         {
-            var manifestTags = context.GetDockerTags(dockerImage);
-            foreach (var tag in manifestTags)
-            {
-                context.DockerManifestRemove(tag);
-            }
+            context.DockerManifestRemove(tag);
         }
+    }
 
-        private static void DockerManifestRemove(this ICakeContext context, string tag) => context.DockerCustomCommand($"manifest rm {tag}");
+    private static void DockerManifestRemove(this ICakeContext context, string tag) => context.DockerCustomCommand($"manifest rm {tag}");
 
-        public static void DockerPullImage(this ICakeContext context, DockerImage dockerImage)
-        {
-            var tag = $"{dockerImage.DockerImageName()}:{dockerImage.Distro}-sdk-{dockerImage.TargetFramework}";
-            var platform = $"linux/{dockerImage.Architecture.ToString().ToLower()}";
-            context.DockerPull(new DockerImagePullSettings { Platform = platform }, tag);
-        }
+    public static void DockerPullImage(this ICakeContext context, DockerImage dockerImage)
+    {
+        var tag = $"{dockerImage.DockerImageName()}:{dockerImage.Distro}-sdk-{dockerImage.TargetFramework}";
+        var platform = $"linux/{dockerImage.Architecture.ToString().ToLower()}";
+        context.DockerPull(new DockerImagePullSettings { Platform = platform }, tag);
+    }
 
-        public static void DockerTestImage(this BuildContextBase context, DockerImage dockerImage)
+    public static void DockerTestImage(this BuildContextBase context, DockerImage dockerImage)
+    {
+        var tags = context.GetDockerTags(dockerImage, dockerImage.Architecture);
+        foreach (var tag in tags)
         {
-            var tags = context.GetDockerTags(dockerImage, dockerImage.Architecture);
-            foreach (var tag in tags)
-            {
-                context.DockerTestRun(tag, dockerImage.Architecture, "/repo", "/showvariable", "FullSemver");
-            }
+            context.DockerTestRun(tag, dockerImage.Architecture, "/repo", "/showvariable", "FullSemver");
         }
+    }
 
-        public static void DockerTestArtifact(this BuildContextBase context, DockerImage dockerImage, string cmd)
-        {
-            var tag = $"{dockerImage.DockerImageName()}:{dockerImage.Distro}-sdk-{dockerImage.TargetFramework}";
-            context.DockerTestRun(tag, dockerImage.Architecture, "sh", cmd);
-        }
+    public static void DockerTestArtifact(this BuildContextBase context, DockerImage dockerImage, string cmd)
+    {
+        var tag = $"{dockerImage.DockerImageName()}:{dockerImage.Distro}-sdk-{dockerImage.TargetFramework}";
+        context.DockerTestRun(tag, dockerImage.Architecture, "sh", cmd);
+    }
 
-        private static void DockerBuild(
-            this ICakeContext context,
-            DockerImageBuildSettings settings,
-            string path, params string[] args)
-        {
-            GenericDockerRunner<DockerImageBuildSettings> genericDockerRunner =
-                new(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
+    private static void DockerBuild(
+        this ICakeContext context,
+        DockerImageBuildSettings settings,
+        string path, params string[] args)
+    {
+        GenericDockerRunner<DockerImageBuildSettings> genericDockerRunner =
+            new(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
 
-            string str;
-            switch (string.IsNullOrEmpty(path))
-            {
-                case false:
-                    {
-                        string str2 = path.Trim();
-                        str = str2.Length <= 1 || !str2.StartsWith("\"") || !str2.EndsWith("\"") ? "\"" + path + "\"" : path;
-                        break;
-                    }
-                default:
-                    str = path;
+        string str;
+        switch (string.IsNullOrEmpty(path))
+        {
+            case false:
+                {
+                    string str2 = path.Trim();
+                    str = str2.Length <= 1 || !str2.StartsWith("\"") || !str2.EndsWith("\"") ? "\"" + path + "\"" : path;
                     break;
-            }
-            var additional = args.Concat(new[] { str }).ToArray();
-            genericDockerRunner.Run("buildx build", settings, additional);
+                }
+            default:
+                str = path;
+                break;
         }
+        var additional = args.Concat(new[] { str }).ToArray();
+        genericDockerRunner.Run("buildx build", settings, additional);
+    }
 
-        private static void DockerTestRun(this BuildContextBase context, string image, Architecture arch, string command, params string[] args)
-        {
-            var settings = GetDockerRunSettings(context, arch);
-            context.Information($"Testing image: {image}");
-            var output = context.DockerRunImage(settings, image, command, args);
-            context.Information("Output : " + output);
+    private static void DockerTestRun(this BuildContextBase context, string image, Architecture arch, string command, params string[] args)
+    {
+        var settings = GetDockerRunSettings(context, arch);
+        context.Information($"Testing image: {image}");
+        var output = context.DockerRunImage(settings, image, command, args);
+        context.Information("Output : " + output);
 
-            Assert.Contains(context.Version?.GitVersion.FullSemVer, output);
-        }
-        private static IEnumerable<string> GetDockerTags(this BuildContextBase context, DockerImage dockerImage, Architecture? arch = null)
+        Assert.Contains(context.Version?.GitVersion.FullSemVer, output);
+    }
+    private static IEnumerable<string> GetDockerTags(this BuildContextBase context, DockerImage dockerImage, Architecture? arch = null)
+    {
+        var name = dockerImage.DockerImageName();
+        var distro = dockerImage.Distro;
+        var targetFramework = dockerImage.TargetFramework;
+
+        if (context.Version == null) return Enumerable.Empty<string>();
+        var tags = new List<string>
         {
-            var name = dockerImage.DockerImageName();
-            var distro = dockerImage.Distro;
-            var targetFramework = dockerImage.TargetFramework;
+            $"{name}:{context.Version.Version}-{distro}-{targetFramework}",
+            $"{name}:{context.Version.SemVersion}-{distro}-{targetFramework}",
+        };
 
-            if (context.Version == null) return Enumerable.Empty<string>();
-            var tags = new List<string>
+        if (distro == Constants.DockerDistroLatest && targetFramework == Constants.Version50)
+        {
+            tags.AddRange(new[]
             {
-                $"{name}:{context.Version.Version}-{distro}-{targetFramework}",
-                $"{name}:{context.Version.SemVersion}-{distro}-{targetFramework}",
-            };
+                $"{name}:{context.Version.Version}",
+                $"{name}:{context.Version.SemVersion}",
+
+                $"{name}:{context.Version.Version}-{distro}",
+                $"{name}:{context.Version.SemVersion}-{distro}"
+            });
 
-            if (distro == Constants.DockerDistroLatest && targetFramework == Constants.Version50)
+            if (context.IsStableRelease)
             {
                 tags.AddRange(new[]
                 {
-                    $"{name}:{context.Version.Version}",
-                    $"{name}:{context.Version.SemVersion}",
-
-                    $"{name}:{context.Version.Version}-{distro}",
-                    $"{name}:{context.Version.SemVersion}-{distro}"
+                    $"{name}:latest",
+                    $"{name}:latest-{targetFramework}",
+                    $"{name}:latest-{distro}",
+                    $"{name}:latest-{distro}-{targetFramework}",
                 });
-
-                if (context.IsStableRelease)
-                {
-                    tags.AddRange(new[]
-                    {
-                        $"{name}:latest",
-                        $"{name}:latest-{targetFramework}",
-                        $"{name}:latest-{distro}",
-                        $"{name}:latest-{distro}-{targetFramework}",
-                    });
-                }
             }
+        }
 
-            if (!arch.HasValue) return tags;
+        if (!arch.HasValue) return tags;
 
-            var suffix = arch.Value.ToSuffix();
-            return tags.Select(x => $"{x}-{suffix}");
+        var suffix = arch.Value.ToSuffix();
+        return tags.Select(x => $"{x}-{suffix}");
 
-        }
-        private static string DockerImageName(this DockerImage image) => $"{image.Registry}/{(image.UseBaseImage ? Constants.DockerBaseImageName : Constants.DockerImageName)}";
-        private static DockerContainerRunSettings GetDockerRunSettings(this BuildContextBase context, Architecture arch)
+    }
+    private static string DockerImageName(this DockerImage image) => $"{image.Registry}/{(image.UseBaseImage ? Constants.DockerBaseImageName : Constants.DockerImageName)}";
+    private static DockerContainerRunSettings GetDockerRunSettings(this BuildContextBase context, Architecture arch)
+    {
+        var currentDir = context.MakeAbsolute(context.Directory("."));
+        var root = string.Empty;
+        var settings = new DockerContainerRunSettings
         {
-            var currentDir = context.MakeAbsolute(context.Directory("."));
-            var root = string.Empty;
-            var settings = new DockerContainerRunSettings
+            Rm = true,
+            Volume = new[]
             {
-                Rm = true,
-                Volume = new[]
-                {
-                    $"{currentDir}:{root}/repo",
-                    $"{currentDir}/tests/scripts:{root}/scripts",
-                    $"{currentDir}/artifacts/packages/nuget:{root}/nuget",
-                    $"{currentDir}/artifacts/packages/native:{root}/native",
-                },
-                Platform = $"linux/{arch.ToString().ToLower()}"
-            };
+                $"{currentDir}:{root}/repo",
+                $"{currentDir}/tests/scripts:{root}/scripts",
+                $"{currentDir}/artifacts/packages/nuget:{root}/nuget",
+                $"{currentDir}/artifacts/packages/native:{root}/native",
+            },
+            Platform = $"linux/{arch.ToString().ToLower()}"
+        };
 
-            if (context.IsAzurePipelineBuild)
-            {
-                settings.Env = new[]
-                {
-                    "TF_BUILD=true",
-                    $"BUILD_SOURCEBRANCH={context.EnvironmentVariable("BUILD_SOURCEBRANCH")}"
-                };
-            }
-            if (context.IsGitHubActionsBuild)
+        if (context.IsAzurePipelineBuild)
+        {
+            settings.Env = new[]
             {
-                settings.Env = new[]
-                {
-                    "GITHUB_ACTIONS=true",
-                    $"GITHUB_REF={context.EnvironmentVariable("GITHUB_REF")}"
-                };
-            }
-
-            return settings;
+                "TF_BUILD=true",
+                $"BUILD_SOURCEBRANCH={context.EnvironmentVariable("BUILD_SOURCEBRANCH")}"
+            };
         }
-        private static string DockerRunImage(this ICakeContext context, DockerContainerRunSettings settings, string image, string command, params string[] args)
+        if (context.IsGitHubActionsBuild)
         {
-            if (string.IsNullOrEmpty(image))
+            settings.Env = new[]
             {
-                throw new ArgumentNullException(nameof(image));
-            }
-            var runner = new GenericDockerRunner<DockerContainerRunSettings>(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
-            List<string> arguments = new()
-            {
-                image
+                "GITHUB_ACTIONS=true",
+                $"GITHUB_REF={context.EnvironmentVariable("GITHUB_REF")}"
             };
-            if (!string.IsNullOrEmpty(command))
+        }
+
+        return settings;
+    }
+    private static string DockerRunImage(this ICakeContext context, DockerContainerRunSettings settings, string image, string command, params string[] args)
+    {
+        if (string.IsNullOrEmpty(image))
+        {
+            throw new ArgumentNullException(nameof(image));
+        }
+        var runner = new GenericDockerRunner<DockerContainerRunSettings>(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
+        List<string> arguments = new()
+        {
+            image
+        };
+        if (!string.IsNullOrEmpty(command))
+        {
+            arguments.Add(command);
+            if (args.Length > 0)
             {
-                arguments.Add(command);
-                if (args.Length > 0)
-                {
-                    arguments.AddRange(args);
-                }
+                arguments.AddRange(args);
             }
-
-            var result = runner.RunWithResult("run", settings, r => r.ToArray(), arguments.ToArray());
-            return string.Join("\n", result);
         }
+
+        var result = runner.RunWithResult("run", settings, r => r.ToArray(), arguments.ToArray());
+        return string.Join("\n", result);
     }
-}
+}
\ No newline at end of file
diff --git a/build/common/Utilities/Extensions.cs b/build/common/Utilities/Extensions.cs
index faa764cf0d..cf040c30d6 100644
--- a/build/common/Utilities/Extensions.cs
+++ b/build/common/Utilities/Extensions.cs
@@ -6,67 +6,66 @@
 using Cake.Core.IO;
 using Cake.Frosting;
 
-namespace Common.Utilities
+namespace Common.Utilities;
+
+public static class Extensions
 {
-    public static class Extensions
-    {
-        public static IEnumerable<Type> FindAllDerivedTypes(this Assembly assembly, Type baseType) =>
-            from type in assembly.GetExportedTypes()
-            let info = type.GetTypeInfo()
-            where baseType.IsAssignableFrom(type) && info.IsClass && !info.IsAbstract
-            select type;
+    public static IEnumerable<Type> FindAllDerivedTypes(this Assembly assembly, Type baseType) =>
+        from type in assembly.GetExportedTypes()
+        let info = type.GetTypeInfo()
+        where baseType.IsAssignableFrom(type) && info.IsClass && !info.IsAbstract
+        select type;
 
-        public static string GetTaskDescription(this Type task)
+    public static string GetTaskDescription(this Type task)
+    {
+        if (task is null)
         {
-            if (task is null)
-            {
-                throw new ArgumentNullException(nameof(task));
-            }
-
-            var attribute = task.GetCustomAttribute<TaskDescriptionAttribute>();
-            return attribute != null ? attribute.Description : string.Empty;
+            throw new ArgumentNullException(nameof(task));
         }
 
-        public static string GetTaskName(this Type task)
-        {
-            if (task is null)
-            {
-                throw new ArgumentNullException(nameof(task));
-            }
+        var attribute = task.GetCustomAttribute<TaskDescriptionAttribute>();
+        return attribute != null ? attribute.Description : string.Empty;
+    }
 
-            var attribute = task.GetCustomAttribute<TaskNameAttribute>();
-            return attribute != null ? attribute.Name : task.Name;
+    public static string GetTaskName(this Type task)
+    {
+        if (task is null)
+        {
+            throw new ArgumentNullException(nameof(task));
         }
 
-        public static string GetTaskArguments(this Type task)
-        {
-            if (task is null)
-            {
-                throw new ArgumentNullException(nameof(task));
-            }
+        var attribute = task.GetCustomAttribute<TaskNameAttribute>();
+        return attribute != null ? attribute.Name : task.Name;
+    }
 
-            var attributes = task.GetCustomAttributes<TaskArgumentAttribute>().ToArray();
-            if (attributes.Any())
-            {
-                var arguments = attributes.Select(attribute => $"[--{attribute.Name} ({string.Join(" | ", attribute.PossibleValues)})]");
-                return string.Join(" ", arguments);
-            }
-            return string.Empty;
+    public static string GetTaskArguments(this Type task)
+    {
+        if (task is null)
+        {
+            throw new ArgumentNullException(nameof(task));
         }
 
-        public static DirectoryPath Combine(this string path, string segment) => DirectoryPath.FromString(path).Combine(segment);
-        public static FilePath CombineWithFilePath(this string path, string segment) => DirectoryPath.FromString(path).CombineWithFilePath(segment);
-        public static DirectoryPath GetRootDirectory()
+        var attributes = task.GetCustomAttributes<TaskArgumentAttribute>().ToArray();
+        if (attributes.Any())
         {
-            var currentPath = DirectoryPath.FromString(Directory.GetCurrentDirectory());
-            while (!Directory.Exists(currentPath.Combine(".git").FullPath))
-            {
-                currentPath = DirectoryPath.FromString(Directory.GetParent(currentPath.FullPath)?.FullName);
-            }
+            var arguments = attributes.Select(attribute => $"[--{attribute.Name} ({string.Join(" | ", attribute.PossibleValues)})]");
+            return string.Join(" ", arguments);
+        }
+        return string.Empty;
+    }
 
-            return currentPath;
+    public static DirectoryPath Combine(this string path, string segment) => DirectoryPath.FromString(path).Combine(segment);
+    public static FilePath CombineWithFilePath(this string path, string segment) => DirectoryPath.FromString(path).CombineWithFilePath(segment);
+    public static DirectoryPath GetRootDirectory()
+    {
+        var currentPath = DirectoryPath.FromString(Directory.GetCurrentDirectory());
+        while (!Directory.Exists(currentPath.Combine(".git").FullPath))
+        {
+            currentPath = DirectoryPath.FromString(Directory.GetParent(currentPath.FullPath)?.FullName);
         }
 
-        public static string ToSuffix(this Architecture arch) => arch.ToString().ToLower();
+        return currentPath;
     }
-}
+
+    public static string ToSuffix(this Architecture arch) => arch.ToString().ToLower();
+}
\ No newline at end of file
diff --git a/build/common/Utilities/IsExternalInit.cs b/build/common/Utilities/IsExternalInit.cs
index 5023ab29a8..ae51612719 100644
--- a/build/common/Utilities/IsExternalInit.cs
+++ b/build/common/Utilities/IsExternalInit.cs
@@ -1,13 +1,12 @@
 using System.ComponentModel;
 
-namespace System.Runtime.CompilerServices
+namespace System.Runtime.CompilerServices;
+
+/// <summary>
+/// Reserved to be used by the compiler for tracking metadata.
+/// This class should not be used by developers in source code.
+/// </summary>
+[EditorBrowsable(EditorBrowsableState.Never)]
+public static class IsExternalInit
 {
-    /// <summary>
-    /// Reserved to be used by the compiler for tracking metadata.
-    /// This class should not be used by developers in source code.
-    /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public static class IsExternalInit
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/build/common/Utilities/Models.cs b/build/common/Utilities/Models.cs
index 0c35270547..a0f3688cc6 100644
--- a/build/common/Utilities/Models.cs
+++ b/build/common/Utilities/Models.cs
@@ -1,47 +1,46 @@
 using Cake.Core.IO;
 using Common.Addins.GitVersion;
 
-namespace Common.Utilities
-{
-    public record NugetPackage(string PackageName, FilePath FilePath, bool IsChocoPackage);
+namespace Common.Utilities;
+
+public record NugetPackage(string PackageName, FilePath FilePath, bool IsChocoPackage);
 
-    public record CodeCovCredentials(string Token);
+public record CodeCovCredentials(string Token);
 
-    public record GitHubCredentials(string Token, string? UserName = null);
+public record GitHubCredentials(string Token, string? UserName = null);
 
-    public record NugetCredentials(string ApiKey);
+public record NugetCredentials(string ApiKey);
 
-    public record ChocolateyCredentials(string ApiKey);
+public record ChocolateyCredentials(string ApiKey);
 
-    public record BuildVersion(GitVersion GitVersion, string? Version, string? Milestone, string? SemVersion, string? NugetVersion)
+public record BuildVersion(GitVersion GitVersion, string? Version, string? Milestone, string? SemVersion, string? NugetVersion)
+{
+    public static BuildVersion Calculate(GitVersion gitVersion)
     {
-        public static BuildVersion Calculate(GitVersion gitVersion)
+        var version = gitVersion.MajorMinorPatch;
+        var semVersion = gitVersion.LegacySemVer;
+        var nugetVersion = gitVersion.LegacySemVer;
+
+        if (!string.IsNullOrWhiteSpace(gitVersion.BuildMetaData))
         {
-            var version = gitVersion.MajorMinorPatch;
-            var semVersion = gitVersion.LegacySemVer;
-            var nugetVersion = gitVersion.LegacySemVer;
-
-            if (!string.IsNullOrWhiteSpace(gitVersion.BuildMetaData))
-            {
-                semVersion += $"-{gitVersion.BuildMetaData}";
-                nugetVersion += $".{gitVersion.BuildMetaData}";
-            }
-
-            return new BuildVersion(
-                GitVersion: gitVersion,
-                Version: version,
-                Milestone: version,
-                SemVersion: semVersion,
-                NugetVersion: nugetVersion?.ToLowerInvariant()
-            );
+            semVersion += $"-{gitVersion.BuildMetaData}";
+            nugetVersion += $".{gitVersion.BuildMetaData}";
         }
+
+        return new BuildVersion(
+            GitVersion: gitVersion,
+            Version: version,
+            Milestone: version,
+            SemVersion: semVersion,
+            NugetVersion: nugetVersion?.ToLowerInvariant()
+        );
     }
+}
 
-    public record DockerImage(string Distro, string TargetFramework, Architecture Architecture, string Registry, bool UseBaseImage);
+public record DockerImage(string Distro, string TargetFramework, Architecture Architecture, string Registry, bool UseBaseImage);
 
-    public enum DockerRegistry
-    {
-        GitHub = 0,
-        DockerHub = 1
-    }
+public enum DockerRegistry
+{
+    GitHub = 0,
+    DockerHub = 1
 }
diff --git a/build/common/Utilities/Paths.cs b/build/common/Utilities/Paths.cs
index 03bb005047..83c96bdb03 100644
--- a/build/common/Utilities/Paths.cs
+++ b/build/common/Utilities/Paths.cs
@@ -1,26 +1,25 @@
 using Cake.Core.IO;
 
-namespace Common.Utilities
+namespace Common.Utilities;
+
+public class Paths
 {
-    public class Paths
-    {
-        public static readonly DirectoryPath Root = "./";
+    public static readonly DirectoryPath Root = "./";
 
-        public static readonly DirectoryPath Artifacts = Root.Combine("artifacts");
-        public static readonly DirectoryPath Src = Root.Combine("src");
-        public static readonly DirectoryPath Docs = Root.Combine("docs");
-        public static readonly DirectoryPath Build = Root.Combine("build");
-        public static readonly DirectoryPath Integration = Root.Combine("tests").Combine("integration");
+    public static readonly DirectoryPath Artifacts = Root.Combine("artifacts");
+    public static readonly DirectoryPath Src = Root.Combine("src");
+    public static readonly DirectoryPath Docs = Root.Combine("docs");
+    public static readonly DirectoryPath Build = Root.Combine("build");
+    public static readonly DirectoryPath Integration = Root.Combine("tests").Combine("integration");
 
-        public static readonly DirectoryPath Nuspec = Build.Combine("nuspec");
+    public static readonly DirectoryPath Nuspec = Build.Combine("nuspec");
 
-        public static readonly DirectoryPath TestOutput = Artifacts.Combine("test-results");
-        public static readonly DirectoryPath Packages = Artifacts.Combine("packages");
-        public static readonly DirectoryPath ArtifactsDocs = Artifacts.Combine("docs");
+    public static readonly DirectoryPath TestOutput = Artifacts.Combine("test-results");
+    public static readonly DirectoryPath Packages = Artifacts.Combine("packages");
+    public static readonly DirectoryPath ArtifactsDocs = Artifacts.Combine("docs");
 
-        public static readonly DirectoryPath Native = Packages.Combine("native");
-        public static readonly DirectoryPath Nuget = Packages.Combine("nuget");
-        public static readonly DirectoryPath ArtifactsBinCmdline = Packages.Combine("prepare").Combine("cmdline");
-        public static readonly DirectoryPath ArtifactsBinPortable = Packages.Combine("prepare").Combine("portable");
-    }
-}
+    public static readonly DirectoryPath Native = Packages.Combine("native");
+    public static readonly DirectoryPath Nuget = Packages.Combine("nuget");
+    public static readonly DirectoryPath ArtifactsBinCmdline = Packages.Combine("prepare").Combine("cmdline");
+    public static readonly DirectoryPath ArtifactsBinPortable = Packages.Combine("prepare").Combine("portable");
+}
\ No newline at end of file
diff --git a/build/common/Utilities/TaskArgumentsAttribute.cs b/build/common/Utilities/TaskArgumentsAttribute.cs
index 8c7384782d..24abb7192d 100644
--- a/build/common/Utilities/TaskArgumentsAttribute.cs
+++ b/build/common/Utilities/TaskArgumentsAttribute.cs
@@ -1,20 +1,19 @@
 using System;
 
-namespace Common.Utilities
+namespace Common.Utilities;
+
+/// <summary>
+/// Represents a task additional arguments.
+/// </summary>
+/// <seealso cref="Attribute" />
+[AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
+public class TaskArgumentAttribute : Attribute
 {
-    /// <summary>
-    /// Represents a task additional arguments.
-    /// </summary>
-    /// <seealso cref="Attribute" />
-    [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
-    public class TaskArgumentAttribute : Attribute
+    public string Name { get; set; }
+    public string[] PossibleValues { get; set; }
+    public TaskArgumentAttribute(string name, params string[] possibleValues)
     {
-        public string Name { get; set; }
-        public string[] PossibleValues { get; set; }
-        public TaskArgumentAttribute(string name, params string[] possibleValues)
-        {
-            Name = name;
-            PossibleValues = possibleValues;
-        }
+        Name = name;
+        PossibleValues = possibleValues;
     }
-}
+}
\ No newline at end of file
diff --git a/build/docker/BuildContext.cs b/build/docker/BuildContext.cs
index c98a29762f..5c16b64905 100644
--- a/build/docker/BuildContext.cs
+++ b/build/docker/BuildContext.cs
@@ -2,17 +2,16 @@
 using Cake.Core;
 using Common.Utilities;
 
-namespace Docker
+namespace Docker;
+
+public class BuildContext : BuildContextBase
 {
-    public class BuildContext : BuildContextBase
-    {
-        public bool IsDockerOnLinux { get; set; }
+    public bool IsDockerOnLinux { get; set; }
 
-        public IEnumerable<DockerImage> Images { get; set; } = new List<DockerImage>();
-        public DockerRegistry DockerRegistry { get; set; }
+    public IEnumerable<DockerImage> Images { get; set; } = new List<DockerImage>();
+    public DockerRegistry DockerRegistry { get; set; }
 
-        public BuildContext(ICakeContext context) : base(context)
-        {
-        }
+    public BuildContext(ICakeContext context) : base(context)
+    {
     }
-}
+}
\ No newline at end of file
diff --git a/build/docker/BuildLifetime.cs b/build/docker/BuildLifetime.cs
index de399b88e1..bae9c58e54 100644
--- a/build/docker/BuildLifetime.cs
+++ b/build/docker/BuildLifetime.cs
@@ -5,39 +5,38 @@
 using Common.Utilities;
 using Constants = Common.Utilities.Constants;
 
-namespace Docker
+namespace Docker;
+
+public class BuildLifetime : BuildLifetimeBase<BuildContext>
 {
-    public class BuildLifetime : BuildLifetimeBase<BuildContext>
+    public override void Setup(BuildContext context)
     {
-        public override void Setup(BuildContext context)
-        {
-            base.Setup(context);
+        base.Setup(context);
 
-            context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", "") == "linux";
+        context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", "") == "linux";
 
-            var architecture = context.HasArgument(Arguments.Architecture) ? context.Argument<Architecture>(Arguments.Architecture) : (Architecture?)null;
-            var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.DockerHub);
-            var dotnetVersion = context.Argument(Arguments.DockerDotnetVersion, string.Empty).ToLower();
-            var dockerDistro = context.Argument(Arguments.DockerDistro, string.Empty).ToLower();
+        var architecture = context.HasArgument(Arguments.Architecture) ? context.Argument<Architecture>(Arguments.Architecture) : (Architecture?)null;
+        var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.DockerHub);
+        var dotnetVersion = context.Argument(Arguments.DockerDotnetVersion, string.Empty).ToLower();
+        var dockerDistro = context.Argument(Arguments.DockerDistro, string.Empty).ToLower();
 
-            var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.VersionsToBuild : new[] { dotnetVersion };
-            var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistrosToBuild : new[] { dockerDistro };
-            var archs = architecture.HasValue ? new[] { architecture.Value } : Constants.ArchToBuild;
+        var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.VersionsToBuild : new[] { dotnetVersion };
+        var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistrosToBuild : new[] { dockerDistro };
+        var archs = architecture.HasValue ? new[] { architecture.Value } : Constants.ArchToBuild;
 
-            var registry = dockerRegistry == DockerRegistry.DockerHub ? Constants.DockerHubRegistry : Constants.GitHubContainerRegistry;
-            context.DockerRegistry = dockerRegistry;
-            context.Images = from version in versions
-                             from distro in distros
-                             from arch in archs
-                             select new DockerImage(distro, version, arch, registry, false);
+        var registry = dockerRegistry == DockerRegistry.DockerHub ? Constants.DockerHubRegistry : Constants.GitHubContainerRegistry;
+        context.DockerRegistry = dockerRegistry;
+        context.Images = from version in versions
+                         from distro in distros
+                         from arch in archs
+                         select new DockerImage(distro, version, arch, registry, false);
 
-            context.StartGroup("Build Setup");
+        context.StartGroup("Build Setup");
 
-            LogBuildInformation(context);
+        LogBuildInformation(context);
 
-            context.Information("IsDockerOnLinux:   {0}", context.IsDockerOnLinux);
-            context.Information($"Building for Version: {dotnetVersion}, Distro: {dockerDistro}");
-            context.EndGroup();
-        }
+        context.Information("IsDockerOnLinux:   {0}", context.IsDockerOnLinux);
+        context.Information($"Building for Version: {dotnetVersion}, Distro: {dockerDistro}");
+        context.EndGroup();
     }
 }
diff --git a/build/docker/Startup.cs b/build/docker/Startup.cs
index d2182dfeac..4b84e60c00 100644
--- a/build/docker/Startup.cs
+++ b/build/docker/Startup.cs
@@ -4,18 +4,17 @@
 using Common.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Docker
+namespace Docker;
+
+public class Startup : IFrostingStartup
 {
-    public class Startup : IFrostingStartup
+    public void Configure(IServiceCollection services)
     {
-        public void Configure(IServiceCollection services)
-        {
-            services.UseLifetime<BuildLifetime>();
-            services.UseTaskLifetime<BuildTaskLifetime>();
+        services.UseLifetime<BuildLifetime>();
+        services.UseTaskLifetime<BuildTaskLifetime>();
 
-            services.UseWorkingDirectory(Extensions.GetRootDirectory());
+        services.UseWorkingDirectory(Extensions.GetRootDirectory());
 
-            services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
-        }
+        services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
     }
-}
+}
\ No newline at end of file
diff --git a/build/docker/Tasks/Default.cs b/build/docker/Tasks/Default.cs
index 111bbbbb15..259bf0423d 100644
--- a/build/docker/Tasks/Default.cs
+++ b/build/docker/Tasks/Default.cs
@@ -1,9 +1,8 @@
 using Cake.Frosting;
 
-namespace Docker.Tasks
+namespace Docker.Tasks;
+
+[TaskDescription("Shows this output")]
+public class Default : Common.Tasks.Default
 {
-    [TaskDescription("Shows this output")]
-    public class Default : Common.Tasks.Default
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/build/docker/Tasks/DockerBuild.cs b/build/docker/Tasks/DockerBuild.cs
index 1c6429984a..3d1fbb8c3b 100644
--- a/build/docker/Tasks/DockerBuild.cs
+++ b/build/docker/Tasks/DockerBuild.cs
@@ -2,36 +2,35 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Docker.Tasks
+namespace Docker.Tasks;
+
+[TaskName(nameof(DockerBuild))]
+[TaskDescription("Build the docker images containing the GitVersion Tool")]
+[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
+[TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
+public class DockerBuild : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(DockerBuild))]
-    [TaskDescription("Build the docker images containing the GitVersion Tool")]
-    [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-    [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
-    [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
-    [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
-    public class DockerBuild : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(DockerBuild)} works only on Docker on Linux agents.");
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(DockerBuild)} works only on Docker on Linux agents.");
 
-            return shouldRun;
-        }
+        return shouldRun;
+    }
 
-        public override void Run(BuildContext context)
-        {
-            var tool = Paths.Nuget.CombineWithFilePath("GitVersion.Tool*");
-            var dest = Paths.Src.Combine("Docker").Combine("content");
-            context.EnsureDirectoryExists(dest);
-            context.CopyFiles(tool.FullPath, dest);
+    public override void Run(BuildContext context)
+    {
+        var tool = Paths.Nuget.CombineWithFilePath("GitVersion.Tool*");
+        var dest = Paths.Src.Combine("Docker").Combine("content");
+        context.EnsureDirectoryExists(dest);
+        context.CopyFiles(tool.FullPath, dest);
 
-            foreach (var dockerImage in context.Images)
-            {
-                if (context.SkipArm64Image(dockerImage)) continue;
-                context.DockerBuildImage(dockerImage);
-            }
+        foreach (var dockerImage in context.Images)
+        {
+            if (context.SkipArm64Image(dockerImage)) continue;
+            context.DockerBuildImage(dockerImage);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/build/docker/Tasks/DockerManifest.cs b/build/docker/Tasks/DockerManifest.cs
index b7b1802803..716d480cda 100644
--- a/build/docker/Tasks/DockerManifest.cs
+++ b/build/docker/Tasks/DockerManifest.cs
@@ -3,56 +3,55 @@
 using Common.Utilities;
 using Constants = Common.Utilities.Constants;
 
-namespace Docker.Tasks
+namespace Docker.Tasks;
+
+[TaskName(nameof(DockerManifest))]
+[TaskDescription("Publish the docker manifest containing the images for amd64 and arm64")]
+[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
+[IsDependentOn(typeof(DockerManifestInternal))]
+public class DockerManifest : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(DockerManifest))]
-    [TaskDescription("Publish the docker manifest containing the images for amd64 and arm64")]
-    [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-    [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
-    [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
-    [IsDependentOn(typeof(DockerManifestInternal))]
-    public class DockerManifest : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(DockerPublish)} works only on GitHub Actions.");
-            return shouldRun;
-        }
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(DockerPublish)} works only on GitHub Actions.");
+        return shouldRun;
     }
+}
 
-    [TaskName(nameof(DockerManifestInternal))]
-    [TaskDescription("Publish the docker manifest containing the images for amd64 and arm64")]
-    public class DockerManifestInternal : FrostingTask<BuildContext>
+[TaskName(nameof(DockerManifestInternal))]
+[TaskDescription("Publish the docker manifest containing the images for amd64 and arm64")]
+public class DockerManifestInternal : FrostingTask<BuildContext>
+{
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(DockerPublish)} works only on GitHub Actions.");
-            shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(DockerPublish)} works only on Docker on Linux agents.");
-
-            if (context.DockerRegistry == DockerRegistry.GitHub)
-            {
-                shouldRun &= context.ShouldRun(context.IsStableRelease || context.IsPreRelease, $"{nameof(DockerPublish)} to GitHub Package Registry works only for releases.");
-            }
-            if (context.DockerRegistry == DockerRegistry.DockerHub)
-            {
-                shouldRun &= context.ShouldRun(context.IsStableRelease, $"{nameof(DockerPublish)} DockerHub works only for tagged releases.");
-            }
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(DockerPublish)} works only on GitHub Actions.");
+        shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(DockerPublish)} works only on Docker on Linux agents.");
 
-            return shouldRun;
+        if (context.DockerRegistry == DockerRegistry.GitHub)
+        {
+            shouldRun &= context.ShouldRun(context.IsStableRelease || context.IsPreRelease, $"{nameof(DockerPublish)} to GitHub Package Registry works only for releases.");
+        }
+        if (context.DockerRegistry == DockerRegistry.DockerHub)
+        {
+            shouldRun &= context.ShouldRun(context.IsStableRelease, $"{nameof(DockerPublish)} DockerHub works only for tagged releases.");
         }
 
-        public override void Run(BuildContext context)
+        return shouldRun;
+    }
+
+    public override void Run(BuildContext context)
+    {
+        foreach (var group in context.Images.GroupBy(x => new { x.Distro, x.TargetFramework }))
         {
-            foreach (var group in context.Images.GroupBy(x => new { x.Distro, x.TargetFramework }))
-            {
-                var amd64DockerImage = group.First(x => x.Architecture == Architecture.Amd64);
-                var arm64DockerImage = group.First(x => x.Architecture == Architecture.Arm64);
-                context.DockerCreateManifest(amd64DockerImage, context.SkipArm64Image(arm64DockerImage));
-                context.DockerPushManifest(amd64DockerImage);
-                context.DockerRemoveManifest(amd64DockerImage);
-            }
+            var amd64DockerImage = group.First(x => x.Architecture == Architecture.Amd64);
+            var arm64DockerImage = group.First(x => x.Architecture == Architecture.Arm64);
+            context.DockerCreateManifest(amd64DockerImage, context.SkipArm64Image(arm64DockerImage));
+            context.DockerPushManifest(amd64DockerImage);
+            context.DockerRemoveManifest(amd64DockerImage);
         }
     }
 }
diff --git a/build/docker/Tasks/DockerPublish.cs b/build/docker/Tasks/DockerPublish.cs
index 5a4bb8aa85..01478f1ed0 100644
--- a/build/docker/Tasks/DockerPublish.cs
+++ b/build/docker/Tasks/DockerPublish.cs
@@ -1,54 +1,53 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Docker.Tasks
+namespace Docker.Tasks;
+
+[TaskName(nameof(DockerPublish))]
+[TaskDescription("Publish the docker images containing the GitVersion Tool")]
+[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
+[TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
+[IsDependentOn(typeof(DockerPublishInternal))]
+public class DockerPublish : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(DockerPublish))]
-    [TaskDescription("Publish the docker images containing the GitVersion Tool")]
-    [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-    [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
-    [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
-    [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
-    [IsDependentOn(typeof(DockerPublishInternal))]
-    public class DockerPublish : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(DockerPublish)} works only on GitHub Actions.");
-            return shouldRun;
-        }
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(DockerPublish)} works only on GitHub Actions.");
+        return shouldRun;
     }
+}
 
-    [TaskName(nameof(DockerPublishInternal))]
-    [TaskDescription("Publish the docker images containing the GitVersion Tool")]
-    [IsDependentOn(typeof(DockerTest))]
-    public class DockerPublishInternal : FrostingTask<BuildContext>
+[TaskName(nameof(DockerPublishInternal))]
+[TaskDescription("Publish the docker images containing the GitVersion Tool")]
+[IsDependentOn(typeof(DockerTest))]
+public class DockerPublishInternal : FrostingTask<BuildContext>
+{
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(DockerPublish)} works only on GitHub Actions.");
+        shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(DockerPublish)} works only on Docker on Linux agents.");
+        if (context.DockerRegistry == DockerRegistry.GitHub)
         {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(DockerPublish)} works only on GitHub Actions.");
-            shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(DockerPublish)} works only on Docker on Linux agents.");
-            if (context.DockerRegistry == DockerRegistry.GitHub)
-            {
-                shouldRun &= context.ShouldRun(context.IsStableRelease || context.IsPreRelease, $"{nameof(DockerPublish)} to GitHub Package Registry works only for releases.");
-            }
-            if (context.DockerRegistry == DockerRegistry.DockerHub)
-            {
-                shouldRun &= context.ShouldRun(context.IsStableRelease, $"{nameof(DockerPublish)} DockerHub works only for tagged releases.");
-            }
-
-            return shouldRun;
+            shouldRun &= context.ShouldRun(context.IsStableRelease || context.IsPreRelease, $"{nameof(DockerPublish)} to GitHub Package Registry works only for releases.");
         }
+        if (context.DockerRegistry == DockerRegistry.DockerHub)
+        {
+            shouldRun &= context.ShouldRun(context.IsStableRelease, $"{nameof(DockerPublish)} DockerHub works only for tagged releases.");
+        }
+
+        return shouldRun;
+    }
 
-        public override void Run(BuildContext context)
+    public override void Run(BuildContext context)
+    {
+        foreach (var dockerImage in context.Images)
         {
-            foreach (var dockerImage in context.Images)
-            {
-                if (context.SkipArm64Image(dockerImage)) continue;
-                context.DockerPushImage(dockerImage);
-            }
+            if (context.SkipArm64Image(dockerImage)) continue;
+            context.DockerPushImage(dockerImage);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/build/docker/Tasks/DockerTest.cs b/build/docker/Tasks/DockerTest.cs
index 0330efd960..f649c591c9 100644
--- a/build/docker/Tasks/DockerTest.cs
+++ b/build/docker/Tasks/DockerTest.cs
@@ -1,32 +1,31 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Docker.Tasks
+namespace Docker.Tasks;
+
+[TaskName(nameof(DockerTest))]
+[TaskDescription("Test the docker images containing the GitVersion Tool")]
+[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
+[TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
+[IsDependentOn(typeof(DockerBuild))]
+public class DockerTest : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(DockerTest))]
-    [TaskDescription("Test the docker images containing the GitVersion Tool")]
-    [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-    [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
-    [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
-    [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
-    [IsDependentOn(typeof(DockerBuild))]
-    public class DockerTest : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(DockerTest)} works only on Docker on Linux agents.");
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(DockerTest)} works only on Docker on Linux agents.");
 
-            return shouldRun;
-        }
+        return shouldRun;
+    }
 
-        public override void Run(BuildContext context)
+    public override void Run(BuildContext context)
+    {
+        foreach (var dockerImage in context.Images)
         {
-            foreach (var dockerImage in context.Images)
-            {
-                if (context.SkipArm64Image(dockerImage)) continue;
-                context.DockerTestImage(dockerImage);
-            }
+            if (context.SkipArm64Image(dockerImage)) continue;
+            context.DockerTestImage(dockerImage);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/build/docker/Utilities/IsExternalInit.cs b/build/docker/Utilities/IsExternalInit.cs
index 5023ab29a8..ae51612719 100644
--- a/build/docker/Utilities/IsExternalInit.cs
+++ b/build/docker/Utilities/IsExternalInit.cs
@@ -1,13 +1,12 @@
 using System.ComponentModel;
 
-namespace System.Runtime.CompilerServices
+namespace System.Runtime.CompilerServices;
+
+/// <summary>
+/// Reserved to be used by the compiler for tracking metadata.
+/// This class should not be used by developers in source code.
+/// </summary>
+[EditorBrowsable(EditorBrowsableState.Never)]
+public static class IsExternalInit
 {
-    /// <summary>
-    /// Reserved to be used by the compiler for tracking metadata.
-    /// This class should not be used by developers in source code.
-    /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public static class IsExternalInit
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/build/docs/BuildContext.cs b/build/docs/BuildContext.cs
index ef5809d354..c5739abd48 100644
--- a/build/docs/BuildContext.cs
+++ b/build/docs/BuildContext.cs
@@ -3,16 +3,15 @@
 using Common.Utilities;
 using Docs.Utilities;
 
-namespace Docs
+namespace Docs;
+
+public class BuildContext : BuildContextBase
 {
-    public class BuildContext : BuildContextBase
-    {
-        public bool ForcePublish { get; set; }
-        public Credentials? Credentials { get; set; }
-        public WyamSettings? WyamSettings { get; set; }
+    public bool ForcePublish { get; set; }
+    public Credentials? Credentials { get; set; }
+    public WyamSettings? WyamSettings { get; set; }
 
-        public BuildContext(ICakeContext context) : base(context)
-        {
-        }
+    public BuildContext(ICakeContext context) : base(context)
+    {
     }
-}
+}
\ No newline at end of file
diff --git a/build/docs/BuildLifetime.cs b/build/docs/BuildLifetime.cs
index 793ae3b4fe..86edece213 100644
--- a/build/docs/BuildLifetime.cs
+++ b/build/docs/BuildLifetime.cs
@@ -5,36 +5,35 @@
 using Common.Utilities;
 using Docs.Utilities;
 
-namespace Docs
+namespace Docs;
+
+public class BuildLifetime : BuildLifetimeBase<BuildContext>
 {
-    public class BuildLifetime : BuildLifetimeBase<BuildContext>
+    public override void Setup(BuildContext context)
     {
-        public override void Setup(BuildContext context)
-        {
-            context.Credentials = Credentials.GetCredentials(context);
-            context.ForcePublish = context.HasArgument("force");
+        context.Credentials = Credentials.GetCredentials(context);
+        context.ForcePublish = context.HasArgument("force");
 
-            context.WyamSettings = new WyamSettings
+        context.WyamSettings = new WyamSettings
+        {
+            Recipe = "Docs",
+            Theme = "Samson",
+            OutputPath = context.MakeAbsolute(Paths.ArtifactsDocs.Combine("preview")),
+            RootPath = context.MakeAbsolute(Paths.Docs),
+            ConfigurationFile = context.MakeAbsolute(Paths.Docs.CombineWithFilePath("config.wyam")),
+            Settings = new Dictionary<string, object>
             {
-                Recipe = "Docs",
-                Theme = "Samson",
-                OutputPath = context.MakeAbsolute(Paths.ArtifactsDocs.Combine("preview")),
-                RootPath = context.MakeAbsolute(Paths.Docs),
-                ConfigurationFile = context.MakeAbsolute(Paths.Docs.CombineWithFilePath("config.wyam")),
-                Settings = new Dictionary<string, object>
-                {
-                    { "BaseEditUrl", "https://github.com/gittools/GitVersion/tree/main/docs/input/" },
-                    { "SourceFiles", context.MakeAbsolute(Paths.Src) + "/**/{!bin,!obj,!packages,!*.Tests,!GitTools.*,}/**/*.cs" },
-                    { "Title", "GitVersion" },
-                    { "IncludeGlobalNamespace", false }
-                }
-            };
+                { "BaseEditUrl", "https://github.com/gittools/GitVersion/tree/main/docs/input/" },
+                { "SourceFiles", context.MakeAbsolute(Paths.Src) + "/**/{!bin,!obj,!packages,!*.Tests,!GitTools.*,}/**/*.cs" },
+                { "Title", "GitVersion" },
+                { "IncludeGlobalNamespace", false }
+            }
+        };
 
-            context.StartGroup("Build Setup");
+        context.StartGroup("Build Setup");
 
-            LogBuildInformation(context);
+        LogBuildInformation(context);
 
-            context.EndGroup();
-        }
+        context.EndGroup();
     }
-}
+}
\ No newline at end of file
diff --git a/build/docs/Startup.cs b/build/docs/Startup.cs
index 67910390c2..353c9601dc 100644
--- a/build/docs/Startup.cs
+++ b/build/docs/Startup.cs
@@ -4,18 +4,17 @@
 using Common.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Docs
+namespace Docs;
+
+public class Startup : IFrostingStartup
 {
-    public class Startup : IFrostingStartup
+    public void Configure(IServiceCollection services)
     {
-        public void Configure(IServiceCollection services)
-        {
-            services.UseLifetime<BuildLifetime>();
-            services.UseTaskLifetime<BuildTaskLifetime>();
+        services.UseLifetime<BuildLifetime>();
+        services.UseTaskLifetime<BuildTaskLifetime>();
 
-            services.UseWorkingDirectory(Extensions.GetRootDirectory());
+        services.UseWorkingDirectory(Extensions.GetRootDirectory());
 
-            services.UseTool(new Uri("dotnet:?package=Wyam.Tool&version=2.2.9"));
-        }
+        services.UseTool(new Uri("dotnet:?package=Wyam.Tool&version=2.2.9"));
     }
-}
+}
\ No newline at end of file
diff --git a/build/docs/Tasks/BuildDocs.cs b/build/docs/Tasks/BuildDocs.cs
index 008c3217e8..36580dc972 100644
--- a/build/docs/Tasks/BuildDocs.cs
+++ b/build/docs/Tasks/BuildDocs.cs
@@ -3,27 +3,26 @@
 using Cake.Wyam;
 using Common.Utilities;
 
-namespace Docs.Tasks
+namespace Docs.Tasks;
+
+[TaskName(nameof(BuildDocs))]
+[TaskDescription("Builds the docs to local path")]
+[IsDependentOn(typeof(Clean))]
+public sealed class BuildDocs : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(BuildDocs))]
-    [TaskDescription("Builds the docs to local path")]
-    [IsDependentOn(typeof(Clean))]
-    public sealed class BuildDocs : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.DirectoryExists(Paths.Docs), "Wyam documentation directory is missing");
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.DirectoryExists(Paths.Docs), "Wyam documentation directory is missing");
 
-            return shouldRun;
-        }
+        return shouldRun;
+    }
 
-        public override void Run(BuildContext context)
+    public override void Run(BuildContext context)
+    {
+        if (context.WyamSettings is not null)
         {
-            if (context.WyamSettings is not null)
-            {
-                context.Wyam(context.WyamSettings);
-            }
+            context.Wyam(context.WyamSettings);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/build/docs/Tasks/Clean.cs b/build/docs/Tasks/Clean.cs
index 9d1cb8d3e9..aea0409665 100644
--- a/build/docs/Tasks/Clean.cs
+++ b/build/docs/Tasks/Clean.cs
@@ -3,17 +3,16 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Docs.Tasks
+namespace Docs.Tasks;
+
+[TaskName(nameof(Clean))]
+[TaskDescription("Cleans the temporary publish location")]
+public sealed class Clean : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(Clean))]
-    [TaskDescription("Cleans the temporary publish location")]
-    public sealed class Clean : FrostingTask<BuildContext>
+    public override void Run(BuildContext context)
     {
-        public override void Run(BuildContext context)
-        {
-            context.Information("Cleaning directories...");
+        context.Information("Cleaning directories...");
 
-            context.EnsureDirectoryExists(Paths.ArtifactsDocs.Combine("_published"));
-        }
+        context.EnsureDirectoryExists(Paths.ArtifactsDocs.Combine("_published"));
     }
-}
+}
\ No newline at end of file
diff --git a/build/docs/Tasks/Default.cs b/build/docs/Tasks/Default.cs
index 8be7cc242d..1e4fc9a77d 100644
--- a/build/docs/Tasks/Default.cs
+++ b/build/docs/Tasks/Default.cs
@@ -1,9 +1,8 @@
 using Cake.Frosting;
 
-namespace Docs.Tasks
+namespace Docs.Tasks;
+
+[TaskDescription("Shows this output")]
+public class Default : Common.Tasks.Default
 {
-    [TaskDescription("Shows this output")]
-    public class Default : Common.Tasks.Default
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/build/docs/Tasks/PreviewDocs.cs b/build/docs/Tasks/PreviewDocs.cs
index 7be3d3cff8..76e63329e7 100644
--- a/build/docs/Tasks/PreviewDocs.cs
+++ b/build/docs/Tasks/PreviewDocs.cs
@@ -3,30 +3,29 @@
 using Cake.Wyam;
 using Common.Utilities;
 
-namespace Docs.Tasks
+namespace Docs.Tasks;
+
+[TaskName(nameof(PreviewDocs))]
+[TaskDescription("Run a local server with docs in preview")]
+[IsDependentOn(typeof(Clean))]
+public sealed class PreviewDocs : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(PreviewDocs))]
-    [TaskDescription("Run a local server with docs in preview")]
-    [IsDependentOn(typeof(Clean))]
-    public sealed class PreviewDocs : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.DirectoryExists(Paths.Docs), "Wyam documentation directory is missing");
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.DirectoryExists(Paths.Docs), "Wyam documentation directory is missing");
 
-            return shouldRun;
-        }
+        return shouldRun;
+    }
 
-        public override void Run(BuildContext context)
+    public override void Run(BuildContext context)
+    {
+        if (context.WyamSettings is not null)
         {
-            if (context.WyamSettings is not null)
-            {
-                context.WyamSettings.Preview = true;
-                context.WyamSettings.Watch = true;
-                context.WyamSettings.Settings.Add("Host", "gittools.github.io");
-                context.Wyam(context.WyamSettings);
-            }
+            context.WyamSettings.Preview = true;
+            context.WyamSettings.Watch = true;
+            context.WyamSettings.Settings.Add("Host", "gittools.github.io");
+            context.Wyam(context.WyamSettings);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/build/docs/Tasks/PublishDocs.cs b/build/docs/Tasks/PublishDocs.cs
index 9e3b0f33e1..2832690b1d 100644
--- a/build/docs/Tasks/PublishDocs.cs
+++ b/build/docs/Tasks/PublishDocs.cs
@@ -9,121 +9,120 @@
 using Cake.Wyam;
 using Common.Utilities;
 
-namespace Docs.Tasks
+namespace Docs.Tasks;
+
+[TaskName(nameof(PublishDocs))]
+[TaskDescription("Published the docs changes to docs specific branch")]
+[IsDependentOn(typeof(PublishDocsInternal))]
+public sealed class PublishDocs : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(PublishDocs))]
-    [TaskDescription("Published the docs changes to docs specific branch")]
-    [IsDependentOn(typeof(PublishDocsInternal))]
-    public sealed class PublishDocs : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.DirectoryExists(Paths.Docs), "Wyam documentation directory is missing");
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.DirectoryExists(Paths.Docs), "Wyam documentation directory is missing");
 
-            return shouldRun;
-        }
+        return shouldRun;
     }
+}
 
-    [TaskName(nameof(PublishDocsInternal))]
-    [TaskDescription("Published the docs changes to docs specific branch")]
-    [IsDependentOn(typeof(Clean))]
-    public sealed class PublishDocsInternal : FrostingTask<BuildContext>
+[TaskName(nameof(PublishDocsInternal))]
+[TaskDescription("Published the docs changes to docs specific branch")]
+[IsDependentOn(typeof(Clean))]
+public sealed class PublishDocsInternal : FrostingTask<BuildContext>
+{
+    public override bool ShouldRun(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
-        {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.DirectoryExists(Paths.Docs), "Wyam documentation directory is missing");
-            shouldRun &= context.ShouldRun(context.IsStableRelease || context.IsPreRelease || context.ForcePublish, $"{nameof(PublishDocs)} works only for releases.");
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.DirectoryExists(Paths.Docs), "Wyam documentation directory is missing");
+        shouldRun &= context.ShouldRun(context.IsStableRelease || context.IsPreRelease || context.ForcePublish, $"{nameof(PublishDocs)} works only for releases.");
 
-            return shouldRun;
-        }
+        return shouldRun;
+    }
 
-        public override void Run(BuildContext context)
+    public override void Run(BuildContext context)
+    {
+        if (context.ForcePublish is false)
         {
-            if (context.ForcePublish is false)
+            if (AnyDocsChanged(context))
             {
-                if (AnyDocsChanged(context))
-                {
-                    context.Information("Performing a docs publish. Detected docs changes");
-                    PublishDocumentation(context);
-                }
-                else
-                {
-                    context.Information("No docs have changed, so no need to generate documentation");
-                }
+                context.Information("Performing a docs publish. Detected docs changes");
+                PublishDocumentation(context);
             }
             else
             {
-                context.Information("Performing a forced docs publish...");
-                PublishDocumentation(context);
+                context.Information("No docs have changed, so no need to generate documentation");
             }
         }
-        private static bool AnyDocsChanged(ICakeContext context)
+        else
         {
-            var sourceCommit = context.GitLogTip(Paths.Root);
-            var filesChanged = context.GitDiff(Paths.Root, sourceCommit.Sha);
-
-            const string path = "docs/";
-            var docFileChanged = filesChanged.Any(file => file.OldPath.StartsWith(path) || file.Path.StartsWith(path) || file.Path.Contains("config.wyam"));
-            return docFileChanged;
+            context.Information("Performing a forced docs publish...");
+            PublishDocumentation(context);
         }
+    }
+    private static bool AnyDocsChanged(ICakeContext context)
+    {
+        var sourceCommit = context.GitLogTip(Paths.Root);
+        var filesChanged = context.GitDiff(Paths.Root, sourceCommit.Sha);
+
+        const string path = "docs/";
+        var docFileChanged = filesChanged.Any(file => file.OldPath.StartsWith(path) || file.Path.StartsWith(path) || file.Path.Contains("config.wyam"));
+        return docFileChanged;
+    }
+
+    private static void PublishDocumentation(BuildContext context)
+    {
+        const string publishBranchName = "gh-pages";
+        var sourceCommit = context.GitLogTip("./");
 
-        private static void PublishDocumentation(BuildContext context)
+        var publishFolder = context.MakeAbsolute(Paths.ArtifactsDocs.Combine("_published").Combine(DateTime.Now.ToString("yyyyMMdd_HHmmss")));
+        context.Information("Publishing Folder: {0}", publishFolder);
+        context.Information("Getting publish branch...");
+        context.GitClone($"https://github.com/{Constants.RepoOwner}/{Constants.Repository}", publishFolder, new GitCloneSettings
         {
-            const string publishBranchName = "gh-pages";
-            var sourceCommit = context.GitLogTip("./");
+            BranchName = publishBranchName
+        });
 
-            var publishFolder = context.MakeAbsolute(Paths.ArtifactsDocs.Combine("_published").Combine(DateTime.Now.ToString("yyyyMMdd_HHmmss")));
-            context.Information("Publishing Folder: {0}", publishFolder);
-            context.Information("Getting publish branch...");
-            context.GitClone($"https://github.com/{Constants.RepoOwner}/{Constants.Repository}", publishFolder, new GitCloneSettings
-            {
-                BranchName = publishBranchName
-            });
+        if (context.WyamSettings is not null)
+        {
+            context.WyamSettings.OutputPath = publishFolder;
+            context.WyamSettings.NoClean = true;
+            context.Wyam(context.WyamSettings);
+        }
 
-            if (context.WyamSettings is not null)
-            {
-                context.WyamSettings.OutputPath = publishFolder;
-                context.WyamSettings.NoClean = true;
-                context.Wyam(context.WyamSettings);
-            }
+        if (!context.GitHasUncommitedChanges(publishFolder)) return;
 
-            if (!context.GitHasUncommitedChanges(publishFolder)) return;
+        context.Information("Stage all changes...");
+        context.GitAddAll(publishFolder);
 
-            context.Information("Stage all changes...");
-            context.GitAddAll(publishFolder);
+        if (!context.GitHasStagedChanges(publishFolder)) return;
 
-            if (!context.GitHasStagedChanges(publishFolder)) return;
+        context.Information("Commit all changes...");
+        context.GitCommit(
+            publishFolder,
+            sourceCommit.Committer.Name,
+            sourceCommit.Committer.Email,
+            $"Continuous Integration Publish: {sourceCommit.Sha}\r\n{sourceCommit.Message}"
+        );
 
-            context.Information("Commit all changes...");
-            context.GitCommit(
-                publishFolder,
-                sourceCommit.Committer.Name,
-                sourceCommit.Committer.Email,
-                $"Continuous Integration Publish: {sourceCommit.Sha}\r\n{sourceCommit.Message}"
-            );
+        PublishToGitHub(context, publishFolder, publishBranchName);
+    }
 
-            PublishToGitHub(context, publishFolder, publishBranchName);
+    private static void PublishToGitHub(BuildContext context, DirectoryPath publishFolder, string publishBranchName)
+    {
+        var token = context.Credentials?.GitHub?.Token;
+        if (string.IsNullOrEmpty(token))
+        {
+            throw new InvalidOperationException("Could not resolve Github token.");
         }
 
-        private static void PublishToGitHub(BuildContext context, DirectoryPath publishFolder, string publishBranchName)
+        var username = context.Credentials?.GitHub?.UserName;
+        if (string.IsNullOrEmpty(username))
         {
-            var token = context.Credentials?.GitHub?.Token;
-            if (string.IsNullOrEmpty(token))
-            {
-                throw new InvalidOperationException("Could not resolve Github token.");
-            }
-
-            var username = context.Credentials?.GitHub?.UserName;
-            if (string.IsNullOrEmpty(username))
-            {
-                throw new InvalidOperationException("Could not resolve Github username.");
-            }
+            throw new InvalidOperationException("Could not resolve Github username.");
+        }
 
-            context.Information("Pushing all changes...");
+        context.Information("Pushing all changes...");
 
-            context.GitPushBranch(publishFolder, username, token, publishBranchName);
-        }
+        context.GitPushBranch(publishFolder, username, token, publishBranchName);
     }
-}
+}
\ No newline at end of file
diff --git a/build/docs/Utilities/Credentials.cs b/build/docs/Utilities/Credentials.cs
index 8e575b9dd9..6ce642f10a 100644
--- a/build/docs/Utilities/Credentials.cs
+++ b/build/docs/Utilities/Credentials.cs
@@ -2,16 +2,15 @@
 using Cake.Core;
 using Common.Utilities;
 
-namespace Docs.Utilities
+namespace Docs.Utilities;
+
+public class Credentials
 {
-    public class Credentials
+    public GitHubCredentials? GitHub { get; private set; }
+    public static Credentials GetCredentials(ICakeContext context) => new()
     {
-        public GitHubCredentials? GitHub { get; private set; }
-        public static Credentials GetCredentials(ICakeContext context) => new()
-        {
-            GitHub = new GitHubCredentials(
-                context.EnvironmentVariable("GITHUB_TOKEN"),
-                context.EnvironmentVariable("GITHUB_USERNAME"))
-        };
-    }
-}
+        GitHub = new GitHubCredentials(
+            context.EnvironmentVariable("GITHUB_TOKEN"),
+            context.EnvironmentVariable("GITHUB_USERNAME"))
+    };
+}
\ No newline at end of file
diff --git a/build/docs/Utilities/IsExternalInit.cs b/build/docs/Utilities/IsExternalInit.cs
index 5023ab29a8..ae51612719 100644
--- a/build/docs/Utilities/IsExternalInit.cs
+++ b/build/docs/Utilities/IsExternalInit.cs
@@ -1,13 +1,12 @@
 using System.ComponentModel;
 
-namespace System.Runtime.CompilerServices
+namespace System.Runtime.CompilerServices;
+
+/// <summary>
+/// Reserved to be used by the compiler for tracking metadata.
+/// This class should not be used by developers in source code.
+/// </summary>
+[EditorBrowsable(EditorBrowsableState.Never)]
+public static class IsExternalInit
 {
-    /// <summary>
-    /// Reserved to be used by the compiler for tracking metadata.
-    /// This class should not be used by developers in source code.
-    /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public static class IsExternalInit
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/build/publish/BuildContext.cs b/build/publish/BuildContext.cs
index b46b43085b..69c49d20e0 100644
--- a/build/publish/BuildContext.cs
+++ b/build/publish/BuildContext.cs
@@ -3,15 +3,14 @@
 using Common.Utilities;
 using Publish.Utilities;
 
-namespace Publish
+namespace Publish;
+
+public class BuildContext : BuildContextBase
 {
-    public class BuildContext : BuildContextBase
-    {
-        public Credentials? Credentials { get; set; }
+    public Credentials? Credentials { get; set; }
 
-        public List<NugetPackage> Packages { get; set; } = new();
-        public BuildContext(ICakeContext context) : base(context)
-        {
-        }
+    public List<NugetPackage> Packages { get; set; } = new();
+    public BuildContext(ICakeContext context) : base(context)
+    {
     }
-}
+}
\ No newline at end of file
diff --git a/build/publish/BuildLifetime.cs b/build/publish/BuildLifetime.cs
index 77ee797914..15db341e09 100644
--- a/build/publish/BuildLifetime.cs
+++ b/build/publish/BuildLifetime.cs
@@ -3,29 +3,28 @@
 using Common.Utilities;
 using Publish.Utilities;
 
-namespace Publish
+namespace Publish;
+
+public class BuildLifetime : BuildLifetimeBase<BuildContext>
 {
-    public class BuildLifetime : BuildLifetimeBase<BuildContext>
+    public override void Setup(BuildContext context)
     {
-        public override void Setup(BuildContext context)
+        base.Setup(context);
+        context.Credentials = Credentials.GetCredentials(context);
+
+        if (context.Version?.NugetVersion != null)
         {
-            base.Setup(context);
-            context.Credentials = Credentials.GetCredentials(context);
+            var nugetVersion = context.Version.NugetVersion;
 
-            if (context.Version?.NugetVersion != null)
+            var nugetPackagesFiles = context.GetFiles(Paths.Nuget + "/*.nupkg");
+            foreach (var packageFile in nugetPackagesFiles)
             {
-                var nugetVersion = context.Version.NugetVersion;
-
-                var nugetPackagesFiles = context.GetFiles(Paths.Nuget + "/*.nupkg");
-                foreach (var packageFile in nugetPackagesFiles)
-                {
-                    var packageName = packageFile.GetFilenameWithoutExtension().ToString()[..^(nugetVersion.Length + 1)].ToLower();
-                    context.Packages.Add(new NugetPackage(packageName, packageFile, packageName.Contains("Portable", StringComparison.OrdinalIgnoreCase)));
-                }
+                var packageName = packageFile.GetFilenameWithoutExtension().ToString()[..^(nugetVersion.Length + 1)].ToLower();
+                context.Packages.Add(new NugetPackage(packageName, packageFile, packageName.Contains("Portable", StringComparison.OrdinalIgnoreCase)));
             }
-            context.StartGroup("Build Setup");
-            LogBuildInformation(context);
-            context.EndGroup();
         }
+        context.StartGroup("Build Setup");
+        LogBuildInformation(context);
+        context.EndGroup();
     }
-}
+}
\ No newline at end of file
diff --git a/build/publish/Startup.cs b/build/publish/Startup.cs
index e2d6cc2ec8..e6b60aef72 100644
--- a/build/publish/Startup.cs
+++ b/build/publish/Startup.cs
@@ -4,18 +4,17 @@
 using Common.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Publish
+namespace Publish;
+
+public class Startup : IFrostingStartup
 {
-    public class Startup : IFrostingStartup
+    public void Configure(IServiceCollection services)
     {
-        public void Configure(IServiceCollection services)
-        {
-            services.UseLifetime<BuildLifetime>();
-            services.UseTaskLifetime<BuildTaskLifetime>();
+        services.UseLifetime<BuildLifetime>();
+        services.UseTaskLifetime<BuildTaskLifetime>();
 
-            services.UseWorkingDirectory(Extensions.GetRootDirectory());
+        services.UseWorkingDirectory(Extensions.GetRootDirectory());
 
-            services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
-        }
+        services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
     }
-}
+}
\ No newline at end of file
diff --git a/build/publish/Tasks/Default.cs b/build/publish/Tasks/Default.cs
index d8fa604728..215a38ab17 100644
--- a/build/publish/Tasks/Default.cs
+++ b/build/publish/Tasks/Default.cs
@@ -1,9 +1,8 @@
 using Cake.Frosting;
 
-namespace Publish.Tasks
+namespace Publish.Tasks;
+
+[TaskDescription("Shows this output")]
+public class Default : Common.Tasks.Default
 {
-    [TaskDescription("Shows this output")]
-    public class Default : Common.Tasks.Default
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/build/publish/Tasks/PublishChocolatey.cs b/build/publish/Tasks/PublishChocolatey.cs
index 3ee17e9b75..41072f3254 100644
--- a/build/publish/Tasks/PublishChocolatey.cs
+++ b/build/publish/Tasks/PublishChocolatey.cs
@@ -7,66 +7,65 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Publish.Tasks
+namespace Publish.Tasks;
+
+[TaskName(nameof(PublishChocolatey))]
+[TaskDescription("Publish chocolatey packages")]
+[IsDependentOn(typeof(PublishChocolateyInternal))]
+public class PublishChocolatey : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(PublishChocolatey))]
-    [TaskDescription("Publish chocolatey packages")]
-    [IsDependentOn(typeof(PublishChocolateyInternal))]
-    public class PublishChocolatey : FrostingTask<BuildContext>
+}
+
+[TaskName(nameof(PublishChocolateyInternal))]
+[TaskDescription("Publish chocolatey packages")]
+public class PublishChocolateyInternal : FrostingTask<BuildContext>
+{
+    public override bool ShouldRun(BuildContext context)
     {
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(PublishChocolatey)} works only on GitHub Actions.");
+        shouldRun &= context.ShouldRun(context.IsOnWindows, $"{nameof(PublishChocolatey)} works only on windows.");
+        shouldRun &= context.ShouldRun(context.IsStableRelease, $"{nameof(PublishChocolatey)} works only for stable releases.");
+
+        return shouldRun;
     }
 
-    [TaskName(nameof(PublishChocolateyInternal))]
-    [TaskDescription("Publish chocolatey packages")]
-    public class PublishChocolateyInternal : FrostingTask<BuildContext>
+    public override void Run(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
+        var apiKey = context.Credentials?.Chocolatey?.ApiKey;
+        if (string.IsNullOrEmpty(apiKey))
         {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(PublishChocolatey)} works only on GitHub Actions.");
-            shouldRun &= context.ShouldRun(context.IsOnWindows, $"{nameof(PublishChocolatey)} works only on windows.");
-            shouldRun &= context.ShouldRun(context.IsStableRelease, $"{nameof(PublishChocolatey)} works only for stable releases.");
-
-            return shouldRun;
+            throw new InvalidOperationException("Could not resolve Chocolatey API key.");
         }
 
-        public override void Run(BuildContext context)
+        var nugetVersion = context.Version!.NugetVersion;
+        foreach (var (packageName, filePath, _) in context.Packages.Where(x => x.IsChocoPackage))
         {
-            var apiKey = context.Credentials?.Chocolatey?.ApiKey;
-            if (string.IsNullOrEmpty(apiKey))
-            {
-                throw new InvalidOperationException("Could not resolve Chocolatey API key.");
-            }
-
-            var nugetVersion = context.Version!.NugetVersion;
-            foreach (var (packageName, filePath, _) in context.Packages.Where(x => x.IsChocoPackage))
+            if (!IsPackagePublished(context, packageName, nugetVersion))
             {
-                if (!IsPackagePublished(context, packageName, nugetVersion))
+                try
                 {
-                    try
+                    context.Information($"Package {packageName}, version {nugetVersion} is being published.");
+                    context.ChocolateyPush(filePath.FullPath, new ChocolateyPushSettings
                     {
-                        context.Information($"Package {packageName}, version {nugetVersion} is being published.");
-                        context.ChocolateyPush(filePath.FullPath, new ChocolateyPushSettings
-                        {
-                            ApiKey = apiKey,
-                            Source = Constants.ChocolateyUrl,
-                            Force = true
-                        });
-                    }
-                    catch (Exception)
-                    {
-                        context.Warning($"There is an exception publishing the Package {packageName}.");
-                        // chocolatey sometimes fails with an error, even if the package gets pushed
-                    }
+                        ApiKey = apiKey,
+                        Source = Constants.ChocolateyUrl,
+                        Force = true
+                    });
+                }
+                catch (Exception)
+                {
+                    context.Warning($"There is an exception publishing the Package {packageName}.");
+                    // chocolatey sometimes fails with an error, even if the package gets pushed
                 }
             }
         }
+    }
 
-        private static bool IsPackagePublished(ICakeContext context, string packageName, string? nugetVersion)
-        {
-            var chocoExe = context.Tools.Resolve("choco.exe");
-            var chocoListOutput = context.ExecuteCommand(chocoExe, $"list {packageName} --version={nugetVersion}");
-            return chocoListOutput.Contains("1 packages found.");
-        }
+    private static bool IsPackagePublished(ICakeContext context, string packageName, string? nugetVersion)
+    {
+        var chocoExe = context.Tools.Resolve("choco.exe");
+        var chocoListOutput = context.ExecuteCommand(chocoExe, $"list {packageName} --version={nugetVersion}");
+        return chocoListOutput.Contains("1 packages found.");
     }
-}
+}
\ No newline at end of file
diff --git a/build/publish/Tasks/PublishNuget.cs b/build/publish/Tasks/PublishNuget.cs
index 876474b897..c5a9769818 100644
--- a/build/publish/Tasks/PublishNuget.cs
+++ b/build/publish/Tasks/PublishNuget.cs
@@ -6,65 +6,64 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Publish.Tasks
+namespace Publish.Tasks;
+
+[TaskName(nameof(PublishNuget))]
+[TaskDescription("Publish nuget packages")]
+[IsDependentOn(typeof(PublishNugetInternal))]
+public class PublishNuget : FrostingTask<BuildContext>
+{
+}
+
+[TaskName(nameof(PublishNugetInternal))]
+[TaskDescription("Publish nuget packages")]
+public class PublishNugetInternal : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(PublishNuget))]
-    [TaskDescription("Publish nuget packages")]
-    [IsDependentOn(typeof(PublishNugetInternal))]
-    public class PublishNuget : FrostingTask<BuildContext>
+    public override bool ShouldRun(BuildContext context)
     {
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(PublishNuget)} works only on GitHub Actions.");
+        shouldRun &= context.ShouldRun(context.IsPreRelease || context.IsStableRelease, $"{nameof(PublishNuget)} works only for releases.");
+
+        return shouldRun;
     }
 
-    [TaskName(nameof(PublishNugetInternal))]
-    [TaskDescription("Publish nuget packages")]
-    public class PublishNugetInternal : FrostingTask<BuildContext>
+    public override void Run(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
+        // publish to github packages for commits on main and on original repo
+        if (context.IsGitHubActionsBuild && context.IsOnMainBranchOriginalRepo)
         {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(PublishNuget)} works only on GitHub Actions.");
-            shouldRun &= context.ShouldRun(context.IsPreRelease || context.IsStableRelease, $"{nameof(PublishNuget)} works only for releases.");
-
-            return shouldRun;
+            var apiKey = context.Credentials?.GitHub?.Token;
+            if (string.IsNullOrEmpty(apiKey))
+            {
+                throw new InvalidOperationException("Could not resolve NuGet GitHub Packages API key.");
+            }
+            PublishToNugetRepo(context, apiKey, Constants.GithubPackagesUrl);
         }
-
-        public override void Run(BuildContext context)
+        // publish to nuget.org for stable releases
+        if (context.IsStableRelease)
         {
-            // publish to github packages for commits on main and on original repo
-            if (context.IsGitHubActionsBuild && context.IsOnMainBranchOriginalRepo)
+            var apiKey = context.Credentials?.Nuget?.ApiKey;
+            if (string.IsNullOrEmpty(apiKey))
             {
-                var apiKey = context.Credentials?.GitHub?.Token;
-                if (string.IsNullOrEmpty(apiKey))
-                {
-                    throw new InvalidOperationException("Could not resolve NuGet GitHub Packages API key.");
-                }
-                PublishToNugetRepo(context, apiKey, Constants.GithubPackagesUrl);
+                throw new InvalidOperationException("Could not resolve NuGet org API key.");
             }
-            // publish to nuget.org for stable releases
-            if (context.IsStableRelease)
-            {
-                var apiKey = context.Credentials?.Nuget?.ApiKey;
-                if (string.IsNullOrEmpty(apiKey))
-                {
-                    throw new InvalidOperationException("Could not resolve NuGet org API key.");
-                }
 
-                PublishToNugetRepo(context, apiKey, Constants.NugetOrgUrl);
-            }
+            PublishToNugetRepo(context, apiKey, Constants.NugetOrgUrl);
         }
-        private static void PublishToNugetRepo(BuildContext context, string apiKey, string apiUrl)
+    }
+    private static void PublishToNugetRepo(BuildContext context, string apiKey, string apiUrl)
+    {
+        var nugetVersion = context.Version!.NugetVersion;
+        foreach (var (packageName, filePath, _) in context.Packages.Where(x => !x.IsChocoPackage))
         {
-            var nugetVersion = context.Version!.NugetVersion;
-            foreach (var (packageName, filePath, _) in context.Packages.Where(x => !x.IsChocoPackage))
+            context.Information($"Package {packageName}, version {nugetVersion} is being published.");
+            context.DotNetCoreNuGetPush(filePath.FullPath, new DotNetCoreNuGetPushSettings
             {
-                context.Information($"Package {packageName}, version {nugetVersion} is being published.");
-                context.DotNetCoreNuGetPush(filePath.FullPath, new DotNetCoreNuGetPushSettings
-                {
-                    ApiKey = apiKey,
-                    Source = apiUrl,
-                    SkipDuplicate = true
-                });
-            }
+                ApiKey = apiKey,
+                Source = apiUrl,
+                SkipDuplicate = true
+            });
         }
     }
-}
+}
\ No newline at end of file
diff --git a/build/publish/Utilities/Credentials.cs b/build/publish/Utilities/Credentials.cs
index 6a752d370b..c09ba9a5e6 100644
--- a/build/publish/Utilities/Credentials.cs
+++ b/build/publish/Utilities/Credentials.cs
@@ -2,19 +2,18 @@
 using Cake.Core;
 using Common.Utilities;
 
-namespace Publish.Utilities
+namespace Publish.Utilities;
+
+public class Credentials
 {
-    public class Credentials
-    {
-        public GitHubCredentials? GitHub { get; private set; }
-        public NugetCredentials? Nuget { get; private set; }
-        public ChocolateyCredentials? Chocolatey { get; private set; }
+    public GitHubCredentials? GitHub { get; private set; }
+    public NugetCredentials? Nuget { get; private set; }
+    public ChocolateyCredentials? Chocolatey { get; private set; }
 
-        public static Credentials GetCredentials(ICakeContext context) => new()
-        {
-            GitHub = new GitHubCredentials(context.EnvironmentVariable("GITHUB_TOKEN")),
-            Nuget = new NugetCredentials(context.EnvironmentVariable("NUGET_API_KEY")),
-            Chocolatey = new ChocolateyCredentials(context.EnvironmentVariable("CHOCOLATEY_API_KEY")),
-        };
-    }
-}
+    public static Credentials GetCredentials(ICakeContext context) => new()
+    {
+        GitHub = new GitHubCredentials(context.EnvironmentVariable("GITHUB_TOKEN")),
+        Nuget = new NugetCredentials(context.EnvironmentVariable("NUGET_API_KEY")),
+        Chocolatey = new ChocolateyCredentials(context.EnvironmentVariable("CHOCOLATEY_API_KEY")),
+    };
+}
\ No newline at end of file
diff --git a/build/publish/Utilities/IsExternalInit.cs b/build/publish/Utilities/IsExternalInit.cs
index 5023ab29a8..ae51612719 100644
--- a/build/publish/Utilities/IsExternalInit.cs
+++ b/build/publish/Utilities/IsExternalInit.cs
@@ -1,13 +1,12 @@
 using System.ComponentModel;
 
-namespace System.Runtime.CompilerServices
+namespace System.Runtime.CompilerServices;
+
+/// <summary>
+/// Reserved to be used by the compiler for tracking metadata.
+/// This class should not be used by developers in source code.
+/// </summary>
+[EditorBrowsable(EditorBrowsableState.Never)]
+public static class IsExternalInit
 {
-    /// <summary>
-    /// Reserved to be used by the compiler for tracking metadata.
-    /// This class should not be used by developers in source code.
-    /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public static class IsExternalInit
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/build/release/BuildContext.cs b/build/release/BuildContext.cs
index 0e5a5a75cc..850dc43c11 100644
--- a/build/release/BuildContext.cs
+++ b/build/release/BuildContext.cs
@@ -2,14 +2,13 @@
 using Common.Utilities;
 using Release.Utilities;
 
-namespace Release
+namespace Release;
+
+public class BuildContext : BuildContextBase
 {
-    public class BuildContext : BuildContextBase
-    {
-        public Credentials? Credentials { get; set; }
+    public Credentials? Credentials { get; set; }
 
-        public BuildContext(ICakeContext context) : base(context)
-        {
-        }
+    public BuildContext(ICakeContext context) : base(context)
+    {
     }
-}
+}
\ No newline at end of file
diff --git a/build/release/BuildLifetime.cs b/build/release/BuildLifetime.cs
index cf09fc4800..31ce923dd9 100644
--- a/build/release/BuildLifetime.cs
+++ b/build/release/BuildLifetime.cs
@@ -1,18 +1,17 @@
 using Common.Utilities;
 using Release.Utilities;
 
-namespace Release
+namespace Release;
+
+public class BuildLifetime : BuildLifetimeBase<BuildContext>
 {
-    public class BuildLifetime : BuildLifetimeBase<BuildContext>
+    public override void Setup(BuildContext context)
     {
-        public override void Setup(BuildContext context)
-        {
-            base.Setup(context);
-            context.Credentials = Credentials.GetCredentials(context);
+        base.Setup(context);
+        context.Credentials = Credentials.GetCredentials(context);
 
-            context.StartGroup("Build Setup");
-            LogBuildInformation(context);
-            context.EndGroup();
-        }
+        context.StartGroup("Build Setup");
+        LogBuildInformation(context);
+        context.EndGroup();
     }
-}
+}
\ No newline at end of file
diff --git a/build/release/Startup.cs b/build/release/Startup.cs
index 5d5f94f8ff..f41c542c02 100644
--- a/build/release/Startup.cs
+++ b/build/release/Startup.cs
@@ -4,19 +4,18 @@
 using Common.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Release
+namespace Release;
+
+public class Startup : IFrostingStartup
 {
-    public class Startup : IFrostingStartup
+    public void Configure(IServiceCollection services)
     {
-        public void Configure(IServiceCollection services)
-        {
-            services.UseLifetime<BuildLifetime>();
-            services.UseTaskLifetime<BuildTaskLifetime>();
+        services.UseLifetime<BuildLifetime>();
+        services.UseTaskLifetime<BuildTaskLifetime>();
 
-            services.UseWorkingDirectory(Extensions.GetRootDirectory());
+        services.UseWorkingDirectory(Extensions.GetRootDirectory());
 
-            services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
-            services.UseTool(new Uri("dotnet:?package=GitReleaseManager.Tool&version=0.12.0"));
-        }
+        services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
+        services.UseTool(new Uri("dotnet:?package=GitReleaseManager.Tool&version=0.12.0"));
     }
-}
+}
\ No newline at end of file
diff --git a/build/release/Tasks/Default.cs b/build/release/Tasks/Default.cs
index c455ce0a9e..ffa4fa6afa 100644
--- a/build/release/Tasks/Default.cs
+++ b/build/release/Tasks/Default.cs
@@ -1,9 +1,8 @@
 using Cake.Frosting;
 
-namespace Release.Tasks
+namespace Release.Tasks;
+
+[TaskDescription("Shows this output")]
+public class Default : Common.Tasks.Default
 {
-    [TaskDescription("Shows this output")]
-    public class Default : Common.Tasks.Default
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/build/release/Tasks/PublishRelease.cs b/build/release/Tasks/PublishRelease.cs
index 6447c784da..7e0e053461 100644
--- a/build/release/Tasks/PublishRelease.cs
+++ b/build/release/Tasks/PublishRelease.cs
@@ -7,56 +7,55 @@
 using Cake.Frosting;
 using Common.Utilities;
 
-namespace Release.Tasks
+namespace Release.Tasks;
+
+[TaskName(nameof(PublishRelease))]
+[TaskDescription("Publish release")]
+[IsDependentOn(typeof(PublishReleaseInternal))]
+
+public class PublishRelease : FrostingTask<BuildContext>
 {
-    [TaskName(nameof(PublishRelease))]
-    [TaskDescription("Publish release")]
-    [IsDependentOn(typeof(PublishReleaseInternal))]
+}
 
-    public class PublishRelease : FrostingTask<BuildContext>
+[TaskName(nameof(PublishReleaseInternal))]
+[TaskDescription("Publish release")]
+public class PublishReleaseInternal : FrostingTask<BuildContext>
+{
+    public override bool ShouldRun(BuildContext context)
     {
+        var shouldRun = true;
+        shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(PublishRelease)} works only on GitHub Actions.");
+        shouldRun &= context.ShouldRun(context.IsStableRelease, $"{nameof(PublishRelease)} works only for releases.");
+
+        return shouldRun;
     }
 
-    [TaskName(nameof(PublishReleaseInternal))]
-    [TaskDescription("Publish release")]
-    public class PublishReleaseInternal : FrostingTask<BuildContext>
+    public override void Run(BuildContext context)
     {
-        public override bool ShouldRun(BuildContext context)
+        var token = context.Credentials?.GitHub?.Token;
+        if (string.IsNullOrEmpty(token))
         {
-            var shouldRun = true;
-            shouldRun &= context.ShouldRun(context.IsGitHubActionsBuild, $"{nameof(PublishRelease)} works only on GitHub Actions.");
-            shouldRun &= context.ShouldRun(context.IsStableRelease, $"{nameof(PublishRelease)} works only for releases.");
-
-            return shouldRun;
+            throw new InvalidOperationException("Could not resolve GitHub Token.");
         }
 
-        public override void Run(BuildContext context)
-        {
-            var token = context.Credentials?.GitHub?.Token;
-            if (string.IsNullOrEmpty(token))
-            {
-                throw new InvalidOperationException("Could not resolve GitHub Token.");
-            }
-
-            var tarGzFiles = context.GetFiles(Paths.Native + "/*.tar.gz").Select(x => x.ToString()).ToList();
-            context.Information("zip count: " + tarGzFiles.Count);
-
-            var assets = string.Join(",", tarGzFiles);
+        var tarGzFiles = context.GetFiles(Paths.Native + "/*.tar.gz").Select(x => x.ToString()).ToList();
+        context.Information("zip count: " + tarGzFiles.Count);
 
-            var milestone = context.Version?.Milestone;
+        var assets = string.Join(",", tarGzFiles);
 
-            if (milestone is null) return;
+        var milestone = context.Version?.Milestone;
 
-            context.GitReleaseManagerCreate(token, Constants.RepoOwner, Constants.Repository, new GitReleaseManagerCreateSettings
-            {
-                Milestone = milestone,
-                Name = milestone,
-                Prerelease = false,
-                TargetCommitish = "main"
-            });
+        if (milestone is null) return;
 
-            context.GitReleaseManagerAddAssets(token, Constants.RepoOwner, Constants.Repository, milestone, assets);
-            context.GitReleaseManagerClose(token, Constants.RepoOwner, Constants.Repository, milestone);
-        }
+        context.GitReleaseManagerCreate(token, Constants.RepoOwner, Constants.Repository, new GitReleaseManagerCreateSettings
+        {
+            Milestone = milestone,
+            Name = milestone,
+            Prerelease = false,
+            TargetCommitish = "main"
+        });
+
+        context.GitReleaseManagerAddAssets(token, Constants.RepoOwner, Constants.Repository, milestone, assets);
+        context.GitReleaseManagerClose(token, Constants.RepoOwner, Constants.Repository, milestone);
     }
-}
+}
\ No newline at end of file
diff --git a/build/release/Utilities/Credentials.cs b/build/release/Utilities/Credentials.cs
index 350a24ca3b..a81b3850eb 100644
--- a/build/release/Utilities/Credentials.cs
+++ b/build/release/Utilities/Credentials.cs
@@ -2,14 +2,13 @@
 using Cake.Core;
 using Common.Utilities;
 
-namespace Release.Utilities
+namespace Release.Utilities;
+
+public class Credentials
 {
-    public class Credentials
+    public GitHubCredentials? GitHub { get; private set; }
+    public static Credentials GetCredentials(ICakeContext context) => new()
     {
-        public GitHubCredentials? GitHub { get; private set; }
-        public static Credentials GetCredentials(ICakeContext context) => new()
-        {
-            GitHub = new GitHubCredentials(context.EnvironmentVariable("GITHUB_TOKEN")),
-        };
-    }
-}
+        GitHub = new GitHubCredentials(context.EnvironmentVariable("GITHUB_TOKEN")),
+    };
+}
\ No newline at end of file
diff --git a/build/release/Utilities/IsExternalInit.cs b/build/release/Utilities/IsExternalInit.cs
index 5023ab29a8..ae51612719 100644
--- a/build/release/Utilities/IsExternalInit.cs
+++ b/build/release/Utilities/IsExternalInit.cs
@@ -1,13 +1,12 @@
 using System.ComponentModel;
 
-namespace System.Runtime.CompilerServices
+namespace System.Runtime.CompilerServices;
+
+/// <summary>
+/// Reserved to be used by the compiler for tracking metadata.
+/// This class should not be used by developers in source code.
+/// </summary>
+[EditorBrowsable(EditorBrowsableState.Never)]
+public static class IsExternalInit
 {
-    /// <summary>
-    /// Reserved to be used by the compiler for tracking metadata.
-    /// This class should not be used by developers in source code.
-    /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public static class IsExternalInit
-    {
-    }
-}
+}
\ No newline at end of file

From 9b4b741f966a3f0e35c89fc8f6565f3afca0c0f9 Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Fri, 1 Oct 2021 22:42:20 +0200
Subject: [PATCH 06/30] (build) using global usings for build solution

---
 build/Directory.Build.props                   | 27 ++++++++++++++++++-
 build/artifacts/BuildContext.cs               |  4 +--
 build/artifacts/BuildLifetime.cs              |  5 ----
 build/artifacts/Program.cs                    |  3 ++-
 build/artifacts/Startup.cs                    |  4 +--
 .../Tasks/ArtifactsDotnetToolTest.cs          |  1 -
 .../Tasks/ArtifactsExecutableTest.cs          |  5 ----
 .../Tasks/ArtifactsMsBuildCoreTest.cs         |  3 +--
 .../Tasks/ArtifactsMsBuildFullTest.cs         | 11 +-------
 build/artifacts/Tasks/ArtifactsNativeTest.cs  |  3 +--
 build/artifacts/Tasks/ArtifactsPrepare.cs     |  3 +--
 build/artifacts/Tasks/ArtifactsTest.cs        |  1 -
 build/artifacts/Tasks/Default.cs              |  4 +--
 build/build/BuildContext.cs                   |  3 ---
 build/build/BuildLifetime.cs                  |  3 ---
 build/build/Program.cs                        |  3 ++-
 build/build/Startup.cs                        |  4 +--
 build/build/Tasks/Build.cs                    |  6 +----
 build/build/Tasks/Clean.cs                    |  5 +---
 build/build/Tasks/CodeFormat.cs               |  5 +---
 build/build/Tasks/Default.cs                  |  4 +--
 build/build/Tasks/Package.cs                  |  4 +--
 .../build/Tasks/Package/PackageChocolatey.cs  |  5 +---
 build/build/Tasks/Package/PackageGZip.cs      |  5 +---
 build/build/Tasks/Package/PackageNuget.cs     |  8 +-----
 build/build/Tasks/Package/PackagePrepare.cs   |  8 +-----
 build/build/Tasks/Test.cs                     |  4 +--
 build/build/Tasks/Test/PublishCoverage.cs     |  5 +---
 build/build/Tasks/Test/UnitTest.cs            | 11 +-------
 build/build/Tasks/ValidateVersion.cs          |  3 +--
 build/build/Utilities/ContextExtensions.cs    |  7 +----
 build/build/Utilities/Credentials.cs          |  4 +--
 .../DotNetCoreFormatAliases.cs                |  5 ++--
 .../DotNetCoreFormatSettings.cs               |  2 --
 .../DotNetCoreFormatToolRunner.cs             |  8 +-----
 .../Addins/GitVersion/GitVersionAliases.cs    |  6 +----
 .../Addins/GitVersion/GitVersionRunner.cs     |  9 +------
 .../Addins/GitVersion/GitVersionSettings.cs   |  7 +----
 build/common/Lifetime/BuildTaskLifetime.cs    |  4 +--
 build/common/Tasks/Default.cs                 |  8 +-----
 build/common/Utilities/BuildContextBase.cs    |  5 +---
 build/common/Utilities/BuildLifetimeBase.cs   |  9 +------
 build/common/Utilities/ContextExtensions.cs   | 10 +------
 .../Utilities/DockerContextExtensions.cs      | 10 +------
 build/common/Utilities/Extensions.cs          | 10 +------
 build/common/Utilities/Models.cs              |  1 -
 build/common/Utilities/Paths.cs               |  4 +--
 .../Utilities/TaskArgumentsAttribute.cs       |  4 +--
 build/docker/BuildContext.cs                  |  4 +--
 build/docker/BuildLifetime.cs                 |  5 ----
 build/docker/Program.cs                       |  3 ++-
 build/docker/Startup.cs                       |  4 +--
 build/docker/Tasks/Default.cs                 |  4 +--
 build/docker/Tasks/DockerBuild.cs             |  4 +--
 build/docker/Tasks/DockerManifest.cs          |  3 ---
 build/docker/Tasks/DockerPublish.cs           |  3 +--
 build/docker/Tasks/DockerTest.cs              |  3 +--
 build/docs/BuildContext.cs                    |  3 +--
 build/docs/BuildLifetime.cs                   |  5 +---
 build/docs/Program.cs                         |  3 ++-
 build/docs/Startup.cs                         |  4 +--
 build/docs/Tasks/BuildDocs.cs                 |  4 +--
 build/docs/Tasks/Clean.cs                     |  5 +---
 build/docs/Tasks/Default.cs                   |  4 +--
 build/docs/Tasks/PreviewDocs.cs               |  4 +--
 build/docs/Tasks/PublishDocs.cs               |  9 +------
 build/docs/Utilities/Credentials.cs           |  4 +--
 build/publish/BuildContext.cs                 |  4 +--
 build/publish/BuildLifetime.cs                |  4 +--
 build/publish/Program.cs                      |  3 ++-
 build/publish/Startup.cs                      |  4 +--
 build/publish/Tasks/Default.cs                |  4 +--
 build/publish/Tasks/PublishChocolatey.cs      |  7 +----
 build/publish/Tasks/PublishNuget.cs           |  7 +----
 build/publish/Utilities/Credentials.cs        |  4 +--
 build/release/BuildContext.cs                 |  3 +--
 build/release/Program.cs                      |  3 ++-
 build/release/Startup.cs                      |  4 +--
 build/release/Tasks/Default.cs                |  4 +--
 build/release/Tasks/PublishRelease.cs         |  7 +----
 build/release/Utilities/Credentials.cs        |  4 +--
 81 files changed, 103 insertions(+), 310 deletions(-)

diff --git a/build/Directory.Build.props b/build/Directory.Build.props
index 5eec18e97c..74888a5083 100644
--- a/build/Directory.Build.props
+++ b/build/Directory.Build.props
@@ -1,4 +1,4 @@
-<Project>
+<Project>
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
@@ -10,4 +10,29 @@
         <NoWarn>NU1604</NoWarn>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
+
+    <ItemGroup>
+        <Using Include="System.Text" />
+        <Using Include="System.Reflection" />
+    </ItemGroup>
+    <ItemGroup>
+        <Using Include="Cake.Common" />
+        <Using Include="Cake.Common.Build" />
+        <Using Include="Cake.Common.Diagnostics" />
+        <Using Include="Cake.Common.Tools.NuGet" />
+        <Using Include="Cake.Common.Tools.NuGet.Install" />
+        <Using Include="Cake.Common.IO" />
+        <Using Include="Cake.Core" />
+        <Using Include="Cake.Core.Annotations" />
+        <Using Include="Cake.Core.Diagnostics" />
+        <Using Include="Cake.Core.IO" />
+        <Using Include="Cake.Core.Tooling" />
+        <Using Include="Cake.Common.Tools.DotNetCore" />
+        <Using Include="Cake.Common.Tools.DotNetCore.Build" />
+        <Using Include="Cake.Common.Tools.DotNetCore.MSBuild" />
+        <Using Include="Cake.Common.Tools.MSBuild" />
+        <Using Include="Cake.Docker" />
+        <Using Include="Cake.Frosting" />
+    </ItemGroup>
+
 </Project>
diff --git a/build/artifacts/BuildContext.cs b/build/artifacts/BuildContext.cs
index 47c3fa57e7..7976846434 100644
--- a/build/artifacts/BuildContext.cs
+++ b/build/artifacts/BuildContext.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using Cake.Core;
 using Common.Utilities;
 
 namespace Artifacts;
@@ -15,4 +13,4 @@ public class BuildContext : BuildContextBase
     public BuildContext(ICakeContext context) : base(context)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/build/artifacts/BuildLifetime.cs b/build/artifacts/BuildLifetime.cs
index 13e32e720d..3b404a6700 100644
--- a/build/artifacts/BuildLifetime.cs
+++ b/build/artifacts/BuildLifetime.cs
@@ -1,9 +1,4 @@
-using System.Linq;
-using Cake.Common;
-using Cake.Common.Diagnostics;
-using Cake.Docker;
 using Common.Utilities;
-using Constants = Common.Utilities.Constants;
 
 namespace Artifacts;
 
diff --git a/build/artifacts/Program.cs b/build/artifacts/Program.cs
index 0504171b2a..1129d23dce 100644
--- a/build/artifacts/Program.cs
+++ b/build/artifacts/Program.cs
@@ -1,5 +1,6 @@
+global using Constants = Common.Utilities.Constants;
+
 using Artifacts;
-using Cake.Frosting;
 
 return new CakeHost()
     .UseContext<BuildContext>()
diff --git a/build/artifacts/Startup.cs b/build/artifacts/Startup.cs
index 17dc570e97..dbf02b6638 100644
--- a/build/artifacts/Startup.cs
+++ b/build/artifacts/Startup.cs
@@ -1,5 +1,3 @@
-using System;
-using Cake.Frosting;
 using Common.Lifetime;
 using Common.Utilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -17,4 +15,4 @@ public void Configure(IServiceCollection services)
 
         services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
     }
-}
\ No newline at end of file
+}
diff --git a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs
index fa26e279a8..abafa60131 100644
--- a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs
+++ b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs
@@ -1,4 +1,3 @@
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Artifacts.Tasks;
diff --git a/build/artifacts/Tasks/ArtifactsExecutableTest.cs b/build/artifacts/Tasks/ArtifactsExecutableTest.cs
index 0248b474ed..8127f1762a 100644
--- a/build/artifacts/Tasks/ArtifactsExecutableTest.cs
+++ b/build/artifacts/Tasks/ArtifactsExecutableTest.cs
@@ -1,8 +1,3 @@
-using System.Collections.Generic;
-using Cake.Common.IO;
-using Cake.Common.Tools.NuGet;
-using Cake.Common.Tools.NuGet.Install;
-using Cake.Frosting;
 using Common.Addins.GitVersion;
 using Common.Utilities;
 using Xunit;
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
index 68a126faf5..a8362c3c02 100644
--- a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
+++ b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
@@ -1,4 +1,3 @@
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Artifacts.Tasks;
@@ -46,4 +45,4 @@ public override void Run(BuildContext context)
             context.DockerTestArtifact(dockerImage, cmd);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
index 29ecdd804a..37adcfbce3 100644
--- a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
+++ b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
@@ -1,12 +1,3 @@
-using Cake.Common.Diagnostics;
-using Cake.Common.IO;
-using Cake.Common.Tools.DotNetCore;
-using Cake.Common.Tools.DotNetCore.Build;
-using Cake.Common.Tools.DotNetCore.MSBuild;
-using Cake.Common.Tools.MSBuild;
-using Cake.Core;
-using Cake.Core.Diagnostics;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Artifacts.Tasks;
@@ -68,4 +59,4 @@ public override void Run(BuildContext context)
         var fullExe = Paths.Integration.Combine("full").Combine("build").CombineWithFilePath("app.exe");
         context.ValidateOutput(fullExe.FullPath, null, context.Version.GitVersion.FullSemVer);
     }
-}
\ No newline at end of file
+}
diff --git a/build/artifacts/Tasks/ArtifactsNativeTest.cs b/build/artifacts/Tasks/ArtifactsNativeTest.cs
index 2f09b79ce0..5872c14137 100644
--- a/build/artifacts/Tasks/ArtifactsNativeTest.cs
+++ b/build/artifacts/Tasks/ArtifactsNativeTest.cs
@@ -1,4 +1,3 @@
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Artifacts.Tasks;
@@ -41,4 +40,4 @@ public override void Run(BuildContext context)
             context.DockerTestArtifact(dockerImage, cmd);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build/artifacts/Tasks/ArtifactsPrepare.cs b/build/artifacts/Tasks/ArtifactsPrepare.cs
index f0af17ae66..4675bd3b4e 100644
--- a/build/artifacts/Tasks/ArtifactsPrepare.cs
+++ b/build/artifacts/Tasks/ArtifactsPrepare.cs
@@ -1,4 +1,3 @@
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Artifacts.Tasks;
@@ -26,4 +25,4 @@ public override void Run(BuildContext context)
             context.DockerPullImage(dockerImage);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build/artifacts/Tasks/ArtifactsTest.cs b/build/artifacts/Tasks/ArtifactsTest.cs
index 9020adc009..2f6b178707 100644
--- a/build/artifacts/Tasks/ArtifactsTest.cs
+++ b/build/artifacts/Tasks/ArtifactsTest.cs
@@ -1,4 +1,3 @@
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Artifacts.Tasks;
diff --git a/build/artifacts/Tasks/Default.cs b/build/artifacts/Tasks/Default.cs
index 68a6eaebca..69d435c477 100644
--- a/build/artifacts/Tasks/Default.cs
+++ b/build/artifacts/Tasks/Default.cs
@@ -1,8 +1,6 @@
-using Cake.Frosting;
-
 namespace Artifacts.Tasks;
 
 [TaskDescription("Shows this output")]
 public class Default : Common.Tasks.Default
 {
-}
\ No newline at end of file
+}
diff --git a/build/build/BuildContext.cs b/build/build/BuildContext.cs
index fb5a7e3409..4c8aa0ae76 100644
--- a/build/build/BuildContext.cs
+++ b/build/build/BuildContext.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
 using Build.Utilities;
-using Cake.Common.Tools.DotNetCore.MSBuild;
-using Cake.Core;
 using Common.Utilities;
 
 namespace Build;
diff --git a/build/build/BuildLifetime.cs b/build/build/BuildLifetime.cs
index c0aaf24c62..3ed6d01272 100644
--- a/build/build/BuildLifetime.cs
+++ b/build/build/BuildLifetime.cs
@@ -1,7 +1,4 @@
 using Build.Utilities;
-using Cake.Common;
-using Cake.Common.Diagnostics;
-using Cake.Common.Tools.DotNetCore.MSBuild;
 using Common.Utilities;
 
 namespace Build;
diff --git a/build/build/Program.cs b/build/build/Program.cs
index 915e184b72..a1cc8d8980 100644
--- a/build/build/Program.cs
+++ b/build/build/Program.cs
@@ -1,5 +1,6 @@
+global using Constants = Common.Utilities.Constants;
+
 using Build;
-using Cake.Frosting;
 
 return new CakeHost()
     .UseContext<BuildContext>()
diff --git a/build/build/Startup.cs b/build/build/Startup.cs
index 52ca4e0d73..3e5b594044 100644
--- a/build/build/Startup.cs
+++ b/build/build/Startup.cs
@@ -1,5 +1,3 @@
-using System;
-using Cake.Frosting;
 using Common.Lifetime;
 using Common.Utilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -19,4 +17,4 @@ public void Configure(IServiceCollection services)
         services.UseTool(new Uri("dotnet:?package=dotnet-format&version=5.0.211103"));
         services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
     }
-}
\ No newline at end of file
+}
diff --git a/build/build/Tasks/Build.cs b/build/build/Tasks/Build.cs
index 8f3112885f..2c4691c265 100644
--- a/build/build/Tasks/Build.cs
+++ b/build/build/Tasks/Build.cs
@@ -1,8 +1,4 @@
-using Cake.Common.Diagnostics;
-using Cake.Common.Tools.DotNetCore;
-using Cake.Common.Tools.DotNetCore.Build;
 using Cake.Common.Tools.DotNetCore.Restore;
-using Cake.Frosting;
 
 namespace Build.Tasks;
 
@@ -32,4 +28,4 @@ public override void Run(BuildContext context)
             MSBuildSettings = context.MsBuildSettings
         });
     }
-}
\ No newline at end of file
+}
diff --git a/build/build/Tasks/Clean.cs b/build/build/Tasks/Clean.cs
index 40e2eceee5..83314a8902 100644
--- a/build/build/Tasks/Clean.cs
+++ b/build/build/Tasks/Clean.cs
@@ -1,6 +1,3 @@
-using Cake.Common.Diagnostics;
-using Cake.Common.IO;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Build.Tasks;
@@ -21,4 +18,4 @@ public override void Run(BuildContext context)
         context.CleanDirectory(Paths.Packages);
         context.CleanDirectory(Paths.Artifacts);
     }
-}
\ No newline at end of file
+}
diff --git a/build/build/Tasks/CodeFormat.cs b/build/build/Tasks/CodeFormat.cs
index 6eab27a86f..69c3fe46f8 100644
--- a/build/build/Tasks/CodeFormat.cs
+++ b/build/build/Tasks/CodeFormat.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using Cake.Common.Diagnostics;
-using Cake.Frosting;
 using Common.Addins.Cake.DotNetCoreFormat;
 using Common.Utilities;
 
@@ -28,4 +25,4 @@ public override void Run(BuildContext context)
             Exclude = new List<string> { " **/AddFormats/" }
         });
     }
-}
\ No newline at end of file
+}
diff --git a/build/build/Tasks/Default.cs b/build/build/Tasks/Default.cs
index d1349c3e10..57b473ee58 100644
--- a/build/build/Tasks/Default.cs
+++ b/build/build/Tasks/Default.cs
@@ -1,8 +1,6 @@
-using Cake.Frosting;
-
 namespace Build.Tasks;
 
 [TaskDescription("Shows this output")]
 public class Default : Common.Tasks.Default
 {
-}
\ No newline at end of file
+}
diff --git a/build/build/Tasks/Package.cs b/build/build/Tasks/Package.cs
index 4da2ce58be..40be6d5f5f 100644
--- a/build/build/Tasks/Package.cs
+++ b/build/build/Tasks/Package.cs
@@ -1,5 +1,3 @@
-using Cake.Frosting;
-
 namespace Build.Tasks;
 
 [TaskName(nameof(Package))]
@@ -9,4 +7,4 @@ namespace Build.Tasks;
 [IsDependentOn(typeof(PackageGZip))]
 public class Package : FrostingTask<BuildContext>
 {
-}
\ No newline at end of file
+}
diff --git a/build/build/Tasks/Package/PackageChocolatey.cs b/build/build/Tasks/Package/PackageChocolatey.cs
index 8cc8f3a5e2..81c3dcec60 100644
--- a/build/build/Tasks/Package/PackageChocolatey.cs
+++ b/build/build/Tasks/Package/PackageChocolatey.cs
@@ -1,8 +1,5 @@
-using System.Linq;
-using Cake.Common.IO;
 using Cake.Common.Tools.Chocolatey;
 using Cake.Common.Tools.Chocolatey.Pack;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Build.Tasks;
@@ -41,4 +38,4 @@ public override void Run(BuildContext context)
         };
         context.ChocolateyPack(portableNuspecFile, chocolateySettings);
     }
-}
\ No newline at end of file
+}
diff --git a/build/build/Tasks/Package/PackageGZip.cs b/build/build/Tasks/Package/PackageGZip.cs
index 546eb28dcd..b206209818 100644
--- a/build/build/Tasks/Package/PackageGZip.cs
+++ b/build/build/Tasks/Package/PackageGZip.cs
@@ -1,7 +1,4 @@
-using Cake.Common.Diagnostics;
-using Cake.Common.IO;
 using Cake.Compression;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Build.Tasks;
@@ -33,4 +30,4 @@ public override void Run(BuildContext context)
         }
         base.Run(context);
     }
-}
\ No newline at end of file
+}
diff --git a/build/build/Tasks/Package/PackageNuget.cs b/build/build/Tasks/Package/PackageNuget.cs
index 27f4bcf614..b21d25b9dd 100644
--- a/build/build/Tasks/Package/PackageNuget.cs
+++ b/build/build/Tasks/Package/PackageNuget.cs
@@ -1,11 +1,5 @@
-using System.Linq;
-using Cake.Common.IO;
-using Cake.Common.Tools.DotNetCore;
 using Cake.Common.Tools.DotNetCore.Pack;
-using Cake.Common.Tools.NuGet;
 using Cake.Common.Tools.NuGet.Pack;
-using Cake.Core;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Build.Tasks;
@@ -69,4 +63,4 @@ private static void PackageUsingNuspec(BuildContextBase context)
 
         context.NuGetPack(cmdlineNuspecFile, nugetSettings);
     }
-}
\ No newline at end of file
+}
diff --git a/build/build/Tasks/Package/PackagePrepare.cs b/build/build/Tasks/Package/PackagePrepare.cs
index 988c79413c..c1d4d9552b 100644
--- a/build/build/Tasks/Package/PackagePrepare.cs
+++ b/build/build/Tasks/Package/PackagePrepare.cs
@@ -1,10 +1,4 @@
-using Cake.Common.Diagnostics;
-using Cake.Common.IO;
-using Cake.Common.Tools.DotNetCore;
 using Cake.Common.Tools.DotNetCore.Publish;
-using Cake.Core;
-using Cake.Core.IO;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Build.Tasks;
@@ -72,4 +66,4 @@ private static DirectoryPath PackPrepareNative(BuildContext context, string runt
 
         return outputPath;
     }
-}
\ No newline at end of file
+}
diff --git a/build/build/Tasks/Test.cs b/build/build/Tasks/Test.cs
index 9f95567cc4..e8bf15f20a 100644
--- a/build/build/Tasks/Test.cs
+++ b/build/build/Tasks/Test.cs
@@ -1,5 +1,3 @@
-using Cake.Frosting;
-
 namespace Build.Tasks;
 
 [TaskName(nameof(Test))]
@@ -7,4 +5,4 @@ namespace Build.Tasks;
 [IsDependentOn(typeof(PublishCoverage))]
 public class Test : FrostingTask<BuildContext>
 {
-}
\ No newline at end of file
+}
diff --git a/build/build/Tasks/Test/PublishCoverage.cs b/build/build/Tasks/Test/PublishCoverage.cs
index 6c88601f15..190541d9a9 100644
--- a/build/build/Tasks/Test/PublishCoverage.cs
+++ b/build/build/Tasks/Test/PublishCoverage.cs
@@ -1,7 +1,4 @@
-using System;
 using Cake.Codecov;
-using Cake.Common.IO;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Build.Tasks;
@@ -39,4 +36,4 @@ public override void Run(BuildContext context)
             });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build/build/Tasks/Test/UnitTest.cs b/build/build/Tasks/Test/UnitTest.cs
index a34babef8f..92c48961f7 100644
--- a/build/build/Tasks/Test/UnitTest.cs
+++ b/build/build/Tasks/Test/UnitTest.cs
@@ -1,15 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Cake.Common;
-using Cake.Common.Build;
 using Cake.Common.Build.AzurePipelines.Data;
-using Cake.Common.Diagnostics;
-using Cake.Common.IO;
 using Cake.Common.Tools.DotNetCore.Test;
-using Cake.Core.IO;
 using Cake.Coverlet;
-using Cake.Frosting;
 using Cake.Incubator.LoggingExtensions;
 using Common.Utilities;
 
@@ -103,4 +94,4 @@ private static void TestProjectForTarget(BuildContext context, FilePath project,
 
         context.DotNetCoreTest(project.FullPath, settings, coverletSettings);
     }
-}
\ No newline at end of file
+}
diff --git a/build/build/Tasks/ValidateVersion.cs b/build/build/Tasks/ValidateVersion.cs
index 39dfdcc77b..c0545f18f3 100644
--- a/build/build/Tasks/ValidateVersion.cs
+++ b/build/build/Tasks/ValidateVersion.cs
@@ -1,5 +1,4 @@
 using Build.Utilities;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Build.Tasks;
@@ -14,4 +13,4 @@ public override void Run(BuildContext context)
         var gitversionTool = context.GetGitVersionToolLocation();
         context.ValidateOutput("dotnet", $"\"{gitversionTool}\" -version", context.Version!.GitVersion!.InformationalVersion!);
     }
-}
\ No newline at end of file
+}
diff --git a/build/build/Utilities/ContextExtensions.cs b/build/build/Utilities/ContextExtensions.cs
index 7fc73bc125..5b01e383cc 100644
--- a/build/build/Utilities/ContextExtensions.cs
+++ b/build/build/Utilities/ContextExtensions.cs
@@ -1,12 +1,7 @@
-using System.Linq;
-using Cake.Common.IO;
-using Cake.Core.IO;
-using Common.Utilities;
-
 namespace Build.Utilities;
 
 public static class ContextExtensions
 {
     public static FilePath? GetGitVersionToolLocation(this BuildContext context) =>
         context.GetFiles($"src/GitVersion.App/bin/{context.MsBuildConfiguration}/{Constants.NetVersion50}/gitversion.dll").SingleOrDefault();
-}
\ No newline at end of file
+}
diff --git a/build/build/Utilities/Credentials.cs b/build/build/Utilities/Credentials.cs
index 3c80a19d47..9735ef2e63 100644
--- a/build/build/Utilities/Credentials.cs
+++ b/build/build/Utilities/Credentials.cs
@@ -1,5 +1,3 @@
-using Cake.Common;
-using Cake.Core;
 using Common.Utilities;
 
 namespace Build.Utilities;
@@ -12,4 +10,4 @@ public class Credentials
     {
         CodeCov = new CodeCovCredentials(context.EnvironmentVariable("CODECOV_TOKEN")),
     };
-}
\ No newline at end of file
+}
diff --git a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatAliases.cs b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatAliases.cs
index 6e87e9b65b..32e892246e 100644
--- a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatAliases.cs
+++ b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatAliases.cs
@@ -1,4 +1,3 @@
-using Cake.Core;
 using Cake.Core.Annotations;
 
 namespace Common.Addins.Cake.DotNetCoreFormat;
@@ -26,10 +25,10 @@ public static void DotNetCoreFormat(this ICakeContext context, DotNetCoreFormatS
     {
         if (context is null)
         {
-            throw new System.ArgumentNullException(nameof(context));
+            throw new ArgumentNullException(nameof(context));
         }
 
         var runner = new DotNetCoreFormatToolRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
         runner.Run(settings);
     }
-}
\ No newline at end of file
+}
diff --git a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatSettings.cs b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatSettings.cs
index af9b5ab8c8..7a653caa11 100644
--- a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatSettings.cs
+++ b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatSettings.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using Cake.Common.Tools.DotNetCore;
 using Path = Cake.Core.IO.Path;
 
 namespace Common.Addins.Cake.DotNetCoreFormat;
diff --git a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatToolRunner.cs b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatToolRunner.cs
index cb27f20735..2ffac73f1c 100644
--- a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatToolRunner.cs
+++ b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatToolRunner.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Cake.Core;
-using Cake.Core.IO;
-using Cake.Core.Tooling;
-
 namespace Common.Addins.Cake.DotNetCoreFormat;
 
 public sealed class DotNetCoreFormatToolRunner : Tool<DotNetCoreFormatSettings>
@@ -74,4 +68,4 @@ private static ProcessArgumentBuilder GetArguments(DotNetCoreFormatSettings sett
         }
         return arguments;
     }
-}
\ No newline at end of file
+}
diff --git a/build/common/Addins/GitVersion/GitVersionAliases.cs b/build/common/Addins/GitVersion/GitVersionAliases.cs
index a3a98fb545..0d4d292ea2 100644
--- a/build/common/Addins/GitVersion/GitVersionAliases.cs
+++ b/build/common/Addins/GitVersion/GitVersionAliases.cs
@@ -1,7 +1,3 @@
-using System;
-using Cake.Core;
-using Cake.Core.Annotations;
-
 namespace Common.Addins.GitVersion;
 
 /// <summary>
@@ -116,4 +112,4 @@ public static GitVersion GitVersion(this ICakeContext context, GitVersionSetting
         var gitVersionRunner = new GitVersionRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools, context.Log);
         return gitVersionRunner.Run(settings);
     }
-}
\ No newline at end of file
+}
diff --git a/build/common/Addins/GitVersion/GitVersionRunner.cs b/build/common/Addins/GitVersion/GitVersionRunner.cs
index a6db863a91..be5b3392e7 100644
--- a/build/common/Addins/GitVersion/GitVersionRunner.cs
+++ b/build/common/Addins/GitVersion/GitVersionRunner.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.RegularExpressions;
-using Cake.Core;
-using Cake.Core.Diagnostics;
-using Cake.Core.IO;
-using Cake.Core.Tooling;
 using Newtonsoft.Json;
 
 namespace Common.Addins.GitVersion;
@@ -183,4 +176,4 @@ protected override IEnumerable<string> GetToolExecutableNames()
     {
         return new[] { "GitVersion.exe", "dotnet-gitversion", "dotnet-gitversion.exe", "gitversion" };
     }
-}
\ No newline at end of file
+}
diff --git a/build/common/Addins/GitVersion/GitVersionSettings.cs b/build/common/Addins/GitVersion/GitVersionSettings.cs
index 6140ef5537..688a32a34e 100644
--- a/build/common/Addins/GitVersion/GitVersionSettings.cs
+++ b/build/common/Addins/GitVersion/GitVersionSettings.cs
@@ -1,8 +1,3 @@
-using System.Collections.Generic;
-using Cake.Core.Diagnostics;
-using Cake.Core.IO;
-using Cake.Core.Tooling;
-
 namespace Common.Addins.GitVersion;
 
 /// <summary>
@@ -80,4 +75,4 @@ public sealed class GitVersionSettings : ToolSettings
     /// Gets or sets the logging verbosity.
     /// </summary>
     public Verbosity? Verbosity { get; set; }
-}
\ No newline at end of file
+}
diff --git a/build/common/Lifetime/BuildTaskLifetime.cs b/build/common/Lifetime/BuildTaskLifetime.cs
index 87b183bd44..bc232a4881 100644
--- a/build/common/Lifetime/BuildTaskLifetime.cs
+++ b/build/common/Lifetime/BuildTaskLifetime.cs
@@ -1,5 +1,3 @@
-using Cake.Core;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Common.Lifetime;
@@ -12,4 +10,4 @@ public override void Setup(ICakeContext context, ITaskSetupContext info)
         context.StartGroup(message);
     }
     public override void Teardown(ICakeContext context, ITaskTeardownContext info) => context.EndGroup();
-}
\ No newline at end of file
+}
diff --git a/build/common/Tasks/Default.cs b/build/common/Tasks/Default.cs
index b7ea0f3a37..0bf445424b 100644
--- a/build/common/Tasks/Default.cs
+++ b/build/common/Tasks/Default.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Linq;
-using System.Reflection;
-using Cake.Common.Diagnostics;
-using Cake.Core;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Common.Tasks;
@@ -35,4 +29,4 @@ public override void Run(ICakeContext context)
             context.Information($"  ./build.ps1 -Stage {entryAssembly?.GetName().Name} {target} {arguments}\n");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build/common/Utilities/BuildContextBase.cs b/build/common/Utilities/BuildContextBase.cs
index d21049ff9b..c22a669e62 100644
--- a/build/common/Utilities/BuildContextBase.cs
+++ b/build/common/Utilities/BuildContextBase.cs
@@ -1,6 +1,3 @@
-using Cake.Core;
-using Cake.Frosting;
-
 namespace Common.Utilities;
 
 public class BuildContextBase : FrostingContext
@@ -23,4 +20,4 @@ protected BuildContextBase(ICakeContext context) : base(context)
     public bool IsOnMainBranchOriginalRepo => !IsLocalBuild && IsOriginalRepo && IsMainBranch && !IsPullRequest;
     public bool IsStableRelease => IsOnMainBranchOriginalRepo && IsTagged;
     public bool IsPreRelease => IsOnMainBranchOriginalRepo && !IsTagged;
-}
\ No newline at end of file
+}
diff --git a/build/common/Utilities/BuildLifetimeBase.cs b/build/common/Utilities/BuildLifetimeBase.cs
index 9cb703f146..7f8a6bb285 100644
--- a/build/common/Utilities/BuildLifetimeBase.cs
+++ b/build/common/Utilities/BuildLifetimeBase.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Cake.Common;
-using Cake.Common.Build;
-using Cake.Common.Diagnostics;
-using Cake.Core;
-using Cake.Frosting;
 using Cake.Incubator.LoggingExtensions;
 using Common.Addins.GitVersion;
 
@@ -65,4 +58,4 @@ protected void LogBuildInformation(T context)
         context.Information("Main Branch:       {0}", context.IsMainBranch);
         context.Information("Tagged:            {0}", context.IsTagged);
     }
-}
\ No newline at end of file
+}
diff --git a/build/common/Utilities/ContextExtensions.cs b/build/common/Utilities/ContextExtensions.cs
index fa0240491c..e6a80de4ae 100644
--- a/build/common/Utilities/ContextExtensions.cs
+++ b/build/common/Utilities/ContextExtensions.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Cake.Common;
-using Cake.Common.Build;
-using Cake.Common.Diagnostics;
-using Cake.Core;
-using Cake.Core.IO;
 using Xunit;
 
 namespace Common.Utilities;
@@ -160,4 +152,4 @@ public static bool ShouldRun(this ICakeContext context, bool criteria, string sk
         context.Information(skipMessage);
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/build/common/Utilities/DockerContextExtensions.cs b/build/common/Utilities/DockerContextExtensions.cs
index 2b8d6f5818..92fab8f440 100644
--- a/build/common/Utilities/DockerContextExtensions.cs
+++ b/build/common/Utilities/DockerContextExtensions.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Cake.Common;
-using Cake.Common.Diagnostics;
-using Cake.Common.IO;
-using Cake.Core;
-using Cake.Docker;
 using Xunit;
 
 namespace Common.Utilities;
@@ -264,4 +256,4 @@ private static string DockerRunImage(this ICakeContext context, DockerContainerR
         var result = runner.RunWithResult("run", settings, r => r.ToArray(), arguments.ToArray());
         return string.Join("\n", result);
     }
-}
\ No newline at end of file
+}
diff --git a/build/common/Utilities/Extensions.cs b/build/common/Utilities/Extensions.cs
index cf040c30d6..67c629bb67 100644
--- a/build/common/Utilities/Extensions.cs
+++ b/build/common/Utilities/Extensions.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using Cake.Core.IO;
-using Cake.Frosting;
-
 namespace Common.Utilities;
 
 public static class Extensions
@@ -68,4 +60,4 @@ public static DirectoryPath GetRootDirectory()
     }
 
     public static string ToSuffix(this Architecture arch) => arch.ToString().ToLower();
-}
\ No newline at end of file
+}
diff --git a/build/common/Utilities/Models.cs b/build/common/Utilities/Models.cs
index a0f3688cc6..3811de6b29 100644
--- a/build/common/Utilities/Models.cs
+++ b/build/common/Utilities/Models.cs
@@ -1,4 +1,3 @@
-using Cake.Core.IO;
 using Common.Addins.GitVersion;
 
 namespace Common.Utilities;
diff --git a/build/common/Utilities/Paths.cs b/build/common/Utilities/Paths.cs
index 83c96bdb03..b3e366e76f 100644
--- a/build/common/Utilities/Paths.cs
+++ b/build/common/Utilities/Paths.cs
@@ -1,5 +1,3 @@
-using Cake.Core.IO;
-
 namespace Common.Utilities;
 
 public class Paths
@@ -22,4 +20,4 @@ public class Paths
     public static readonly DirectoryPath Nuget = Packages.Combine("nuget");
     public static readonly DirectoryPath ArtifactsBinCmdline = Packages.Combine("prepare").Combine("cmdline");
     public static readonly DirectoryPath ArtifactsBinPortable = Packages.Combine("prepare").Combine("portable");
-}
\ No newline at end of file
+}
diff --git a/build/common/Utilities/TaskArgumentsAttribute.cs b/build/common/Utilities/TaskArgumentsAttribute.cs
index 24abb7192d..97da6a2c9c 100644
--- a/build/common/Utilities/TaskArgumentsAttribute.cs
+++ b/build/common/Utilities/TaskArgumentsAttribute.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Common.Utilities;
 
 /// <summary>
@@ -16,4 +14,4 @@ public TaskArgumentAttribute(string name, params string[] possibleValues)
         Name = name;
         PossibleValues = possibleValues;
     }
-}
\ No newline at end of file
+}
diff --git a/build/docker/BuildContext.cs b/build/docker/BuildContext.cs
index 5c16b64905..df8ba0067a 100644
--- a/build/docker/BuildContext.cs
+++ b/build/docker/BuildContext.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using Cake.Core;
 using Common.Utilities;
 
 namespace Docker;
@@ -14,4 +12,4 @@ public class BuildContext : BuildContextBase
     public BuildContext(ICakeContext context) : base(context)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/build/docker/BuildLifetime.cs b/build/docker/BuildLifetime.cs
index bae9c58e54..d5703a06f9 100644
--- a/build/docker/BuildLifetime.cs
+++ b/build/docker/BuildLifetime.cs
@@ -1,9 +1,4 @@
-using System.Linq;
-using Cake.Common;
-using Cake.Common.Diagnostics;
-using Cake.Docker;
 using Common.Utilities;
-using Constants = Common.Utilities.Constants;
 
 namespace Docker;
 
diff --git a/build/docker/Program.cs b/build/docker/Program.cs
index 4540f1bf3a..049fdc4b4a 100644
--- a/build/docker/Program.cs
+++ b/build/docker/Program.cs
@@ -1,4 +1,5 @@
-using Cake.Frosting;
+global using Constants = Common.Utilities.Constants;
+
 using Docker;
 
 return new CakeHost()
diff --git a/build/docker/Startup.cs b/build/docker/Startup.cs
index 4b84e60c00..d38ac2f132 100644
--- a/build/docker/Startup.cs
+++ b/build/docker/Startup.cs
@@ -1,5 +1,3 @@
-using System;
-using Cake.Frosting;
 using Common.Lifetime;
 using Common.Utilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -17,4 +15,4 @@ public void Configure(IServiceCollection services)
 
         services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
     }
-}
\ No newline at end of file
+}
diff --git a/build/docker/Tasks/Default.cs b/build/docker/Tasks/Default.cs
index 259bf0423d..57deb33a47 100644
--- a/build/docker/Tasks/Default.cs
+++ b/build/docker/Tasks/Default.cs
@@ -1,8 +1,6 @@
-using Cake.Frosting;
-
 namespace Docker.Tasks;
 
 [TaskDescription("Shows this output")]
 public class Default : Common.Tasks.Default
 {
-}
\ No newline at end of file
+}
diff --git a/build/docker/Tasks/DockerBuild.cs b/build/docker/Tasks/DockerBuild.cs
index 3d1fbb8c3b..88b4f282a7 100644
--- a/build/docker/Tasks/DockerBuild.cs
+++ b/build/docker/Tasks/DockerBuild.cs
@@ -1,5 +1,3 @@
-using Cake.Common.IO;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Docker.Tasks;
@@ -33,4 +31,4 @@ public override void Run(BuildContext context)
             context.DockerBuildImage(dockerImage);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build/docker/Tasks/DockerManifest.cs b/build/docker/Tasks/DockerManifest.cs
index 716d480cda..9319d4f6b0 100644
--- a/build/docker/Tasks/DockerManifest.cs
+++ b/build/docker/Tasks/DockerManifest.cs
@@ -1,7 +1,4 @@
-using System.Linq;
-using Cake.Frosting;
 using Common.Utilities;
-using Constants = Common.Utilities.Constants;
 
 namespace Docker.Tasks;
 
diff --git a/build/docker/Tasks/DockerPublish.cs b/build/docker/Tasks/DockerPublish.cs
index 01478f1ed0..f6c31f1b2c 100644
--- a/build/docker/Tasks/DockerPublish.cs
+++ b/build/docker/Tasks/DockerPublish.cs
@@ -1,4 +1,3 @@
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Docker.Tasks;
@@ -50,4 +49,4 @@ public override void Run(BuildContext context)
             context.DockerPushImage(dockerImage);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build/docker/Tasks/DockerTest.cs b/build/docker/Tasks/DockerTest.cs
index f649c591c9..f35696ef47 100644
--- a/build/docker/Tasks/DockerTest.cs
+++ b/build/docker/Tasks/DockerTest.cs
@@ -1,4 +1,3 @@
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Docker.Tasks;
@@ -28,4 +27,4 @@ public override void Run(BuildContext context)
             context.DockerTestImage(dockerImage);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build/docs/BuildContext.cs b/build/docs/BuildContext.cs
index c5739abd48..ca79d42541 100644
--- a/build/docs/BuildContext.cs
+++ b/build/docs/BuildContext.cs
@@ -1,4 +1,3 @@
-using Cake.Core;
 using Cake.Wyam;
 using Common.Utilities;
 using Docs.Utilities;
@@ -14,4 +13,4 @@ public class BuildContext : BuildContextBase
     public BuildContext(ICakeContext context) : base(context)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/build/docs/BuildLifetime.cs b/build/docs/BuildLifetime.cs
index 86edece213..7c7ef17a68 100644
--- a/build/docs/BuildLifetime.cs
+++ b/build/docs/BuildLifetime.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using Cake.Common;
-using Cake.Common.IO;
 using Cake.Wyam;
 using Common.Utilities;
 using Docs.Utilities;
@@ -36,4 +33,4 @@ public override void Setup(BuildContext context)
 
         context.EndGroup();
     }
-}
\ No newline at end of file
+}
diff --git a/build/docs/Program.cs b/build/docs/Program.cs
index 443f63f84b..465b1d4705 100644
--- a/build/docs/Program.cs
+++ b/build/docs/Program.cs
@@ -1,4 +1,5 @@
-using Cake.Frosting;
+global using Constants = Common.Utilities.Constants;
+
 using Docs;
 
 return new CakeHost()
diff --git a/build/docs/Startup.cs b/build/docs/Startup.cs
index 353c9601dc..f0ad9e513d 100644
--- a/build/docs/Startup.cs
+++ b/build/docs/Startup.cs
@@ -1,5 +1,3 @@
-using System;
-using Cake.Frosting;
 using Common.Lifetime;
 using Common.Utilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -17,4 +15,4 @@ public void Configure(IServiceCollection services)
 
         services.UseTool(new Uri("dotnet:?package=Wyam.Tool&version=2.2.9"));
     }
-}
\ No newline at end of file
+}
diff --git a/build/docs/Tasks/BuildDocs.cs b/build/docs/Tasks/BuildDocs.cs
index 36580dc972..aefb216d2d 100644
--- a/build/docs/Tasks/BuildDocs.cs
+++ b/build/docs/Tasks/BuildDocs.cs
@@ -1,5 +1,3 @@
-using Cake.Common.IO;
-using Cake.Frosting;
 using Cake.Wyam;
 using Common.Utilities;
 
@@ -25,4 +23,4 @@ public override void Run(BuildContext context)
             context.Wyam(context.WyamSettings);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build/docs/Tasks/Clean.cs b/build/docs/Tasks/Clean.cs
index aea0409665..824b9210ad 100644
--- a/build/docs/Tasks/Clean.cs
+++ b/build/docs/Tasks/Clean.cs
@@ -1,6 +1,3 @@
-using Cake.Common.Diagnostics;
-using Cake.Common.IO;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Docs.Tasks;
@@ -15,4 +12,4 @@ public override void Run(BuildContext context)
 
         context.EnsureDirectoryExists(Paths.ArtifactsDocs.Combine("_published"));
     }
-}
\ No newline at end of file
+}
diff --git a/build/docs/Tasks/Default.cs b/build/docs/Tasks/Default.cs
index 1e4fc9a77d..86555fbb28 100644
--- a/build/docs/Tasks/Default.cs
+++ b/build/docs/Tasks/Default.cs
@@ -1,8 +1,6 @@
-using Cake.Frosting;
-
 namespace Docs.Tasks;
 
 [TaskDescription("Shows this output")]
 public class Default : Common.Tasks.Default
 {
-}
\ No newline at end of file
+}
diff --git a/build/docs/Tasks/PreviewDocs.cs b/build/docs/Tasks/PreviewDocs.cs
index 76e63329e7..a25084e268 100644
--- a/build/docs/Tasks/PreviewDocs.cs
+++ b/build/docs/Tasks/PreviewDocs.cs
@@ -1,5 +1,3 @@
-using Cake.Common.IO;
-using Cake.Frosting;
 using Cake.Wyam;
 using Common.Utilities;
 
@@ -28,4 +26,4 @@ public override void Run(BuildContext context)
             context.Wyam(context.WyamSettings);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build/docs/Tasks/PublishDocs.cs b/build/docs/Tasks/PublishDocs.cs
index 2832690b1d..d9f1c7d06b 100644
--- a/build/docs/Tasks/PublishDocs.cs
+++ b/build/docs/Tasks/PublishDocs.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Linq;
-using Cake.Common.Diagnostics;
-using Cake.Common.IO;
-using Cake.Core;
-using Cake.Core.IO;
-using Cake.Frosting;
 using Cake.Git;
 using Cake.Wyam;
 using Common.Utilities;
@@ -125,4 +118,4 @@ private static void PublishToGitHub(BuildContext context, DirectoryPath publishF
 
         context.GitPushBranch(publishFolder, username, token, publishBranchName);
     }
-}
\ No newline at end of file
+}
diff --git a/build/docs/Utilities/Credentials.cs b/build/docs/Utilities/Credentials.cs
index 6ce642f10a..1726315379 100644
--- a/build/docs/Utilities/Credentials.cs
+++ b/build/docs/Utilities/Credentials.cs
@@ -1,5 +1,3 @@
-using Cake.Common;
-using Cake.Core;
 using Common.Utilities;
 
 namespace Docs.Utilities;
@@ -13,4 +11,4 @@ public class Credentials
             context.EnvironmentVariable("GITHUB_TOKEN"),
             context.EnvironmentVariable("GITHUB_USERNAME"))
     };
-}
\ No newline at end of file
+}
diff --git a/build/publish/BuildContext.cs b/build/publish/BuildContext.cs
index 69c49d20e0..5ad09ee4fa 100644
--- a/build/publish/BuildContext.cs
+++ b/build/publish/BuildContext.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using Cake.Core;
 using Common.Utilities;
 using Publish.Utilities;
 
@@ -13,4 +11,4 @@ public class BuildContext : BuildContextBase
     public BuildContext(ICakeContext context) : base(context)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/build/publish/BuildLifetime.cs b/build/publish/BuildLifetime.cs
index 15db341e09..7746522c9a 100644
--- a/build/publish/BuildLifetime.cs
+++ b/build/publish/BuildLifetime.cs
@@ -1,5 +1,3 @@
-using System;
-using Cake.Common.IO;
 using Common.Utilities;
 using Publish.Utilities;
 
@@ -27,4 +25,4 @@ public override void Setup(BuildContext context)
         LogBuildInformation(context);
         context.EndGroup();
     }
-}
\ No newline at end of file
+}
diff --git a/build/publish/Program.cs b/build/publish/Program.cs
index d12aa43fcb..3a82933bc7 100644
--- a/build/publish/Program.cs
+++ b/build/publish/Program.cs
@@ -1,4 +1,5 @@
-using Cake.Frosting;
+global using Constants = Common.Utilities.Constants;
+
 using Publish;
 
 return new CakeHost()
diff --git a/build/publish/Startup.cs b/build/publish/Startup.cs
index e6b60aef72..8fe3397223 100644
--- a/build/publish/Startup.cs
+++ b/build/publish/Startup.cs
@@ -1,5 +1,3 @@
-using System;
-using Cake.Frosting;
 using Common.Lifetime;
 using Common.Utilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -17,4 +15,4 @@ public void Configure(IServiceCollection services)
 
         services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
     }
-}
\ No newline at end of file
+}
diff --git a/build/publish/Tasks/Default.cs b/build/publish/Tasks/Default.cs
index 215a38ab17..eed5903ce5 100644
--- a/build/publish/Tasks/Default.cs
+++ b/build/publish/Tasks/Default.cs
@@ -1,8 +1,6 @@
-using Cake.Frosting;
-
 namespace Publish.Tasks;
 
 [TaskDescription("Shows this output")]
 public class Default : Common.Tasks.Default
 {
-}
\ No newline at end of file
+}
diff --git a/build/publish/Tasks/PublishChocolatey.cs b/build/publish/Tasks/PublishChocolatey.cs
index 41072f3254..373fd457ac 100644
--- a/build/publish/Tasks/PublishChocolatey.cs
+++ b/build/publish/Tasks/PublishChocolatey.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Linq;
-using Cake.Common.Diagnostics;
 using Cake.Common.Tools.Chocolatey;
 using Cake.Common.Tools.Chocolatey.Push;
-using Cake.Core;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Publish.Tasks;
@@ -68,4 +63,4 @@ private static bool IsPackagePublished(ICakeContext context, string packageName,
         var chocoListOutput = context.ExecuteCommand(chocoExe, $"list {packageName} --version={nugetVersion}");
         return chocoListOutput.Contains("1 packages found.");
     }
-}
\ No newline at end of file
+}
diff --git a/build/publish/Tasks/PublishNuget.cs b/build/publish/Tasks/PublishNuget.cs
index c5a9769818..95e3cef0d2 100644
--- a/build/publish/Tasks/PublishNuget.cs
+++ b/build/publish/Tasks/PublishNuget.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Linq;
-using Cake.Common.Diagnostics;
-using Cake.Common.Tools.DotNetCore;
 using Cake.Common.Tools.DotNetCore.NuGet.Push;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Publish.Tasks;
@@ -66,4 +61,4 @@ private static void PublishToNugetRepo(BuildContext context, string apiKey, stri
             });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build/publish/Utilities/Credentials.cs b/build/publish/Utilities/Credentials.cs
index c09ba9a5e6..e8cf943c20 100644
--- a/build/publish/Utilities/Credentials.cs
+++ b/build/publish/Utilities/Credentials.cs
@@ -1,5 +1,3 @@
-using Cake.Common;
-using Cake.Core;
 using Common.Utilities;
 
 namespace Publish.Utilities;
@@ -16,4 +14,4 @@ public class Credentials
         Nuget = new NugetCredentials(context.EnvironmentVariable("NUGET_API_KEY")),
         Chocolatey = new ChocolateyCredentials(context.EnvironmentVariable("CHOCOLATEY_API_KEY")),
     };
-}
\ No newline at end of file
+}
diff --git a/build/release/BuildContext.cs b/build/release/BuildContext.cs
index 850dc43c11..7b01b01652 100644
--- a/build/release/BuildContext.cs
+++ b/build/release/BuildContext.cs
@@ -1,4 +1,3 @@
-using Cake.Core;
 using Common.Utilities;
 using Release.Utilities;
 
@@ -11,4 +10,4 @@ public class BuildContext : BuildContextBase
     public BuildContext(ICakeContext context) : base(context)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/build/release/Program.cs b/build/release/Program.cs
index 4a2188339f..a37c705f05 100644
--- a/build/release/Program.cs
+++ b/build/release/Program.cs
@@ -1,4 +1,5 @@
-using Cake.Frosting;
+global using Constants = Common.Utilities.Constants;
+
 using Release;
 
 return new CakeHost()
diff --git a/build/release/Startup.cs b/build/release/Startup.cs
index f41c542c02..538f234076 100644
--- a/build/release/Startup.cs
+++ b/build/release/Startup.cs
@@ -1,5 +1,3 @@
-using System;
-using Cake.Frosting;
 using Common.Lifetime;
 using Common.Utilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -18,4 +16,4 @@ public void Configure(IServiceCollection services)
         services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
         services.UseTool(new Uri("dotnet:?package=GitReleaseManager.Tool&version=0.12.0"));
     }
-}
\ No newline at end of file
+}
diff --git a/build/release/Tasks/Default.cs b/build/release/Tasks/Default.cs
index ffa4fa6afa..e842138737 100644
--- a/build/release/Tasks/Default.cs
+++ b/build/release/Tasks/Default.cs
@@ -1,8 +1,6 @@
-using Cake.Frosting;
-
 namespace Release.Tasks;
 
 [TaskDescription("Shows this output")]
 public class Default : Common.Tasks.Default
 {
-}
\ No newline at end of file
+}
diff --git a/build/release/Tasks/PublishRelease.cs b/build/release/Tasks/PublishRelease.cs
index 7e0e053461..02160bfb22 100644
--- a/build/release/Tasks/PublishRelease.cs
+++ b/build/release/Tasks/PublishRelease.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Linq;
-using Cake.Common.Diagnostics;
-using Cake.Common.IO;
 using Cake.Common.Tools.GitReleaseManager;
 using Cake.Common.Tools.GitReleaseManager.Create;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Release.Tasks;
@@ -58,4 +53,4 @@ public override void Run(BuildContext context)
         context.GitReleaseManagerAddAssets(token, Constants.RepoOwner, Constants.Repository, milestone, assets);
         context.GitReleaseManagerClose(token, Constants.RepoOwner, Constants.Repository, milestone);
     }
-}
\ No newline at end of file
+}
diff --git a/build/release/Utilities/Credentials.cs b/build/release/Utilities/Credentials.cs
index a81b3850eb..c71f6cf92f 100644
--- a/build/release/Utilities/Credentials.cs
+++ b/build/release/Utilities/Credentials.cs
@@ -1,5 +1,3 @@
-using Cake.Common;
-using Cake.Core;
 using Common.Utilities;
 
 namespace Release.Utilities;
@@ -11,4 +9,4 @@ public class Credentials
     {
         GitHub = new GitHubCredentials(context.EnvironmentVariable("GITHUB_TOKEN")),
     };
-}
\ No newline at end of file
+}

From 1593d7154df54f87fe1697c0402d8b5dcad9f9db Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Fri, 1 Oct 2021 22:50:15 +0200
Subject: [PATCH 07/30] (build) update sdk to 6.0 for build workflow

---
 .github/workflows/ci.yml | 52 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 76e0bd3667..942eb3979f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,6 +48,12 @@ jobs:
       with:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
+    -
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v1.8.2
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Prepare]'
       if: steps.cache-cake.outputs.cache-hit != 'true'
@@ -83,6 +89,12 @@ jobs:
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
+    -
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v1.8.2
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Build]'
       shell: pwsh
@@ -134,6 +146,12 @@ jobs:
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
+    -
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v1.8.2
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Build]'
       shell: pwsh
@@ -175,6 +193,12 @@ jobs:
       with:
         name: nuget
         path: ${{ github.workspace }}/artifacts/packages/nuget
+    -
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v1.8.2
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Test Artifacts]'
       shell: pwsh
@@ -224,13 +248,19 @@ jobs:
         name: native-${{ runner.os }}
         path: ${{ github.workspace }}/artifacts/packages/native
     -
-      name: Set up QEMU
+      name: Setup QEMU
       uses: docker/setup-qemu-action@v1
     -
       name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
       with:
         install: true
+    -
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v1.8.2
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Test Artifacts (amd64)]'
       shell: pwsh
@@ -278,13 +308,19 @@ jobs:
         name: nuget
         path: ${{ github.workspace }}/artifacts/packages/nuget
     -
-      name: Set up QEMU
+      name: Setup QEMU
       uses: docker/setup-qemu-action@v1
     -
       name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
       with:
         install: true
+    -
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v1.8.2
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: Login to DockerHub
       if: success() && github.event_name != 'pull_request'
@@ -371,6 +407,12 @@ jobs:
       with:
         name: nuget
         path: ${{ github.workspace }}/artifacts/packages/nuget
+    -
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v1.8.2
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Publish]'
       shell: pwsh
@@ -421,6 +463,12 @@ jobs:
       with:
         name: native-macOS
         path: ${{ github.workspace }}/artifacts/packages/native
+    -
+      name: Setup .NET SDK
+      uses: actions/setup-dotnet@v1.8.2
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     -
       name: '[Release]'
       shell: pwsh

From ff4beda9dc67a2e9a99e3d749a68dac5bdd19ea1 Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Sat, 2 Oct 2021 11:26:04 +0200
Subject: [PATCH 08/30] (build) added .net 6.0 as TargetFramework for main
 solution

---
 src/Directory.Build.props                                    | 4 ++--
 src/GitVersion.App.Tests/GitVersion.App.Tests.csproj         | 2 +-
 src/GitVersion.App/GitVersion.App.csproj                     | 2 +-
 src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj       | 2 +-
 src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj | 2 +-
 src/GitVersion.MsBuild/nuget-files.props                     | 4 ++++
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 83227e1747..c8828de84a 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -17,8 +17,8 @@
 
         <NoWarn>1591</NoWarn>
         <DebugType>embedded</DebugType>
-        <LangVersion>9.0</LangVersion>
-
+        <LangVersion>10</LangVersion>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
     <PropertyGroup>
         <PackageVersion_LibGit2Sharp>0.27.0-preview-0116</PackageVersion_LibGit2Sharp>
diff --git a/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj b/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj
index 11ccc6fe55..2d130f1856 100644
--- a/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj
+++ b/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net48;netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFrameworks>net48;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
 
         <IsTestProject>true</IsTestProject>
     </PropertyGroup>
diff --git a/src/GitVersion.App/GitVersion.App.csproj b/src/GitVersion.App/GitVersion.App.csproj
index c98673eb24..7bfdefd4f2 100644
--- a/src/GitVersion.App/GitVersion.App.csproj
+++ b/src/GitVersion.App/GitVersion.App.csproj
@@ -4,7 +4,7 @@
         <OutputType>Exe</OutputType>
         <RootNamespace>GitVersion</RootNamespace>
         <AssemblyName>gitversion</AssemblyName>
-        <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <PlatformTarget>AnyCPU</PlatformTarget>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <DocumentationFile>bin\$(Configuration)\GitVersion.xml</DocumentationFile>
diff --git a/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj b/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj
index 5e6ed30613..a5a29345f8 100644
--- a/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj
+++ b/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net48;netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFrameworks>net48;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
 
         <DebugType>full</DebugType>
         <Optimize>false</Optimize>
diff --git a/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj b/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj
index ce2aee7142..4146c775f8 100644
--- a/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj
+++ b/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net48;netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFrameworks>net48;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
 
         <IsTestProject>true</IsTestProject>
     </PropertyGroup>
diff --git a/src/GitVersion.MsBuild/nuget-files.props b/src/GitVersion.MsBuild/nuget-files.props
index 3ed587750c..65516b5e63 100644
--- a/src/GitVersion.MsBuild/nuget-files.props
+++ b/src/GitVersion.MsBuild/nuget-files.props
@@ -4,9 +4,11 @@
         <PublishTask_net48>../GitVersion.App/bin/$(Configuration)/net48</PublishTask_net48>
         <PublishTask_netcore31>../GitVersion.App/bin/$(Configuration)/netcoreapp3.1/publish</PublishTask_netcore31>
         <PublishTask_net50>../GitVersion.App/bin/$(Configuration)/net5.0/publish</PublishTask_net50>
+        <PublishTask_net60>../GitVersion.App/bin/$(Configuration)/net6.0/publish</PublishTask_net60>
         <Target_net48>tools/net48</Target_net48>
         <Target_netcore31>tools/netcoreapp3.1</Target_netcore31>
         <Target_net50>tools/net5.0</Target_net50>
+        <Target_net60>tools/net6.0</Target_net60>
     </PropertyGroup>
     <ItemGroup Condition="$(IsPackaging) != ''">
         <None Include="msbuild/tools/*.*"                                        Pack="true" PackagePath="tools" />
@@ -16,9 +18,11 @@
         <None Include="$(PublishTask_net48)/**/*"                                Pack="true" PackagePath="$(Target_net48)" />
         <None Include="$(PublishTask_netcore31)/**/*"                            Pack="true" PackagePath="$(Target_netcore31)" />
         <None Include="$(PublishTask_net50)/**/*"                                Pack="true" PackagePath="$(Target_net50)" />
+        <None Include="$(PublishTask_net60)/**/*"                                Pack="true" PackagePath="$(Target_net60)" />
 
         <None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net48)" />
         <None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_netcore31)" />
         <None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net50)" />
+        <None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net60)" />
     </ItemGroup>
 </Project>

From 23c5d18cb003ff64e6b413d200c18edd1aa652a5 Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Sat, 2 Oct 2021 11:48:26 +0200
Subject: [PATCH 09/30] (build) target rider run configurations to net.60

---
 build/.run/Artifacts DotnetTool Test.run.xml  |  6 ++---
 build/.run/Artifacts Executable Test.run.xml  |  4 ++--
 build/.run/Artifacts MsBuildCore Test.run.xml |  6 ++---
 build/.run/Artifacts MsBuildFull Test.run.xml |  4 ++--
 build/.run/Artifacts Native Test.run.xml      |  6 ++---
 build/.run/Artifacts Prepare.run.xml          |  6 ++---
 build/.run/Artifacts Test.run.xml             |  6 ++---
 build/.run/Build Docs.run.xml                 |  4 ++--
 build/.run/Build.run.xml                      |  4 ++--
 build/.run/Clean.run.xml                      |  4 ++--
 build/.run/Code Format.run.xml                |  4 ++--
 build/.run/Default Artifacts.run.xml          |  4 ++--
 build/.run/Default Build.run.xml              |  4 ++--
 build/.run/Default Chores.run.xml             |  4 ++--
 build/.run/Default Docker.run.xml             | 22 ++-----------------
 build/.run/Default Docs.run.xml               |  2 +-
 build/.run/Default Publish.run.xml            |  4 ++--
 build/.run/Docker Build.run.xml               |  6 ++---
 build/.run/Docker Manifest.run.xml            |  6 ++---
 build/.run/Docker Publish.run.xml             |  6 ++---
 build/.run/Docker Test.run.xml                |  6 ++---
 build/.run/Package Chocolatey.run.xml         |  4 ++--
 build/.run/Package GZip.run.xml               |  4 ++--
 build/.run/Package Nuget.run.xml              |  4 ++--
 build/.run/Package.run.xml                    |  4 ++--
 build/.run/PackagePrepare.run.xml             |  4 ++--
 build/.run/Preview Docs.run.xml               |  4 ++--
 build/.run/Publish Chocolatey.run.xml         |  4 ++--
 build/.run/Publish Docs.run.xml               |  4 ++--
 build/.run/Publish Nuget.run.xml              |  4 ++--
 build/.run/Publish Release.run.xml            |  4 ++--
 build/.run/Test.run.xml                       |  4 ++--
 build/.run/Tools Install.run.xml              |  4 ++--
 build/.run/Tools Update.run.xml               |  4 ++--
 build/.run/UnitTest (3.1).run.xml             |  4 ++--
 build/.run/UnitTest (4.8).run.xml             |  4 ++--
 build/.run/UnitTest (5.0).run.xml             |  8 +++----
 build/.run/ValidateVersion.run.xml            |  4 ++--
 38 files changed, 86 insertions(+), 104 deletions(-)

diff --git a/build/.run/Artifacts DotnetTool Test.run.xml b/build/.run/Artifacts DotnetTool Test.run.xml
index 6fe96fbd30..b79166a340 100644
--- a/build/.run/Artifacts DotnetTool Test.run.xml	
+++ b/build/.run/Artifacts DotnetTool Test.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts DotnetTool Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --docker_dotnetversion=5.0 --docker_distro=debian.11" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Artifacts Executable Test.run.xml b/build/.run/Artifacts Executable Test.run.xml
index d7a2206f2c..260a2b5727 100644
--- a/build/.run/Artifacts Executable Test.run.xml	
+++ b/build/.run/Artifacts Executable Test.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Artifacts MsBuildCore Test.run.xml b/build/.run/Artifacts MsBuildCore Test.run.xml
index bef168922a..1a96f6dce6 100644
--- a/build/.run/Artifacts MsBuildCore Test.run.xml	
+++ b/build/.run/Artifacts MsBuildCore Test.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts MsBuildCore Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=alpine.3.12-x64" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Artifacts MsBuildFull Test.run.xml b/build/.run/Artifacts MsBuildFull Test.run.xml
index d960af10a9..1720ff0093 100644
--- a/build/.run/Artifacts MsBuildFull Test.run.xml	
+++ b/build/.run/Artifacts MsBuildFull Test.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Artifacts Native Test.run.xml b/build/.run/Artifacts Native Test.run.xml
index 3f9cc090c4..6f799f09dd 100644
--- a/build/.run/Artifacts Native Test.run.xml	
+++ b/build/.run/Artifacts Native Test.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Native Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsNativeTest --arch=amd64 --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsNativeTest --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=alpine.3.12-x64" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Artifacts Prepare.run.xml b/build/.run/Artifacts Prepare.run.xml
index da6c3f188a..abfa44087a 100644
--- a/build/.run/Artifacts Prepare.run.xml	
+++ b/build/.run/Artifacts Prepare.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Prepare" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsPrepare --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsPrepare --docker_dotnetversion=6.0 --docker_distro=alpine.3.12-x64" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Artifacts Test.run.xml b/build/.run/Artifacts Test.run.xml
index c0d9ec7de0..00cbcedda2 100644
--- a/build/.run/Artifacts Test.run.xml	
+++ b/build/.run/Artifacts Test.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsTest --docker_dotnetversion=5.0 --docker_distro=alpine.3.12-x64" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsTest --docker_dotnetversion=6.0 --docker_distro=alpine.3.12-x64" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Build Docs.run.xml b/build/.run/Build Docs.run.xml
index 9cfb0beba7..eec6929a0e 100644
--- a/build/.run/Build Docs.run.xml	
+++ b/build/.run/Build Docs.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Build.run.xml b/build/.run/Build.run.xml
index 038e7d5014..7a45af8c8f 100644
--- a/build/.run/Build.run.xml
+++ b/build/.run/Build.run.xml
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Clean.run.xml b/build/.run/Clean.run.xml
index dd3d5a2343..d1878a9df9 100644
--- a/build/.run/Clean.run.xml
+++ b/build/.run/Clean.run.xml
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Code Format.run.xml b/build/.run/Code Format.run.xml
index f09780fd5f..fd35aebb7a 100644
--- a/build/.run/Code Format.run.xml	
+++ b/build/.run/Code Format.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Default Artifacts.run.xml b/build/.run/Default Artifacts.run.xml
index 02a02add5b..399102d9b7 100644
--- a/build/.run/Default Artifacts.run.xml	
+++ b/build/.run/Default Artifacts.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Default Build.run.xml b/build/.run/Default Build.run.xml
index 431527ea49..03bb44b7cd 100644
--- a/build/.run/Default Build.run.xml	
+++ b/build/.run/Default Build.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Default Chores.run.xml b/build/.run/Default Chores.run.xml
index 9565a669c9..f2ba56aa12 100644
--- a/build/.run/Default Chores.run.xml	
+++ b/build/.run/Default Chores.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Default Docker.run.xml b/build/.run/Default Docker.run.xml
index 91eaa23141..7b8485d1fe 100644
--- a/build/.run/Default Docker.run.xml	
+++ b/build/.run/Default Docker.run.xml	
@@ -1,22 +1,4 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Default Build" type="DotNetProject" factoryName=".NET Project" folderName="Default">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="USE_MONO" value="0" />
-    <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/build/build.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
-    <method v="2">
-      <option name="Build" />
-    </method>
-  </configuration>
   <configuration default="false" name="Default Docker" type="DotNetProject" factoryName=".NET Project" folderName="Default">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
@@ -30,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Default Docs.run.xml b/build/.run/Default Docs.run.xml
index 07f4d87493..0e9cf652a7 100644
--- a/build/.run/Default Docs.run.xml	
+++ b/build/.run/Default Docs.run.xml	
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Default Publish.run.xml b/build/.run/Default Publish.run.xml
index f40cec0c7b..c4edb33072 100644
--- a/build/.run/Default Publish.run.xml	
+++ b/build/.run/Default Publish.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Docker Build.run.xml b/build/.run/Docker Build.run.xml
index cebab346bf..198f574003 100644
--- a/build/.run/Docker Build.run.xml	
+++ b/build/.run/Docker Build.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker Build" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --arch amd64 --docker_dotnetversion=5.0 --docker_distro=debian.11" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --arch amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Docker Manifest.run.xml b/build/.run/Docker Manifest.run.xml
index ca0ecd1a0f..eb994a062c 100644
--- a/build/.run/Docker Manifest.run.xml	
+++ b/build/.run/Docker Manifest.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker Manifest" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerManifest --docker_dotnetversion=5.0 --docker_distro=debian.11" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerManifest --docker_dotnetversion=6.0 --docker_distro=debian.11" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Docker Publish.run.xml b/build/.run/Docker Publish.run.xml
index 6d43f506cf..dbdebe935f 100644
--- a/build/.run/Docker Publish.run.xml	
+++ b/build/.run/Docker Publish.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker Publish" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerPublish --arch amd64 --docker_dotnetversion=5.0 --docker_distro=debian.11" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerPublish --arch amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Docker Test.run.xml b/build/.run/Docker Test.run.xml
index 1c2d5bb7d2..09f0c21d44 100644
--- a/build/.run/Docker Test.run.xml	
+++ b/build/.run/Docker Test.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker Test" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerTest --arch amd64 --docker_dotnetversion=5.0 --docker_distro=debian.11" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerTest --arch amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Package Chocolatey.run.xml b/build/.run/Package Chocolatey.run.xml
index d3328265b5..c51905b1cb 100644
--- a/build/.run/Package Chocolatey.run.xml	
+++ b/build/.run/Package Chocolatey.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Package GZip.run.xml b/build/.run/Package GZip.run.xml
index 303baef331..358361bd56 100644
--- a/build/.run/Package GZip.run.xml	
+++ b/build/.run/Package GZip.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Package Nuget.run.xml b/build/.run/Package Nuget.run.xml
index ffb086730b..efdbd8bef8 100644
--- a/build/.run/Package Nuget.run.xml	
+++ b/build/.run/Package Nuget.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Package.run.xml b/build/.run/Package.run.xml
index cb9fb70be9..0cc953e5ca 100644
--- a/build/.run/Package.run.xml
+++ b/build/.run/Package.run.xml
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/PackagePrepare.run.xml b/build/.run/PackagePrepare.run.xml
index 62477a8131..225f94e90d 100644
--- a/build/.run/PackagePrepare.run.xml
+++ b/build/.run/PackagePrepare.run.xml
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Preview Docs.run.xml b/build/.run/Preview Docs.run.xml
index bc17186ae1..9068da7671 100644
--- a/build/.run/Preview Docs.run.xml	
+++ b/build/.run/Preview Docs.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Publish Chocolatey.run.xml b/build/.run/Publish Chocolatey.run.xml
index dd0841c814..641d36acea 100644
--- a/build/.run/Publish Chocolatey.run.xml	
+++ b/build/.run/Publish Chocolatey.run.xml	
@@ -15,9 +15,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Publish Docs.run.xml b/build/.run/Publish Docs.run.xml
index b11e652ddb..7df9af5017 100644
--- a/build/.run/Publish Docs.run.xml	
+++ b/build/.run/Publish Docs.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Publish Nuget.run.xml b/build/.run/Publish Nuget.run.xml
index b55fb16266..2b4af69eb4 100644
--- a/build/.run/Publish Nuget.run.xml	
+++ b/build/.run/Publish Nuget.run.xml	
@@ -15,9 +15,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Publish Release.run.xml b/build/.run/Publish Release.run.xml
index 2510b49a2a..ff99047ca0 100644
--- a/build/.run/Publish Release.run.xml	
+++ b/build/.run/Publish Release.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Test.run.xml b/build/.run/Test.run.xml
index 775889166d..d5e9c3b1eb 100644
--- a/build/.run/Test.run.xml
+++ b/build/.run/Test.run.xml
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Tools Install.run.xml b/build/.run/Tools Install.run.xml
index 4f2b5d0551..a93ddf593d 100644
--- a/build/.run/Tools Install.run.xml	
+++ b/build/.run/Tools Install.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Tools Update.run.xml b/build/.run/Tools Update.run.xml
index 96d97ac993..79b1aaa0be 100644
--- a/build/.run/Tools Update.run.xml	
+++ b/build/.run/Tools Update.run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/UnitTest (3.1).run.xml b/build/.run/UnitTest (3.1).run.xml
index 9cc7afb643..c9d30bd0c4 100644
--- a/build/.run/UnitTest (3.1).run.xml	
+++ b/build/.run/UnitTest (3.1).run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/UnitTest (4.8).run.xml b/build/.run/UnitTest (4.8).run.xml
index 3d388208ca..bc1829bc99 100644
--- a/build/.run/UnitTest (4.8).run.xml	
+++ b/build/.run/UnitTest (4.8).run.xml	
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/UnitTest (5.0).run.xml b/build/.run/UnitTest (5.0).run.xml
index 15deade318..4b83f40ccd 100644
--- a/build/.run/UnitTest (5.0).run.xml	
+++ b/build/.run/UnitTest (5.0).run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="UnitTest (5.0)" type="DotNetProject" factoryName=".NET Project" folderName="Unit Test">
+  <configuration default="false" name="UnitTest (6.0)" type="DotNetProject" factoryName=".NET Project" folderName="Unit Test">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_target=net5.0" />
+    <option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_target=net6.0" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/ValidateVersion.run.xml b/build/.run/ValidateVersion.run.xml
index a7668e6297..3f0dfe14e3 100644
--- a/build/.run/ValidateVersion.run.xml
+++ b/build/.run/ValidateVersion.run.xml
@@ -12,9 +12,9 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net6.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>

From ff878fa5fdc3430bc06286fc3bd135b6cf7e326c Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Sat, 2 Oct 2021 11:50:54 +0200
Subject: [PATCH 10/30] (build) fix formatting

---
 build/artifacts/Utilities/IsExternalInit.cs           | 2 +-
 build/build/Utilities/EnvVars.cs                      | 2 +-
 build/build/Utilities/IsExternalInit.cs               | 2 +-
 build/chores/BuildContext.cs                          | 2 +-
 build/chores/BuildLifetime.cs                         | 2 +-
 build/chores/Startup.cs                               | 2 +-
 build/chores/Tasks/Default.cs                         | 2 +-
 build/chores/Tasks/ToolsInstall.cs                    | 2 +-
 build/chores/Tasks/ToolsUpdate.cs                     | 2 +-
 build/common/Addins/GitVersion/GitVersion.cs          | 2 +-
 build/common/Addins/GitVersion/GitVersionOutput.cs    | 2 +-
 build/common/Addins/GitVersion/GitVersionVerbosity.cs | 2 +-
 build/common/Utilities/Arguments.cs                   | 2 +-
 build/common/Utilities/Constants.cs                   | 2 +-
 build/common/Utilities/IsExternalInit.cs              | 2 +-
 build/docker/Utilities/IsExternalInit.cs              | 2 +-
 build/docs/Utilities/IsExternalInit.cs                | 2 +-
 build/publish/Utilities/IsExternalInit.cs             | 2 +-
 build/release/BuildLifetime.cs                        | 2 +-
 build/release/Utilities/IsExternalInit.cs             | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/build/artifacts/Utilities/IsExternalInit.cs b/build/artifacts/Utilities/IsExternalInit.cs
index ae51612719..99712b06b8 100644
--- a/build/artifacts/Utilities/IsExternalInit.cs
+++ b/build/artifacts/Utilities/IsExternalInit.cs
@@ -9,4 +9,4 @@ namespace System.Runtime.CompilerServices;
 [EditorBrowsable(EditorBrowsableState.Never)]
 public static class IsExternalInit
 {
-}
\ No newline at end of file
+}
diff --git a/build/build/Utilities/EnvVars.cs b/build/build/Utilities/EnvVars.cs
index 4f31f3edca..3dcfe2428b 100644
--- a/build/build/Utilities/EnvVars.cs
+++ b/build/build/Utilities/EnvVars.cs
@@ -3,4 +3,4 @@ namespace Build.Utilities;
 public class EnvVars
 {
     public const string EnabledUnitTests = "ENABLED_UNIT_TESTS";
-}
\ No newline at end of file
+}
diff --git a/build/build/Utilities/IsExternalInit.cs b/build/build/Utilities/IsExternalInit.cs
index ae51612719..99712b06b8 100644
--- a/build/build/Utilities/IsExternalInit.cs
+++ b/build/build/Utilities/IsExternalInit.cs
@@ -9,4 +9,4 @@ namespace System.Runtime.CompilerServices;
 [EditorBrowsable(EditorBrowsableState.Never)]
 public static class IsExternalInit
 {
-}
\ No newline at end of file
+}
diff --git a/build/chores/BuildContext.cs b/build/chores/BuildContext.cs
index 033dfe158d..11fc7b73da 100644
--- a/build/chores/BuildContext.cs
+++ b/build/chores/BuildContext.cs
@@ -8,4 +8,4 @@ public class BuildContext : FrostingContext
     public BuildContext(ICakeContext context) : base(context)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/build/chores/BuildLifetime.cs b/build/chores/BuildLifetime.cs
index e23c08a315..70e39067c5 100644
--- a/build/chores/BuildLifetime.cs
+++ b/build/chores/BuildLifetime.cs
@@ -16,4 +16,4 @@ public override void Teardown(BuildContext context, ITeardownContext info)
         context.StartGroup("Build Teardown");
         context.EndGroup();
     }
-}
\ No newline at end of file
+}
diff --git a/build/chores/Startup.cs b/build/chores/Startup.cs
index eae706c98e..86a8f0464c 100644
--- a/build/chores/Startup.cs
+++ b/build/chores/Startup.cs
@@ -11,4 +11,4 @@ public void Configure(IServiceCollection services)
         services.UseLifetime<BuildLifetime>();
         services.UseTaskLifetime<BuildTaskLifetime>();
     }
-}
\ No newline at end of file
+}
diff --git a/build/chores/Tasks/Default.cs b/build/chores/Tasks/Default.cs
index f6c30d9c64..fad7404b6d 100644
--- a/build/chores/Tasks/Default.cs
+++ b/build/chores/Tasks/Default.cs
@@ -5,4 +5,4 @@ namespace Chores.Tasks;
 [TaskDescription("Shows this output")]
 public class Default : Common.Tasks.Default
 {
-}
\ No newline at end of file
+}
diff --git a/build/chores/Tasks/ToolsInstall.cs b/build/chores/Tasks/ToolsInstall.cs
index 8932698692..0606be2b34 100644
--- a/build/chores/Tasks/ToolsInstall.cs
+++ b/build/chores/Tasks/ToolsInstall.cs
@@ -21,4 +21,4 @@ public override void Run(BuildContext context)
             // context.DotNetCoreTool($"tool update --tool-path {context.Configuration.GetToolPath()} --version {version} {toolName}");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build/chores/Tasks/ToolsUpdate.cs b/build/chores/Tasks/ToolsUpdate.cs
index f5091a812a..2714ecba38 100644
--- a/build/chores/Tasks/ToolsUpdate.cs
+++ b/build/chores/Tasks/ToolsUpdate.cs
@@ -23,4 +23,4 @@ public override void Run(BuildContext context)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build/common/Addins/GitVersion/GitVersion.cs b/build/common/Addins/GitVersion/GitVersion.cs
index a194cffc19..833cb5c387 100644
--- a/build/common/Addins/GitVersion/GitVersion.cs
+++ b/build/common/Addins/GitVersion/GitVersion.cs
@@ -129,4 +129,4 @@ public sealed class GitVersion
     /// Gets or sets the commit date.
     /// </summary>
     public string? CommitDate { get; set; }
-}
\ No newline at end of file
+}
diff --git a/build/common/Addins/GitVersion/GitVersionOutput.cs b/build/common/Addins/GitVersion/GitVersionOutput.cs
index 1425687bd3..b34683d490 100644
--- a/build/common/Addins/GitVersion/GitVersionOutput.cs
+++ b/build/common/Addins/GitVersion/GitVersionOutput.cs
@@ -14,4 +14,4 @@ public enum GitVersionOutput
     /// Outputs to the stdout in a way usable by a detected build server.
     /// </summary>
     BuildServer
-}
\ No newline at end of file
+}
diff --git a/build/common/Addins/GitVersion/GitVersionVerbosity.cs b/build/common/Addins/GitVersion/GitVersionVerbosity.cs
index 6ec33fc7b4..6f5daa7896 100644
--- a/build/common/Addins/GitVersion/GitVersionVerbosity.cs
+++ b/build/common/Addins/GitVersion/GitVersionVerbosity.cs
@@ -29,4 +29,4 @@ public enum GitVersionVerbosity
     /// Log error, warning, info and debug messages (log all).
     /// </summary>
     Debug
-}
\ No newline at end of file
+}
diff --git a/build/common/Utilities/Arguments.cs b/build/common/Utilities/Arguments.cs
index 2282b1de2e..e3f2eefc58 100644
--- a/build/common/Utilities/Arguments.cs
+++ b/build/common/Utilities/Arguments.cs
@@ -8,4 +8,4 @@ public class Arguments
     public const string DockerRegistry = "docker_registry";
     public const string DockerDotnetVersion = "docker_dotnetversion";
     public const string DockerDistro = "docker_distro";
-}
\ No newline at end of file
+}
diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs
index 895ba5099d..d976f3f656 100644
--- a/build/common/Utilities/Constants.cs
+++ b/build/common/Utilities/Constants.cs
@@ -55,4 +55,4 @@ public class Constants
     public const string NugetOrgUrl = "https://api.nuget.org/v3/index.json";
     public const string GithubPackagesUrl = "https://nuget.pkg.github.com/gittools/index.json";
     public const string ChocolateyUrl = "https://push.chocolatey.org/";
-}
\ No newline at end of file
+}
diff --git a/build/common/Utilities/IsExternalInit.cs b/build/common/Utilities/IsExternalInit.cs
index ae51612719..99712b06b8 100644
--- a/build/common/Utilities/IsExternalInit.cs
+++ b/build/common/Utilities/IsExternalInit.cs
@@ -9,4 +9,4 @@ namespace System.Runtime.CompilerServices;
 [EditorBrowsable(EditorBrowsableState.Never)]
 public static class IsExternalInit
 {
-}
\ No newline at end of file
+}
diff --git a/build/docker/Utilities/IsExternalInit.cs b/build/docker/Utilities/IsExternalInit.cs
index ae51612719..99712b06b8 100644
--- a/build/docker/Utilities/IsExternalInit.cs
+++ b/build/docker/Utilities/IsExternalInit.cs
@@ -9,4 +9,4 @@ namespace System.Runtime.CompilerServices;
 [EditorBrowsable(EditorBrowsableState.Never)]
 public static class IsExternalInit
 {
-}
\ No newline at end of file
+}
diff --git a/build/docs/Utilities/IsExternalInit.cs b/build/docs/Utilities/IsExternalInit.cs
index ae51612719..99712b06b8 100644
--- a/build/docs/Utilities/IsExternalInit.cs
+++ b/build/docs/Utilities/IsExternalInit.cs
@@ -9,4 +9,4 @@ namespace System.Runtime.CompilerServices;
 [EditorBrowsable(EditorBrowsableState.Never)]
 public static class IsExternalInit
 {
-}
\ No newline at end of file
+}
diff --git a/build/publish/Utilities/IsExternalInit.cs b/build/publish/Utilities/IsExternalInit.cs
index ae51612719..99712b06b8 100644
--- a/build/publish/Utilities/IsExternalInit.cs
+++ b/build/publish/Utilities/IsExternalInit.cs
@@ -9,4 +9,4 @@ namespace System.Runtime.CompilerServices;
 [EditorBrowsable(EditorBrowsableState.Never)]
 public static class IsExternalInit
 {
-}
\ No newline at end of file
+}
diff --git a/build/release/BuildLifetime.cs b/build/release/BuildLifetime.cs
index 31ce923dd9..26244e2b05 100644
--- a/build/release/BuildLifetime.cs
+++ b/build/release/BuildLifetime.cs
@@ -14,4 +14,4 @@ public override void Setup(BuildContext context)
         LogBuildInformation(context);
         context.EndGroup();
     }
-}
\ No newline at end of file
+}
diff --git a/build/release/Utilities/IsExternalInit.cs b/build/release/Utilities/IsExternalInit.cs
index ae51612719..99712b06b8 100644
--- a/build/release/Utilities/IsExternalInit.cs
+++ b/build/release/Utilities/IsExternalInit.cs
@@ -9,4 +9,4 @@ namespace System.Runtime.CompilerServices;
 [EditorBrowsable(EditorBrowsableState.Never)]
 public static class IsExternalInit
 {
-}
\ No newline at end of file
+}

From 96db7e94ec451f1b73674cbc8c63e1acd2b35ff7 Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Sat, 2 Oct 2021 14:19:27 +0200
Subject: [PATCH 11/30] (build) use the built it in net6.0 sdk dotnet-format
 tool

---
 .github/workflows/format.yml                  | 14 +++++-
 build/build/Startup.cs                        |  1 -
 build/build/Tasks/CodeFormat.cs               |  6 +--
 .../DotNetCoreFormatSettings.cs               | 27 ++++-------
 .../DotNetCoreFormatToolRunner.cs             | 47 +++++++------------
 dotnet-tools.json                             |  6 ---
 6 files changed, 40 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index a8e664ca86..9a42cab2ed 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -23,5 +23,15 @@ jobs:
     name: DotNet Format
     steps:
       - uses: actions/checkout@v2.3.4
-      - run: dotnet tool restore
-      - run: dotnet format ./ --folder --check --exclude **/AddFormats/
+      -
+        name: Setup .NET SDK
+        uses: actions/setup-dotnet@v1.8.2
+        with:
+          dotnet-version: '6.0.x'
+          include-prerelease: true
+      -
+        name: Run Format Build solution
+        run: dotnet format ./build/ --verify-no-changes
+      -
+        name: Run Format GitVersion solution
+        run: dotnet format ./src/ --exclude **/AddFormats/ --verify-no-changes
diff --git a/build/build/Startup.cs b/build/build/Startup.cs
index 3e5b594044..a250ebb6da 100644
--- a/build/build/Startup.cs
+++ b/build/build/Startup.cs
@@ -14,7 +14,6 @@ public void Configure(IServiceCollection services)
         services.UseWorkingDirectory(Extensions.GetRootDirectory());
 
         services.UseTool(new Uri("dotnet:?package=Codecov.Tool&version=1.13.0"));
-        services.UseTool(new Uri("dotnet:?package=dotnet-format&version=5.0.211103"));
         services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
     }
 }
diff --git a/build/build/Tasks/CodeFormat.cs b/build/build/Tasks/CodeFormat.cs
index 69c3fe46f8..ca7d35189c 100644
--- a/build/build/Tasks/CodeFormat.cs
+++ b/build/build/Tasks/CodeFormat.cs
@@ -12,16 +12,12 @@ public override void Run(BuildContext context)
         context.Information("Code format...");
         context.DotNetCoreFormat(new DotNetCoreFormatSettings
         {
-            Workspace = Paths.Build,
-            Folder = true,
-            FixWhitespaces = true,
+            Workspace = Paths.Build
         });
 
         context.DotNetCoreFormat(new DotNetCoreFormatSettings
         {
             Workspace = Paths.Src,
-            Folder = true,
-            FixWhitespaces = true,
             Exclude = new List<string> { " **/AddFormats/" }
         });
     }
diff --git a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatSettings.cs b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatSettings.cs
index 7a653caa11..bc00d15d07 100644
--- a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatSettings.cs
+++ b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatSettings.cs
@@ -11,24 +11,9 @@ public sealed class DotNetCoreFormatSettings : DotNetCoreSettings
     public Path? Workspace { get; set; }
 
     /// <summary>
-    /// Whether to treat the <see cref="Workspace"/> argument as a simple folder of files.
+    /// Run formatting command (Whitespace, style or analyzers). Run by default when not applying fixes.
     /// </summary>
-    public bool Folder { get; set; }
-
-    /// <summary>
-    /// Run whitespace formatting. Run by default when not applying fixes.
-    /// </summary>
-    public bool FixWhitespaces { get; set; }
-
-    /// <summary>
-    /// Run code style analyzers and apply fixes.
-    /// </summary>
-    public string? FixStyle { get; set; }
-
-    /// <summary>
-    /// Run 3rd party analyzers and apply fixes.
-    /// </summary>
-    public string? FixAnalyzers { get; set; }
+    public DotNetFormatFix Fix { get; set; }
 
     /// <summary>
     /// A list of diagnostic ids to use as a filter when fixing code style or 3rd party analyzers.
@@ -48,7 +33,7 @@ public sealed class DotNetCoreFormatSettings : DotNetCoreSettings
     /// <summary>
     /// Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted.
     /// </summary>
-    public bool Check { get; set; }
+    public bool VerifyNoChanges { get; set; }
 
     /// <summary>
     /// Set the verbosity level. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]
@@ -56,6 +41,12 @@ public sealed class DotNetCoreFormatSettings : DotNetCoreSettings
     public new DotNetFormatVerbosity Verbosity { get; set; } = DotNetFormatVerbosity.Normal;
 }
 
+public enum DotNetFormatFix
+{
+    Whitespace,
+    Style,
+    Analyzers
+}
 /// <summary>
 /// Represents verbosity.
 /// </summary>
diff --git a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatToolRunner.cs b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatToolRunner.cs
index 2ffac73f1c..aa47eda5db 100644
--- a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatToolRunner.cs
+++ b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatToolRunner.cs
@@ -1,6 +1,6 @@
 namespace Common.Addins.Cake.DotNetCoreFormat;
 
-public sealed class DotNetCoreFormatToolRunner : Tool<DotNetCoreFormatSettings>
+public sealed class DotNetCoreFormatToolRunner : DotNetCoreTool<DotNetCoreFormatSettings>
 {
     public DotNetCoreFormatToolRunner(
         IFileSystem fileSystem,
@@ -19,37 +19,26 @@ public void Run(DotNetCoreFormatSettings settings)
         Run(settings, GetArguments(settings));
     }
 
-    protected override string GetToolName()
-    {
-        return "Format";
-    }
-
-    protected override IEnumerable<string> GetToolExecutableNames()
-    {
-        return new[] { "dotnet-format", "dotnet-format.exe" };
-    }
-
     private static ProcessArgumentBuilder GetArguments(DotNetCoreFormatSettings settings)
     {
         ProcessArgumentBuilder arguments = new();
-        arguments.Append(settings.Workspace != null ? settings.Workspace.ToString() : settings.WorkingDirectory.ToString());
 
-        if (settings.Folder)
-        {
-            arguments.Append("--folder");
-        }
-        if (settings.FixWhitespaces)
-        {
-            arguments.Append("--fix-whitespace");
-        }
-        if (settings.FixStyle != null)
-        {
-            arguments.AppendSwitch("--fix-style", " ", settings.FixStyle);
-        }
-        if (settings.FixAnalyzers != null)
-        {
-            arguments.AppendSwitch("--fix-analyzers", " ", settings.FixAnalyzers);
+        arguments.Append("format");
+        switch (settings.Fix)
+        {
+            case DotNetFormatFix.Whitespace:
+                arguments.Append("whitespace");
+                break;
+            case DotNetFormatFix.Style:
+                arguments.Append("style");
+                break;
+            case DotNetFormatFix.Analyzers:
+                arguments.Append("analyzers");
+                break;
         }
+
+        arguments.Append(settings.Workspace != null ? settings.Workspace.ToString() : settings.WorkingDirectory.ToString());
+
         if (settings.Diagnostics != null)
         {
             arguments.AppendSwitch("--diagnostics", " ", string.Join(" ", settings.Diagnostics));
@@ -62,9 +51,9 @@ private static ProcessArgumentBuilder GetArguments(DotNetCoreFormatSettings sett
         {
             arguments.AppendSwitch("--exclude", " ", string.Join(" ", settings.Exclude));
         }
-        if (settings.Check)
+        if (settings.VerifyNoChanges)
         {
-            arguments.Append("--check");
+            arguments.Append("--verify-no-changes");
         }
         return arguments;
     }
diff --git a/dotnet-tools.json b/dotnet-tools.json
index db1412f1ee..2876a58d3a 100644
--- a/dotnet-tools.json
+++ b/dotnet-tools.json
@@ -25,12 +25,6 @@
             "commands": [
                 "wyam"
             ]
-        },
-        "dotnet-format": {
-            "version": "5.0.211103",
-            "commands": [
-                "dotnet-format"
-            ]
         }
     }
 }

From b1ed098b3ecb0c31755cd55933341619ce46fee7 Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Sat, 2 Oct 2021 14:19:15 +0200
Subject: [PATCH 12/30] (build) move global import to common

---
 build/artifacts/Program.cs             | 2 --
 build/artifacts/artifacts.csproj       | 7 ++++++-
 build/build/Program.cs                 | 2 --
 build/build/build.csproj               | 5 +++++
 build/common/Utilities/ImportUsings.cs | 2 ++
 build/docker/Program.cs                | 2 --
 build/docker/docker.csproj             | 5 +++++
 build/docs/Program.cs                  | 2 --
 build/docs/docs.csproj                 | 5 +++++
 build/publish/Program.cs               | 2 --
 build/publish/publish.csproj           | 5 +++++
 build/release/Program.cs               | 2 --
 build/release/release.csproj           | 5 +++++
 13 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100644 build/common/Utilities/ImportUsings.cs

diff --git a/build/artifacts/Program.cs b/build/artifacts/Program.cs
index 1129d23dce..f0ff16e448 100644
--- a/build/artifacts/Program.cs
+++ b/build/artifacts/Program.cs
@@ -1,5 +1,3 @@
-global using Constants = Common.Utilities.Constants;
-
 using Artifacts;
 
 return new CakeHost()
diff --git a/build/artifacts/artifacts.csproj b/build/artifacts/artifacts.csproj
index fc9dd6f4af..7f8c61a261 100644
--- a/build/artifacts/artifacts.csproj
+++ b/build/artifacts/artifacts.csproj
@@ -4,6 +4,11 @@
         <RootNamespace>Artifacts</RootNamespace>
     </PropertyGroup>
     <ItemGroup>
-        <ProjectReference Include="..\common\common.csproj"/>
+        <ProjectReference Include="..\common\common.csproj" />
+    </ItemGroup>
+    <ItemGroup>
+      <Compile Include="..\common\Utilities\ImportUsings.cs">
+        <Link>ImportUsings.cs</Link>
+      </Compile>
     </ItemGroup>
 </Project>
diff --git a/build/build/Program.cs b/build/build/Program.cs
index a1cc8d8980..aba66ebb53 100644
--- a/build/build/Program.cs
+++ b/build/build/Program.cs
@@ -1,5 +1,3 @@
-global using Constants = Common.Utilities.Constants;
-
 using Build;
 
 return new CakeHost()
diff --git a/build/build/build.csproj b/build/build/build.csproj
index 5b2ae07758..50cd719276 100644
--- a/build/build/build.csproj
+++ b/build/build/build.csproj
@@ -10,4 +10,9 @@
         <PackageReference Include="Cake.Codecov" Version="1.0.1"/>
         <PackageReference Include="Cake.Coverlet" Version="2.5.4"/>
     </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\common\Utilities\ImportUsings.cs">
+            <Link>ImportUsings.cs</Link>
+        </Compile>
+    </ItemGroup>
 </Project>
diff --git a/build/common/Utilities/ImportUsings.cs b/build/common/Utilities/ImportUsings.cs
new file mode 100644
index 0000000000..26a8b0be62
--- /dev/null
+++ b/build/common/Utilities/ImportUsings.cs
@@ -0,0 +1,2 @@
+// ReSharper disable once RedundantUsingDirective.Global
+global using Constants = Common.Utilities.Constants;
diff --git a/build/docker/Program.cs b/build/docker/Program.cs
index 049fdc4b4a..7ebf0e8edc 100644
--- a/build/docker/Program.cs
+++ b/build/docker/Program.cs
@@ -1,5 +1,3 @@
-global using Constants = Common.Utilities.Constants;
-
 using Docker;
 
 return new CakeHost()
diff --git a/build/docker/docker.csproj b/build/docker/docker.csproj
index 4b1cccd25e..610b2fe633 100644
--- a/build/docker/docker.csproj
+++ b/build/docker/docker.csproj
@@ -6,4 +6,9 @@
     <ItemGroup>
         <ProjectReference Include="..\common\common.csproj" />
     </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\common\Utilities\ImportUsings.cs">
+            <Link>ImportUsings.cs</Link>
+        </Compile>
+    </ItemGroup>
 </Project>
diff --git a/build/docs/Program.cs b/build/docs/Program.cs
index 465b1d4705..1af988484a 100644
--- a/build/docs/Program.cs
+++ b/build/docs/Program.cs
@@ -1,5 +1,3 @@
-global using Constants = Common.Utilities.Constants;
-
 using Docs;
 
 return new CakeHost()
diff --git a/build/docs/docs.csproj b/build/docs/docs.csproj
index 659239e7ea..70c811d7b5 100644
--- a/build/docs/docs.csproj
+++ b/build/docs/docs.csproj
@@ -10,4 +10,9 @@
         <PackageReference Include="Cake.Git" Version="1.1.0" />
         <PackageReference Include="Cake.Wyam" Version="2.2.12" />
     </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\common\Utilities\ImportUsings.cs">
+            <Link>ImportUsings.cs</Link>
+        </Compile>
+    </ItemGroup>
 </Project>
diff --git a/build/publish/Program.cs b/build/publish/Program.cs
index 3a82933bc7..88e92d67e3 100644
--- a/build/publish/Program.cs
+++ b/build/publish/Program.cs
@@ -1,5 +1,3 @@
-global using Constants = Common.Utilities.Constants;
-
 using Publish;
 
 return new CakeHost()
diff --git a/build/publish/publish.csproj b/build/publish/publish.csproj
index 159b4e1cdf..da4a7cdf4d 100644
--- a/build/publish/publish.csproj
+++ b/build/publish/publish.csproj
@@ -6,4 +6,9 @@
     <ItemGroup>
         <ProjectReference Include="..\common\common.csproj"/>
     </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\common\Utilities\ImportUsings.cs">
+            <Link>ImportUsings.cs</Link>
+        </Compile>
+    </ItemGroup>
 </Project>
diff --git a/build/release/Program.cs b/build/release/Program.cs
index a37c705f05..e9ca2d6435 100644
--- a/build/release/Program.cs
+++ b/build/release/Program.cs
@@ -1,5 +1,3 @@
-global using Constants = Common.Utilities.Constants;
-
 using Release;
 
 return new CakeHost()
diff --git a/build/release/release.csproj b/build/release/release.csproj
index 2437998245..23d37bde01 100644
--- a/build/release/release.csproj
+++ b/build/release/release.csproj
@@ -6,4 +6,9 @@
     <ItemGroup>
         <ProjectReference Include="..\common\common.csproj"/>
     </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\common\Utilities\ImportUsings.cs">
+            <Link>ImportUsings.cs</Link>
+        </Compile>
+    </ItemGroup>
 </Project>

From 25920be58b87228414d7fea9c1e27ad9cb57895d Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Sat, 2 Oct 2021 22:10:35 +0200
Subject: [PATCH 13/30] (build) include .net6.0 for build/test/package

---
 .github/workflows/ci.yml                          | 8 ++++----
 build/artifacts/Tasks/ArtifactsDotnetToolTest.cs  | 2 +-
 build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs | 3 ++-
 build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs | 3 ++-
 build/artifacts/Tasks/ArtifactsNativeTest.cs      | 2 +-
 build/artifacts/Tasks/ArtifactsPrepare.cs         | 2 +-
 build/artifacts/Tasks/ArtifactsTest.cs            | 2 +-
 build/build/Tasks/Package/PackagePrepare.cs       | 2 +-
 build/build/Tasks/Test/UnitTest.cs                | 4 ++--
 build/build/Utilities/ContextExtensions.cs        | 2 +-
 build/common/Utilities/Constants.cs               | 4 +++-
 build/docker/Tasks/DockerBuild.cs                 | 2 +-
 build/docker/Tasks/DockerManifest.cs              | 2 +-
 build/docker/Tasks/DockerPublish.cs               | 2 +-
 build/docker/Tasks/DockerTest.cs                  | 2 +-
 tests/integration/core/app.csproj                 | 1 -
 tests/scripts/test-msbuild-task.sh                | 2 +-
 17 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 942eb3979f..8d2f015350 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -122,7 +122,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        targetFramework: [net5.0, netcoreapp3.1]
+        targetFramework: [net5.0, net6.0, netcoreapp3.1]
       fail-fast: false
 
     steps:
@@ -210,7 +210,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        targetFramework: [ '3.1', '5.0' ]
+        targetFramework: [ '3.1', '5.0', '6.0' ]
         distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
       fail-fast: false
 
@@ -264,7 +264,7 @@ jobs:
     -
       name: '[Test Artifacts (amd64)]'
       shell: pwsh
-      run: dotnet run/artifacts.dll --target=ArtifactsTest --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
+      run: dotnet run/artifacts.dll --target=ArtifactsTest --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --verbosity=diagnostic
     -
       name: '[Test Artifacts (arm64)]'
       shell: pwsh
@@ -276,7 +276,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        targetFramework: [ '3.1', '5.0' ]
+        targetFramework: [ '3.1', '5.0', '6.0' ]
         distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
       fail-fast: false
 
diff --git a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs
index abafa60131..dc802c4cc6 100644
--- a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs
+++ b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
 [TaskName(nameof(ArtifactsDotnetToolTest))]
 [TaskDescription("Tests the dotnet global tool in docker container")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [IsDependentOn(typeof(ArtifactsPrepare))]
 public class ArtifactsDotnetToolTest : FrostingTask<BuildContext>
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
index a8362c3c02..28736a3717 100644
--- a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
+++ b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
 [TaskName(nameof(ArtifactsMsBuildCoreTest))]
 [TaskDescription("Tests the msbuild package in docker container")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [IsDependentOn(typeof(ArtifactsPrepare))]
 public class ArtifactsMsBuildCoreTest : FrostingTask<BuildContext>
@@ -37,6 +37,7 @@ public override void Run(BuildContext context)
             {
                 Constants.Version31 => $"netcoreapp{targetFramework}",
                 Constants.Version50 => $"net{targetFramework}",
+                Constants.Version60 => $"net{targetFramework}",
                 _ => targetFramework
             };
 
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
index 37adcfbce3..aef44bb800 100644
--- a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
+++ b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
@@ -23,10 +23,11 @@ public override void Run(BuildContext context)
         var nugetSource = context.MakeAbsolute(Paths.Nuget).FullPath;
 
         context.Information("\nTesting msbuild task with dotnet build (for .net core)\n");
-        var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion50 };
+        var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion50, Constants.NetVersion60 };
         foreach (var framework in frameworks)
         {
             var dotnetCoreMsBuildSettings = new DotNetCoreMSBuildSettings();
+            dotnetCoreMsBuildSettings.WithProperty("TargetFrameworks", framework);
             dotnetCoreMsBuildSettings.WithProperty("TargetFramework", framework);
             dotnetCoreMsBuildSettings.WithProperty("GitVersionMsBuildVersion", version);
             var projPath = context.MakeAbsolute(Paths.Integration.Combine("core"));
diff --git a/build/artifacts/Tasks/ArtifactsNativeTest.cs b/build/artifacts/Tasks/ArtifactsNativeTest.cs
index 5872c14137..c4234b8687 100644
--- a/build/artifacts/Tasks/ArtifactsNativeTest.cs
+++ b/build/artifacts/Tasks/ArtifactsNativeTest.cs
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
 [TaskName(nameof(ArtifactsNativeTest))]
 [TaskDescription("Tests the native executables in docker container")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [IsDependentOn(typeof(ArtifactsPrepare))]
 public class ArtifactsNativeTest : FrostingTask<BuildContext>
diff --git a/build/artifacts/Tasks/ArtifactsPrepare.cs b/build/artifacts/Tasks/ArtifactsPrepare.cs
index 4675bd3b4e..c9075d42da 100644
--- a/build/artifacts/Tasks/ArtifactsPrepare.cs
+++ b/build/artifacts/Tasks/ArtifactsPrepare.cs
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
 [TaskName(nameof(ArtifactsPrepare))]
 [TaskDescription("Pulls the docker images needed for testing the artifacts")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 public class ArtifactsPrepare : FrostingTask<BuildContext>
 {
diff --git a/build/artifacts/Tasks/ArtifactsTest.cs b/build/artifacts/Tasks/ArtifactsTest.cs
index 2f6b178707..36cd154310 100644
--- a/build/artifacts/Tasks/ArtifactsTest.cs
+++ b/build/artifacts/Tasks/ArtifactsTest.cs
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
 [TaskName(nameof(ArtifactsTest))]
 [TaskDescription("Tests packages in docker container")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [IsDependentOn(typeof(ArtifactsNativeTest))]
 [IsDependentOn(typeof(ArtifactsDotnetToolTest))]
diff --git a/build/build/Tasks/Package/PackagePrepare.cs b/build/build/Tasks/Package/PackagePrepare.cs
index c1d4d9552b..649bd73cdf 100644
--- a/build/build/Tasks/Package/PackagePrepare.cs
+++ b/build/build/Tasks/Package/PackagePrepare.cs
@@ -53,7 +53,7 @@ private static DirectoryPath PackPrepareNative(BuildContext context, string runt
 
         var settings = new DotNetCorePublishSettings
         {
-            Framework = Constants.NetVersion50,
+            Framework = Constants.NetVersion60,
             Runtime = runtime,
             NoRestore = false,
             Configuration = context.MsBuildConfiguration,
diff --git a/build/build/Tasks/Test/UnitTest.cs b/build/build/Tasks/Test/UnitTest.cs
index 92c48961f7..bc03227e73 100644
--- a/build/build/Tasks/Test/UnitTest.cs
+++ b/build/build/Tasks/Test/UnitTest.cs
@@ -8,7 +8,7 @@ namespace Build.Tasks;
 
 [TaskName(nameof(UnitTest))]
 [TaskDescription("Run the unit tests")]
-[TaskArgument(Arguments.DotnetTarget, Constants.NetVersion50, Constants.CoreFxVersion31, Constants.FullFxVersion48)]
+[TaskArgument(Arguments.DotnetTarget, Constants.NetVersion50, Constants.NetVersion60, Constants.CoreFxVersion31, Constants.FullFxVersion48)]
 [IsDependentOn(typeof(Build))]
 public class UnitTest : FrostingTask<BuildContext>
 {
@@ -17,7 +17,7 @@ public class UnitTest : FrostingTask<BuildContext>
     public override void Run(BuildContext context)
     {
         var dotnetTarget = context.Argument(Arguments.DotnetTarget, string.Empty);
-        var frameworks = new[] { Constants.CoreFxVersion31, Constants.FullFxVersion48, Constants.NetVersion50 };
+        var frameworks = new[] { Constants.CoreFxVersion31, Constants.FullFxVersion48, Constants.NetVersion50, Constants.NetVersion60 };
         if (!string.IsNullOrWhiteSpace(dotnetTarget))
         {
             if (!frameworks.Contains(dotnetTarget, StringComparer.OrdinalIgnoreCase))
diff --git a/build/build/Utilities/ContextExtensions.cs b/build/build/Utilities/ContextExtensions.cs
index 5b01e383cc..edb9b99846 100644
--- a/build/build/Utilities/ContextExtensions.cs
+++ b/build/build/Utilities/ContextExtensions.cs
@@ -3,5 +3,5 @@ namespace Build.Utilities;
 public static class ContextExtensions
 {
     public static FilePath? GetGitVersionToolLocation(this BuildContext context) =>
-        context.GetFiles($"src/GitVersion.App/bin/{context.MsBuildConfiguration}/{Constants.NetVersion50}/gitversion.dll").SingleOrDefault();
+        context.GetFiles($"src/GitVersion.App/bin/{context.MsBuildConfiguration}/{Constants.NetVersion60}/gitversion.dll").SingleOrDefault();
 }
diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs
index d976f3f656..31b1caae59 100644
--- a/build/common/Utilities/Constants.cs
+++ b/build/common/Utilities/Constants.cs
@@ -5,13 +5,15 @@ public class Constants
     public const string RepoOwner = "GitTools";
     public const string Repository = "GitVersion";
 
+    public const string Version60 = "6.0";
     public const string Version50 = "5.0";
     public const string Version31 = "3.1";
 
     public const string NetVersion50 = "net5.0";
+    public const string NetVersion60 = "net6.0";
     public const string CoreFxVersion31 = "netcoreapp3.1";
     public const string FullFxVersion48 = "net48";
-    public static readonly string[] VersionsToBuild = { Version50, Version31 };
+    public static readonly string[] VersionsToBuild = { Version60, Version50, Version31 };
     public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };
     public static readonly string[] DistrosToSkip = { Alpine312, Alpine313, Alpine314, Centos7 };
 
diff --git a/build/docker/Tasks/DockerBuild.cs b/build/docker/Tasks/DockerBuild.cs
index 88b4f282a7..d4a486fb09 100644
--- a/build/docker/Tasks/DockerBuild.cs
+++ b/build/docker/Tasks/DockerBuild.cs
@@ -5,7 +5,7 @@ namespace Docker.Tasks;
 [TaskName(nameof(DockerBuild))]
 [TaskDescription("Build the docker images containing the GitVersion Tool")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
 public class DockerBuild : FrostingTask<BuildContext>
diff --git a/build/docker/Tasks/DockerManifest.cs b/build/docker/Tasks/DockerManifest.cs
index 9319d4f6b0..4a4e171739 100644
--- a/build/docker/Tasks/DockerManifest.cs
+++ b/build/docker/Tasks/DockerManifest.cs
@@ -5,7 +5,7 @@ namespace Docker.Tasks;
 [TaskName(nameof(DockerManifest))]
 [TaskDescription("Publish the docker manifest containing the images for amd64 and arm64")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [IsDependentOn(typeof(DockerManifestInternal))]
 public class DockerManifest : FrostingTask<BuildContext>
diff --git a/build/docker/Tasks/DockerPublish.cs b/build/docker/Tasks/DockerPublish.cs
index f6c31f1b2c..a065f81729 100644
--- a/build/docker/Tasks/DockerPublish.cs
+++ b/build/docker/Tasks/DockerPublish.cs
@@ -5,7 +5,7 @@ namespace Docker.Tasks;
 [TaskName(nameof(DockerPublish))]
 [TaskDescription("Publish the docker images containing the GitVersion Tool")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
 [IsDependentOn(typeof(DockerPublishInternal))]
diff --git a/build/docker/Tasks/DockerTest.cs b/build/docker/Tasks/DockerTest.cs
index f35696ef47..e06616ea95 100644
--- a/build/docker/Tasks/DockerTest.cs
+++ b/build/docker/Tasks/DockerTest.cs
@@ -5,7 +5,7 @@ namespace Docker.Tasks;
 [TaskName(nameof(DockerTest))]
 [TaskDescription("Test the docker images containing the GitVersion Tool")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
 [IsDependentOn(typeof(DockerBuild))]
diff --git a/tests/integration/core/app.csproj b/tests/integration/core/app.csproj
index 7ad5634605..03d684f328 100644
--- a/tests/integration/core/app.csproj
+++ b/tests/integration/core/app.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <!-- <TargetFrameworks>netcoreapp3.1</TargetFrameworks> -->
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     </PropertyGroup>
 
diff --git a/tests/scripts/test-msbuild-task.sh b/tests/scripts/test-msbuild-task.sh
index ae3fde1c33..9999e37afc 100644
--- a/tests/scripts/test-msbuild-task.sh
+++ b/tests/scripts/test-msbuild-task.sh
@@ -19,7 +19,7 @@ do
     shift
 done
 
-result=$(dotnet build $repoPath --source $nugetPath --source https://api.nuget.org/v3/index.json -p:GitVersionMsBuildVersion=$version -p:TargetFramework=$targetframework) # >/dev/null
+result=$(dotnet build $repoPath --source $nugetPath --source https://api.nuget.org/v3/index.json -p:GitVersionMsBuildVersion=$version -p:TargetFrameworks=$targetframework) # >/dev/null
 status=$?
 if test $status -eq 0
 then

From 74b2c75cf8e961fdbc3675db4695b15355a84ea5 Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Sat, 2 Oct 2021 22:50:42 +0200
Subject: [PATCH 14/30] (cleanup) changed the namespaces to file-scoped

---
 .../Fixtures/BaseGitFlowRepositoryFixture.cs  |   53 +-
 .../Fixtures/EmptyRepositoryFixture.cs        |   23 +-
 .../Fixtures/LocalRepositoryFixture.cs        |   11 +-
 .../Fixtures/RemoteRepositoryFixture.cs       |   71 +-
 .../Fixtures/RepositoryFixtureBase.cs         |  191 ++-
 .../Fixtures/SequenceDiagram.cs               |  203 ++-
 src/GitTools.Testing/Generate.cs              |   33 +-
 src/GitTools.Testing/GitTestExtensions.cs     |  159 +-
 .../Internal/DirectoryHelper.cs               |  121 +-
 src/GitTools.Testing/Internal/PathHelper.cs   |   11 +-
 .../Internal/ProcessHelper.cs                 |  329 ++--
 .../Internal/StringBuilderExtensions.cs       |   17 +-
 src/GitTools.Testing/VirtualTime.cs           |   31 +-
 .../ArgumentParserOnBuildServerTests.cs       |   61 +-
 .../ArgumentParserTests.cs                    | 1331 ++++++++---------
 .../ExecCmdLineArgumentTest.cs                |  169 ++-
 src/GitVersion.App.Tests/HelpWriterTests.cs   |   91 +-
 .../Helpers/ArgumentBuilder.cs                |  113 +-
 .../Helpers/ExecutionResults.cs               |   39 +-
 .../Helpers/GitVersionHelper.cs               |  183 ++-
 .../Helpers/ProgramFixture.cs                 |  133 +-
 .../Helpers/TestConsoleAdapter.cs             |   25 +-
 .../JsonOutputOnBuildServerTest.cs            |   97 +-
 .../PullRequestInBuildAgentTest.cs            |  263 ++--
 .../QuotedStringHelpersTests.cs               |  197 ++-
 .../TagCheckoutInBuildAgentTests.cs           |  101 +-
 .../UpdateWixVersionFileTests.cs              |  119 +-
 .../VersionWriterTests.cs                     |   83 +-
 src/GitVersion.App/ArgumentParser.cs          |  853 ++++++-----
 src/GitVersion.App/Arguments.cs               |  177 ++-
 src/GitVersion.App/GitVersionApp.cs           |   57 +-
 src/GitVersion.App/GitVersionAppModule.cs     |   21 +-
 src/GitVersion.App/GitVersionExecutor.cs      |  289 ++--
 src/GitVersion.App/GlobbingResolver.cs        |   23 +-
 src/GitVersion.App/HelpWriter.cs              |   71 +-
 src/GitVersion.App/IArgumentParser.cs         |   13 +-
 src/GitVersion.App/IGitVersionExecutor.cs     |   11 +-
 src/GitVersion.App/IGlobbingResolver.cs       |   11 +-
 src/GitVersion.App/IHelpWriter.cs             |   13 +-
 src/GitVersion.App/IVersionWriter.cs          |   13 +-
 .../OverrideConfigOptionParser.cs             |  171 ++-
 src/GitVersion.App/Program.cs                 |   55 +-
 src/GitVersion.App/QuotedStringHelpers.cs     |  131 +-
 src/GitVersion.App/VersionWriter.cs           |   41 +-
 .../BuildAgents/AzurePipelinesTests.cs        |  127 +-
 .../BuildAgents/BuildServerBaseTests.cs       |   87 +-
 .../BuildAgents/CodeBuildTests.cs             |  145 +-
 .../BuildAgents/ContinuaCiTests.cs            |   31 +-
 .../BuildAgents/DroneTests.cs                 |  265 ++--
 .../BuildAgents/EnvRunTests.cs                |  109 +-
 .../BuildAgents/GitHubActionsTests.cs         |  282 ++--
 .../BuildAgents/GitLabCiTests.cs              |  119 +-
 .../BuildAgents/JenkinsTests.cs               |  241 ++-
 .../BuildAgents/MyGetTests.cs                 |   61 +-
 .../BuildAgents/SpaceAutomationTests.cs       |  185 ++-
 .../BuildAgents/TeamCityTests.cs              |   51 +-
 .../Configuration/ConfigProviderTests.cs      |  677 +++++----
 .../DefaultConfigFileLocatorTests.cs          |  329 ++--
 .../Configuration/IgnoreConfigTests.cs        |   96 +-
 .../Configuration/Init/InitScenarios.cs       |   45 +-
 .../Core/DynamicRepositoryTests.cs            |  125 +-
 .../Core/GitVersionExecutorTests.cs           |  607 ++++----
 .../Core/GitVersionToolDirectoryTests.cs      |   98 +-
 .../Core/RepositoryExtensionsTests.cs         |   91 +-
 .../Core/RepositoryStoreTests.cs              |  427 +++---
 .../DocumentationTests.cs                     |  133 +-
 .../Extensions/GitToolsTestingExtensions.cs   |  239 ++-
 .../StringFormatWithExtensionTests.cs         |  489 +++---
 .../Helpers/DirectoryHelper.cs                |  119 +-
 .../Helpers/GitVersionContextBuilder.cs       |  153 +-
 .../Helpers/GitVersionCoreTestModule.cs       |   21 +-
 .../Helpers/PathHelper.cs                     |   29 +-
 .../Helpers/RuntimeHelper.cs                  |   21 +-
 src/GitVersion.Core.Tests/Helpers/TestBase.cs |   59 +-
 .../Helpers/TestConsole.cs                    |   39 +-
 .../Helpers/TestEffectiveConfiguration.cs     |   79 +-
 .../Helpers/TestEnvironment.cs                |   17 +-
 .../Helpers/TestFileSystem.cs                 |  175 ++-
 .../Helpers/TestLogAppender.cs                |   15 +-
 .../Helpers/TestStream.cs                     |   87 +-
 .../Helpers/TestableVersionVariables.cs       |   41 +-
 .../BranchWithoutCommitScenarios.cs           |   63 +-
 .../IntegrationTests/DevelopScenarios.cs      |  725 +++++----
 .../IntegrationTests/DocumentationSamples.cs  |  797 +++++-----
 .../FeatureBranchScenarios.cs                 |  759 +++++-----
 .../IntegrationTests/FileSystemTests.cs       |   77 +-
 .../IntegrationTests/HotfixBranchScenarios.cs |  429 +++---
 .../IntegrationTests/IgnoreBeforeScenarios.cs |   41 +-
 .../IntegrationTests/MainScenarios.cs         |  337 +++--
 .../MainlineDevelopmentMode.cs                |  967 ++++++------
 .../IntegrationTests/OtherBranchScenarios.cs  |  127 +-
 .../IntegrationTests/OtherScenarios.cs        |  221 ++-
 .../IntegrationTests/PullRequestScenarios.cs  |  187 ++-
 .../ReleaseBranchScenarios.cs                 | 1247 ++++++++-------
 .../RemoteRepositoryScenarios.cs              |  211 ++-
 .../SupportBranchScenarios.cs                 |  113 +-
 .../SwitchingToGitFlowScenarios.cs            |   27 +-
 .../IntegrationTests/TagCheckoutScenarios.cs  |   89 +-
 .../VersionBumpingScenarios.cs                |  173 ++-
 .../VersionInCurrentBranchNameScenarios.cs    |   97 +-
 .../VersionInMergedBranchNameScenarios.cs     |  115 +-
 .../IntegrationTests/VersionInTagScenarios.cs |  179 ++-
 .../IntegrationTests/WorktreeScenarios.cs     |   42 +-
 .../Logging/LoggerTest.cs                     |   57 +-
 .../Logging/LoggingTests.cs                   |   19 +-
 .../Model/CommitDateTests.cs                  |   45 +-
 .../Model/GitVersionContextTests.cs           |  289 ++--
 .../Model/MergeMessageTests.cs                |  685 +++++----
 .../BaseVersionCalculatorTests.cs             |  377 +++--
 .../JsonVersionBuilderTests.cs                |   51 +-
 .../MinDateVersionFilterTests.cs              |   93 +-
 .../NextVersionCalculatorTests.cs             |  505 ++++---
 .../SemanticVersionTests.cs                   |  465 +++---
 .../ShaVersionFilterTests.cs                  |   93 +-
 ...nfigNextVersionBaseVersionStrategyTests.cs |   65 +-
 .../MergeMessageBaseVersionStrategyTests.cs   |  309 ++--
 ...ionInBranchNameBaseVersionStrategyTests.cs |  151 +-
 .../TestBaseVersionCalculator.cs              |   29 +-
 .../TestMainlineVersionCalculator.cs          |   17 +-
 .../VariableProviderTests.cs                  |  479 +++---
 .../VersionCalculation/VersionSourceTests.cs  |   99 +-
 .../AssemblyFileVersionTests.cs               |   35 +-
 .../AssemblyInfoFileUpdaterTests.cs           |  793 +++++-----
 .../GitVersionInfoGeneratorTests.cs           |   69 +-
 .../InformationalVersionBuilderTests.cs       |   61 +-
 .../ProjectFileUpdaterTests.cs                |  381 +++--
 .../VersionConverters/WixFileTests.cs         |  149 +-
 .../BuildAgents/Abstractions/IBuildAgent.cs   |   21 +-
 .../Abstractions/IBuildAgentResolver.cs       |   11 +-
 src/GitVersion.Core/BuildAgents/AppVeyor.cs   |  107 +-
 .../BuildAgents/AzurePipelines.cs             |   77 +-
 .../BuildAgents/BuildAgentBase.cs             |   81 +-
 .../BuildAgents/BuildAgentResolver.cs         |   51 +-
 .../BuildAgents/BuildServerModule.cs          |   25 +-
 src/GitVersion.Core/BuildAgents/CodeBuild.cs  |   65 +-
 src/GitVersion.Core/BuildAgents/ContinuaCi.cs |   29 +-
 src/GitVersion.Core/BuildAgents/Drone.cs      |   75 +-
 src/GitVersion.Core/BuildAgents/EnvRun.cs     |   51 +-
 .../BuildAgents/GitHubActions.cs              |   81 +-
 src/GitVersion.Core/BuildAgents/GitLabCi.cs   |   47 +-
 src/GitVersion.Core/BuildAgents/Jenkins.cs    |   65 +-
 src/GitVersion.Core/BuildAgents/MyGet.cs      |   55 +-
 .../BuildAgents/SpaceAutomation.cs            |   23 +-
 src/GitVersion.Core/BuildAgents/TeamCity.cs   |   55 +-
 src/GitVersion.Core/BuildAgents/TravisCI.cs   |   32 +-
 .../IBranchConfigurationCalculator.cs         |   17 +-
 .../Abstractions/IConfigFileLocator.cs        |   23 +-
 .../Abstractions/IConfigProvider.cs           |   15 +-
 .../BranchConfigurationCalculator.cs          |  377 +++--
 .../Configuration/ConfigExtensions.cs         |  243 ++-
 .../Configuration/ConfigFileLocator.cs        |  139 +-
 .../Configuration/ConfigProvider.cs           |  101 +-
 .../Configuration/ConfigSerializer.cs         |   37 +-
 .../Configuration/ConfigurationBuilder.cs     |  467 +++---
 .../Configuration/ConfigurationModule.cs      |   19 +-
 .../Init/BuildServer/AppVeyorSetup.cs         |  153 +-
 .../Init/BuildServer/AppveyorPublicPrivate.cs |   45 +-
 .../Init/BuildServer/SetupBuildScripts.cs     |   39 +-
 .../Configuration/Init/EditConfigStep.cs      |   73 +-
 .../Init/GitVersionInitModule.cs              |   23 +-
 .../AssemblyVersioningSchemeSetting.cs        |   77 +-
 .../Init/SetConfig/ConfigureBranch.cs         |   63 +-
 .../Init/SetConfig/ConfigureBranches.cs       |   77 +-
 .../Init/SetConfig/GlobalModeSetting.cs       |   77 +-
 .../Init/SetConfig/SetBranchIncrementMode.cs  |   69 +-
 .../Init/SetConfig/SetBranchTag.cs            |   71 +-
 .../Configuration/Init/SetNextVersion.cs      |   39 +-
 .../Configuration/Init/StepResult.cs          |   47 +-
 .../Init/Wizard/ConfigInitStepFactory.cs      |   21 +-
 .../Init/Wizard/ConfigInitWizard.cs           |   45 +-
 .../Init/Wizard/ConfigInitWizardStep.cs       |  107 +-
 .../Init/Wizard/FinishedSetupStep.cs          |   15 +-
 .../Init/Wizard/GitFlowSetupStep.cs           |   17 +-
 .../Init/Wizard/GitHubFlowStep.cs             |   15 +-
 .../Init/Wizard/IConfigInitStepFactory.cs     |   11 +-
 .../Init/Wizard/IConfigInitWizard.cs          |   11 +-
 .../Init/Wizard/PickBranchingStrategy1Step.cs |   43 +-
 .../Init/Wizard/PickBranchingStrategy2Step.cs |   53 +-
 .../Init/Wizard/PickBranchingStrategy3Step.cs |   55 +-
 .../Init/Wizard/PickBranchingStrategyStep.cs  |   53 +-
 .../Core/Abstractions/IEnvironment.cs         |   13 +-
 .../Core/Abstractions/IFileSystem.cs          |   37 +-
 .../Core/Abstractions/IGitPreparer.cs         |   13 +-
 .../Abstractions/IGitVersionCalculateTool.cs  |   11 +-
 .../Abstractions/IGitVersionContextFactory.cs |   11 +-
 .../Core/Abstractions/IGitVersionModule.cs    |   11 +-
 .../Abstractions/IGitVersionOutputTool.cs     |   17 +-
 .../Core/Abstractions/IRepositoryStore.cs     |   71 +-
 src/GitVersion.Core/Core/Environment.cs       |   13 +-
 src/GitVersion.Core/Core/FileSystem.cs        |   71 +-
 src/GitVersion.Core/Core/GitPreparer.cs       |  583 ++++----
 .../Core/GitVersionCalculateTool.cs           |   93 +-
 .../Core/GitVersionContextFactory.cs          |   65 +-
 src/GitVersion.Core/Core/GitVersionModule.cs  |   19 +-
 .../Core/GitVersionOutputTool.cs              |  113 +-
 src/GitVersion.Core/Core/RepositoryStore.cs   |  737 +++++----
 .../AssemblyVersionsGeneratorExtensions.cs    |   81 +-
 .../Extensions/DictionaryExtensions.cs        |   23 +-
 .../Extensions/EnumerableExtensions.cs        |   37 +-
 .../Extensions/GitExtensions.cs               |   67 +-
 .../Extensions/NullableAttributes.cs          |  242 ++-
 .../Extensions/ObjectExtensions.cs            |   41 +-
 .../ReadEmbeddedResourceExtensions.cs         |   39 +-
 .../Extensions/ServiceCollectionExtensions.cs |   21 +-
 .../Extensions/StringExtensions.cs            |  143 +-
 src/GitVersion.Core/Git/CommitFilter.cs       |   73 +-
 src/GitVersion.Core/Git/IBranch.cs            |   20 +-
 src/GitVersion.Core/Git/IBranchCollection.cs  |   15 +-
 src/GitVersion.Core/Git/ICommit.cs            |   15 +-
 src/GitVersion.Core/Git/ICommitCollection.cs  |   13 +-
 src/GitVersion.Core/Git/IGitObject.cs         |   13 +-
 src/GitVersion.Core/Git/IGitRepository.cs     |   31 +-
 src/GitVersion.Core/Git/IGitRepositoryInfo.cs |   17 +-
 .../Git/IMutatingGitRepository.cs             |   17 +-
 src/GitVersion.Core/Git/INamedReference.cs    |   11 +-
 src/GitVersion.Core/Git/IObjectId.cs          |   13 +-
 src/GitVersion.Core/Git/IRefSpec.cs           |   17 +-
 src/GitVersion.Core/Git/IRefSpecCollection.cs |    9 +-
 src/GitVersion.Core/Git/IReference.cs         |   13 +-
 .../Git/IReferenceCollection.cs               |   20 +-
 src/GitVersion.Core/Git/IRemote.cs            |   19 +-
 src/GitVersion.Core/Git/IRemoteCollection.cs  |   15 +-
 src/GitVersion.Core/Git/ITag.cs               |   13 +-
 src/GitVersion.Core/Git/ITagCollection.cs     |    9 +-
 src/GitVersion.Core/Git/RefSpecDirection.cs   |   13 +-
 src/GitVersion.Core/Git/ReferenceName.cs      |  129 +-
 src/GitVersion.Core/GitVersionCoreModule.cs   |   53 +-
 src/GitVersion.Core/Helpers/EncodingHelper.cs |  157 +-
 .../Helpers/LambdaEqualityHelper.cs           |   80 +-
 .../Helpers/LambdaKeyComparer.cs              |   49 +-
 src/GitVersion.Core/Helpers/ProcessHelper.cs  |  339 +++--
 src/GitVersion.Core/Helpers/RetryAction.cs    |  101 +-
 .../Helpers/ServiceMessageEscapeHelper.cs     |   33 +-
 .../Helpers/StringComparerUtils.cs            |   15 +-
 .../Helpers/StringFormatWith.cs               |  125 +-
 .../Logging/Abstractions/IConsole.cs          |   19 +-
 .../Logging/Abstractions/ILog.cs              |   17 +-
 .../Logging/Abstractions/ILogAppender.cs      |   11 +-
 src/GitVersion.Core/Logging/ConsoleAdapter.cs |   27 +-
 .../Logging/ConsoleAppender.cs                |   91 +-
 src/GitVersion.Core/Logging/Disposable.cs     |   31 +-
 src/GitVersion.Core/Logging/FileAppender.cs   |   53 +-
 src/GitVersion.Core/Logging/Log.cs            |   95 +-
 src/GitVersion.Core/Logging/LogAction.cs      |    9 +-
 src/GitVersion.Core/Logging/LogExtensions.cs  |  159 +-
 src/GitVersion.Core/Logging/LogLevel.cs       |   21 +-
 src/GitVersion.Core/Logging/NullLog.cs        |   27 +-
 src/GitVersion.Core/Logging/Verbosity.cs      |   19 +-
 src/GitVersion.Core/Model/AssemblyInfoData.cs |   17 +-
 .../Model/AuthenticationInfo.cs               |   15 +-
 src/GitVersion.Core/Model/BranchCommit.cs     |   49 +-
 src/GitVersion.Core/Model/ConfigInfo.cs       |   15 +-
 .../Model/Configuration/BranchConfig.cs       |  235 ++-
 .../Model/Configuration/Config.cs             |  223 ++-
 .../Configuration/EffectiveConfiguration.cs   |  249 ++-
 .../Model/Configuration/IgnoreConfig.cs       |   33 +-
 .../Model/Exceptions/BugException.cs          |   11 +-
 .../Exceptions/ConfigurationException.cs      |   15 +-
 .../Model/Exceptions/GitToolsException.cs     |   23 +-
 .../Model/Exceptions/GitVersionException.cs   |   23 +-
 .../Model/Exceptions/LockedFileException.cs   |   11 +-
 .../Model/Exceptions/WarningException.cs      |   15 +-
 src/GitVersion.Core/Model/FileWriteInfo.cs    |   25 +-
 .../Model/GitVersionCacheKey.cs               |   21 +-
 .../Model/GitVersionContext.cs                |   55 +-
 .../Model/GitVersionOptions.cs                |   41 +-
 src/GitVersion.Core/Model/MergeMessage.cs     |  139 +-
 src/GitVersion.Core/Model/OutputType.cs       |   15 +-
 src/GitVersion.Core/Model/RepositoryInfo.cs   |   17 +-
 src/GitVersion.Core/Model/Settings.cs         |   17 +-
 src/GitVersion.Core/Model/VersionVariables.cs |  387 +++--
 .../Model/VersionVariablesJsonModel.cs        |  141 +-
 .../VersionVariablesJsonNumberConverter.cs    |   73 +-
 .../VersionVariablesJsonStringConverter.cs    |   49 +-
 src/GitVersion.Core/Model/WixInfo.cs          |   11 +-
 .../Abstractions/IBaseVersionCalculator.cs    |   11 +-
 .../Abstractions/IIncrementStrategyFinder.cs  |   13 +-
 .../IMainlineVersionCalculator.cs             |   13 +-
 .../Abstractions/INextVersionCalculator.cs    |   11 +-
 .../Abstractions/IVariableProvider.cs         |   11 +-
 .../Abstractions/IVersionFilter.cs            |   11 +-
 .../Abstractions/IVersionStrategy.cs          |   23 +-
 .../BaseVersionCalculator.cs                  |  229 ++-
 .../BaseVersionCalculators/BaseVersion.cs     |   41 +-
 .../ConfigNextVersionVersionStrategy.cs       |   37 +-
 .../FallbackVersionStrategy.cs                |   39 +-
 .../MergeMessageVersionStrategy.cs            |   99 +-
 .../TaggedCommitVersionStrategy.cs            |   91 +-
 .../TrackReleaseBranchesVersionStrategy.cs    |  153 +-
 .../VersionInBranchNameVersionStrategy.cs     |   83 +-
 .../VersionStrategyBase.cs                    |   17 +-
 .../VersionStrategyModule.cs                  |   19 +-
 .../Cache/GitVersionCache.cs                  |  139 +-
 .../Cache/GitVersionCacheKeyFactory.cs        |  315 ++--
 .../Cache/IGitVersionCache.cs                 |   15 +-
 .../Cache/IGitVersionCacheKeyFactory.cs       |   11 +-
 .../CommitMessageIncrementMode.cs             |   15 +-
 .../VersionCalculation/IncrementStrategy.cs   |   47 +-
 .../IncrementStrategyFinder.cs                |  261 ++--
 .../MainlineVersionCalculator.cs              |  437 +++---
 .../MinDateVersionFilter.cs                   |   35 +-
 .../NextVersionCalculator.cs                  |  229 ++-
 .../SemanticVersioning/SemanticVersion.cs     |  497 +++---
 .../SemanticVersionBuildMetaData.cs           |  241 ++-
 .../SemanticVersionExtensions.cs              |   21 +-
 .../SemanticVersionFormatValues.cs            |  111 +-
 .../SemanticVersionPreReleaseTag.cs           |  253 ++--
 .../VersionCalculation/ShaVersionFilter.cs    |   35 +-
 .../VersionCalculation/VariableProvider.cs    |  241 ++-
 .../VersionCalculationModule.cs               |   23 +-
 .../VersionCalculation/VersioningMode.cs      |   15 +-
 .../AssemblyInfo/AssemblyInfoContext.cs       |   25 +-
 .../AssemblyInfo/AssemblyInfoFileUpdater.cs   |  313 ++--
 .../AssemblyInfo/ProjectFileUpdater.cs        |  307 ++--
 .../GitVersionInfo/GitVersionInfoContext.cs   |   25 +-
 .../GitVersionInfo/GitVersionInfoGenerator.cs |   85 +-
 .../VersionConverters/IConverterContext.cs    |   11 +-
 .../VersionConverters/IVersionConverter.cs    |   11 +-
 .../OutputGenerator/OutputContext.cs          |   25 +-
 .../OutputGenerator/OutputGenerator.cs        |   85 +-
 .../VersionConverters/TemplateManager.cs      |  105 +-
 .../VersionConvertersModule.cs                |   21 +-
 .../WixUpdater/WixVersionContext.cs           |   15 +-
 .../WixUpdater/WixVersionFileUpdater.cs       |   81 +-
 src/GitVersion.LibGit2Sharp/Git/Branch.cs     |   61 +-
 .../Git/BranchCollection.cs                   |   37 +-
 src/GitVersion.LibGit2Sharp/Git/Commit.cs     |   45 +-
 .../Git/CommitCollection.cs                   |   57 +-
 src/GitVersion.LibGit2Sharp/Git/GitObject.cs  |   37 +-
 .../Git/GitRepository.cs                      |  363 +++--
 .../Git/GitRepositoryInfo.cs                  |  167 +--
 src/GitVersion.LibGit2Sharp/Git/ObjectId.cs   |   39 +-
 src/GitVersion.LibGit2Sharp/Git/RefSpec.cs    |   35 +-
 .../Git/RefSpecCollection.cs                  |   17 +-
 .../Git/ReferenceCollection.cs                |   37 +-
 src/GitVersion.LibGit2Sharp/Git/Remote.cs     |   51 +-
 .../Git/RemoteCollection.cs                   |   33 +-
 src/GitVersion.LibGit2Sharp/Git/Tag.cs        |   53 +-
 .../Git/TagCollection.cs                      |   17 +-
 .../GitVersionLibGit2SharpModule.cs           |   17 +-
 .../RepositoryExtensions.cs                   |   51 +-
 .../FileHelperTests.cs                        |   67 +-
 .../Helpers/EventArgsFormatting.cs            |  447 +++---
 .../Helpers/GitToolsTestingExtensions.cs      |   57 +-
 .../Helpers/MsBuildExeFixture.cs              |   93 +-
 .../Helpers/MsBuildExeFixtureResult.cs        |   21 +-
 .../Helpers/MsBuildTaskFixture.cs             |  113 +-
 .../Helpers/MsBuildTaskFixtureResult.cs       |   27 +-
 .../InvalidFileCheckerTests.cs                |  249 ++-
 .../Mocks/MockEngine.cs                       |  191 ++-
 .../Mocks/MockTaskItem.cs                     |   25 +-
 .../GenerateGitVersionInformationTest.cs      |  235 ++-
 .../Tasks/GetVersionTaskTests.cs              |  211 ++-
 .../Tasks/TestTaskBase.cs                     |  187 ++-
 .../Tasks/UpdateAssemblyInfoTaskTest.cs       |  205 ++-
 .../Tasks/WriteVersionInfoTest.cs             |  211 ++-
 src/GitVersion.MsBuild/GitVersionTaskBase.cs  |   27 +-
 .../GitVersionTaskExecutor.cs                 |   99 +-
 .../GitVersionTaskModule.cs                   |   39 +-
 src/GitVersion.MsBuild/GitVersionTasks.cs     |  111 +-
 src/GitVersion.MsBuild/Helpers/FileHelper.cs  |  191 ++-
 .../Helpers/MsBuildAdapter.cs                 |   39 +-
 .../Helpers/MsBuildAppender.cs                |   67 +-
 .../IGitVersionTaskExecutor.cs                |   17 +-
 .../Tasks/GenerateGitVersionInformation.cs    |   27 +-
 src/GitVersion.MsBuild/Tasks/GetVersion.cs    |  143 +-
 .../Tasks/UpdateAssemblyInfo.cs               |   31 +-
 .../Tasks/WriteVersionInfoToBuildLog.cs       |   11 +-
 368 files changed, 21752 insertions(+), 22129 deletions(-)

diff --git a/src/GitTools.Testing/Fixtures/BaseGitFlowRepositoryFixture.cs b/src/GitTools.Testing/Fixtures/BaseGitFlowRepositoryFixture.cs
index 8048cceef9..d746ab4833 100644
--- a/src/GitTools.Testing/Fixtures/BaseGitFlowRepositoryFixture.cs
+++ b/src/GitTools.Testing/Fixtures/BaseGitFlowRepositoryFixture.cs
@@ -2,40 +2,39 @@
 using System.IO;
 using LibGit2Sharp;
 
-namespace GitTools.Testing
+namespace GitTools.Testing;
+
+/// <summary>
+/// Creates a repo with a develop branch off main which is a single commit ahead of main
+/// </summary>
+public class BaseGitFlowRepositoryFixture : EmptyRepositoryFixture
 {
     /// <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 class BaseGitFlowRepositoryFixture : EmptyRepositoryFixture
+    public BaseGitFlowRepositoryFixture(string initialVersion) :
+        this(r => r.MakeATaggedCommit(initialVersion))
     {
-        /// <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) :
-            this(r => r.MakeATaggedCommit(initialVersion))
-        {
-        }
+    }
 
-        /// <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) => SetupRepo(initialMainAction);
+    /// <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) => SetupRepo(initialMainAction);
 
-        private void SetupRepo(Action<IRepository> initialMainAction)
-        {
-            var randomFile = Path.Combine(Repository.Info.WorkingDirectory, Guid.NewGuid().ToString());
-            File.WriteAllText(randomFile, string.Empty);
-            Commands.Stage(Repository, randomFile);
+    private void SetupRepo(Action<IRepository> initialMainAction)
+    {
+        var randomFile = Path.Combine(Repository.Info.WorkingDirectory, Guid.NewGuid().ToString());
+        File.WriteAllText(randomFile, string.Empty);
+        Commands.Stage(Repository, randomFile);
 
-            initialMainAction(Repository);
+        initialMainAction(Repository);
 
-            Commands.Checkout(Repository, Repository.CreateBranch("develop"));
-            Repository.MakeACommit();
-        }
+        Commands.Checkout(Repository, Repository.CreateBranch("develop"));
+        Repository.MakeACommit();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitTools.Testing/Fixtures/EmptyRepositoryFixture.cs b/src/GitTools.Testing/Fixtures/EmptyRepositoryFixture.cs
index ffbf435083..8bdfd54223 100644
--- a/src/GitTools.Testing/Fixtures/EmptyRepositoryFixture.cs
+++ b/src/GitTools.Testing/Fixtures/EmptyRepositoryFixture.cs
@@ -1,20 +1,19 @@
 using System;
 using LibGit2Sharp;
 
-namespace GitTools.Testing
+namespace GitTools.Testing;
+
+public class EmptyRepositoryFixture : RepositoryFixtureBase
 {
-    public class EmptyRepositoryFixture : RepositoryFixtureBase
+    public EmptyRepositoryFixture() : base(CreateNewRepository)
     {
-        public EmptyRepositoryFixture() : base(CreateNewRepository)
-        {
-        }
+    }
 
-        private static IRepository CreateNewRepository(string path)
-        {
-            Init(path);
-            Console.WriteLine("Created git repository at '{0}'", path);
+    private static IRepository CreateNewRepository(string path)
+    {
+        Init(path);
+        Console.WriteLine("Created git repository at '{0}'", path);
 
-            return new Repository(path);
-        }
+        return new Repository(path);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitTools.Testing/Fixtures/LocalRepositoryFixture.cs b/src/GitTools.Testing/Fixtures/LocalRepositoryFixture.cs
index 578a001d94..2e08899b43 100644
--- a/src/GitTools.Testing/Fixtures/LocalRepositoryFixture.cs
+++ b/src/GitTools.Testing/Fixtures/LocalRepositoryFixture.cs
@@ -1,11 +1,10 @@
 using LibGit2Sharp;
 
-namespace GitTools.Testing
+namespace GitTools.Testing;
+
+public class LocalRepositoryFixture : RepositoryFixtureBase
 {
-    public class LocalRepositoryFixture : RepositoryFixtureBase
+    public LocalRepositoryFixture(IRepository repository) : base(repository)
     {
-        public LocalRepositoryFixture(IRepository repository) : base(repository)
-        {
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitTools.Testing/Fixtures/RemoteRepositoryFixture.cs b/src/GitTools.Testing/Fixtures/RemoteRepositoryFixture.cs
index 9e0fae0e8a..65bdbcb8b3 100644
--- a/src/GitTools.Testing/Fixtures/RemoteRepositoryFixture.cs
+++ b/src/GitTools.Testing/Fixtures/RemoteRepositoryFixture.cs
@@ -1,50 +1,49 @@
 using System;
 using LibGit2Sharp;
 
-namespace GitTools.Testing
+namespace GitTools.Testing;
+
+/// <summary>
+///     Creates a remote repository then clones it
+///     Remote = Repository
+///     Local  = LocalRepositoryFixture
+/// </summary>
+public class RemoteRepositoryFixture : RepositoryFixtureBase
 {
+    public RemoteRepositoryFixture(Func<string, IRepository> builder)
+        : base(builder) => CreateLocalRepository();
+
+    public RemoteRepositoryFixture() : this(CreateNewRepository)
+    {
+    }
+
     /// <summary>
-    ///     Creates a remote repository then clones it
-    ///     Remote = Repository
-    ///     Local  = LocalRepositoryFixture
+    ///     Fixture pointing at the local repository
     /// </summary>
-    public class RemoteRepositoryFixture : RepositoryFixtureBase
+    public LocalRepositoryFixture LocalRepositoryFixture { get; private set; }
+
+    private static IRepository CreateNewRepository(string path)
     {
-        public RemoteRepositoryFixture(Func<string, IRepository> builder)
-            : base(builder) => CreateLocalRepository();
+        Init(path);
+        Console.WriteLine("Created git repository at '{0}'", path);
 
-        public RemoteRepositoryFixture() : this(CreateNewRepository)
-        {
-        }
+        var repo = new Repository(path);
+        repo.MakeCommits(5);
+        return repo;
+    }
 
-        /// <summary>
-        ///     Fixture pointing at the local repository
-        /// </summary>
-        public LocalRepositoryFixture LocalRepositoryFixture { get; private set; }
+    private void CreateLocalRepository() => LocalRepositoryFixture = CloneRepository();
 
-        private static IRepository CreateNewRepository(string path)
+    /// <summary>
+    ///     Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+    /// </summary>
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing)
         {
-            Init(path);
-            Console.WriteLine("Created git repository at '{0}'", path);
-
-            var repo = new Repository(path);
-            repo.MakeCommits(5);
-            return repo;
+            LocalRepositoryFixture.Dispose();
         }
 
-        private void CreateLocalRepository() => LocalRepositoryFixture = CloneRepository();
-
-        /// <summary>
-        ///     Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                LocalRepositoryFixture.Dispose();
-            }
-
-            base.Dispose(disposing);
-        }
+        base.Dispose(disposing);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitTools.Testing/Fixtures/RepositoryFixtureBase.cs b/src/GitTools.Testing/Fixtures/RepositoryFixtureBase.cs
index ec35c22240..07c6ba805a 100644
--- a/src/GitTools.Testing/Fixtures/RepositoryFixtureBase.cs
+++ b/src/GitTools.Testing/Fixtures/RepositoryFixtureBase.cs
@@ -2,122 +2,121 @@
 using GitTools.Testing.Internal;
 using LibGit2Sharp;
 
-namespace GitTools.Testing
+namespace GitTools.Testing;
+
+/// <summary>
+///     Fixture abstracting a git repository
+/// </summary>
+public abstract class RepositoryFixtureBase : IDisposable
 {
-    /// <summary>
-    ///     Fixture abstracting a git repository
-    /// </summary>
-    public abstract class RepositoryFixtureBase : IDisposable
+    private readonly SequenceDiagram sequenceDiagram;
+
+    protected RepositoryFixtureBase(Func<string, IRepository> repoBuilder)
+        : this(repoBuilder(PathHelper.GetTempPath()))
     {
-        private readonly SequenceDiagram sequenceDiagram;
+    }
 
-        protected RepositoryFixtureBase(Func<string, IRepository> repoBuilder)
-            : this(repoBuilder(PathHelper.GetTempPath()))
-        {
-        }
+    protected RepositoryFixtureBase(IRepository repository)
+    {
+        this.sequenceDiagram = new SequenceDiagram();
+        Repository = repository;
+        Repository.Config.Set("user.name", "Test");
+        Repository.Config.Set("user.email", "test@email.com");
+    }
 
-        protected RepositoryFixtureBase(IRepository repository)
-        {
-            this.sequenceDiagram = new SequenceDiagram();
-            Repository = repository;
-            Repository.Config.Set("user.name", "Test");
-            Repository.Config.Set("user.email", "test@email.com");
-        }
+    public IRepository Repository { get; }
 
-        public IRepository Repository { get; }
+    public string RepositoryPath => Repository.Info.WorkingDirectory.TrimEnd('\\');
 
-        public string RepositoryPath => Repository.Info.WorkingDirectory.TrimEnd('\\');
+    public SequenceDiagram SequenceDiagram => this.sequenceDiagram;
 
-        public SequenceDiagram SequenceDiagram => this.sequenceDiagram;
+    /// <summary>
+    ///     Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+    /// </summary>
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 
-        /// <summary>
-        ///     Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!disposing)
         {
-            Dispose(true);
-            GC.SuppressFinalize(this);
+            return;
         }
 
-        protected virtual void Dispose(bool disposing)
+        Repository.Dispose();
+
+        try
         {
-            if (!disposing)
-            {
-                return;
-            }
-
-            Repository.Dispose();
-
-            try
-            {
-                DirectoryHelper.DeleteDirectory(RepositoryPath);
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine("Failed to clean up repository path at {0}. Received exception: {1}", RepositoryPath,
-                    e.Message);
-            }
-
-            this.sequenceDiagram.End();
-            Console.WriteLine("**Visualisation of test:**");
-            Console.WriteLine(string.Empty);
-            Console.WriteLine(this.sequenceDiagram.GetDiagram());
+            DirectoryHelper.DeleteDirectory(RepositoryPath);
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine("Failed to clean up repository path at {0}. Received exception: {1}", RepositoryPath,
+                e.Message);
         }
 
-        public void Checkout(string branch) => Commands.Checkout(Repository, branch);
+        this.sequenceDiagram.End();
+        Console.WriteLine("**Visualisation of test:**");
+        Console.WriteLine(string.Empty);
+        Console.WriteLine(this.sequenceDiagram.GetDiagram());
+    }
 
-        public static void Init(string path) => GitTestExtensions.ExecuteGitCmd($"init {path} -b main");
+    public void Checkout(string branch) => Commands.Checkout(Repository, branch);
 
-        public void MakeATaggedCommit(string tag)
-        {
-            MakeACommit();
-            ApplyTag(tag);
-        }
+    public static void Init(string path) => GitTestExtensions.ExecuteGitCmd($"init {path} -b main");
 
-        public void ApplyTag(string tag)
-        {
-            this.sequenceDiagram.ApplyTag(tag, Repository.Head.FriendlyName);
-            Repository.ApplyTag(tag);
-        }
+    public void MakeATaggedCommit(string tag)
+    {
+        MakeACommit();
+        ApplyTag(tag);
+    }
 
-        public void BranchTo(string branchName, string @as = null)
-        {
-            this.sequenceDiagram.BranchTo(branchName, Repository.Head.FriendlyName, @as);
-            var branch = Repository.CreateBranch(branchName);
-            Commands.Checkout(Repository, branch);
-        }
+    public void ApplyTag(string tag)
+    {
+        this.sequenceDiagram.ApplyTag(tag, Repository.Head.FriendlyName);
+        Repository.ApplyTag(tag);
+    }
 
-        public void BranchToFromTag(string branchName, string fromTag, string onBranch, string @as = null)
-        {
-            this.sequenceDiagram.BranchToFromTag(branchName, fromTag, onBranch, @as);
-            var branch = Repository.CreateBranch(branchName);
-            Commands.Checkout(Repository, branch);
-        }
+    public void BranchTo(string branchName, string @as = null)
+    {
+        this.sequenceDiagram.BranchTo(branchName, Repository.Head.FriendlyName, @as);
+        var branch = Repository.CreateBranch(branchName);
+        Commands.Checkout(Repository, branch);
+    }
 
-        public void MakeACommit()
-        {
-            var to = Repository.Head.FriendlyName;
-            this.sequenceDiagram.MakeACommit(to);
-            Repository.MakeACommit();
-        }
+    public void BranchToFromTag(string branchName, string fromTag, string onBranch, string @as = null)
+    {
+        this.sequenceDiagram.BranchToFromTag(branchName, fromTag, onBranch, @as);
+        var branch = Repository.CreateBranch(branchName);
+        Commands.Checkout(Repository, branch);
+    }
 
-        /// <summary>
-        ///     Merges (no-ff) specified branch into the current HEAD of this repository
-        /// </summary>
-        public void MergeNoFF(string mergeSource)
-        {
-            this.sequenceDiagram.Merge(mergeSource, Repository.Head.FriendlyName);
-            Repository.MergeNoFF(mergeSource, Generate.SignatureNow());
-        }
+    public void MakeACommit()
+    {
+        var to = Repository.Head.FriendlyName;
+        this.sequenceDiagram.MakeACommit(to);
+        Repository.MakeACommit();
+    }
 
-        /// <summary>
-        ///     Clones the repository managed by this fixture into another LocalRepositoryFixture
-        /// </summary>
-        public LocalRepositoryFixture CloneRepository()
-        {
-            var localPath = PathHelper.GetTempPath();
-            LibGit2Sharp.Repository.Clone(RepositoryPath, localPath);
-            return new LocalRepositoryFixture(new Repository(localPath));
-        }
+    /// <summary>
+    ///     Merges (no-ff) specified branch into the current HEAD of this repository
+    /// </summary>
+    public void MergeNoFF(string mergeSource)
+    {
+        this.sequenceDiagram.Merge(mergeSource, Repository.Head.FriendlyName);
+        Repository.MergeNoFF(mergeSource, Generate.SignatureNow());
+    }
+
+    /// <summary>
+    ///     Clones the repository managed by this fixture into another LocalRepositoryFixture
+    /// </summary>
+    public LocalRepositoryFixture CloneRepository()
+    {
+        var localPath = PathHelper.GetTempPath();
+        LibGit2Sharp.Repository.Clone(RepositoryPath, localPath);
+        return new LocalRepositoryFixture(new Repository(localPath));
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitTools.Testing/Fixtures/SequenceDiagram.cs b/src/GitTools.Testing/Fixtures/SequenceDiagram.cs
index 0a263f1c2f..dde1ace814 100644
--- a/src/GitTools.Testing/Fixtures/SequenceDiagram.cs
+++ b/src/GitTools.Testing/Fixtures/SequenceDiagram.cs
@@ -2,127 +2,126 @@
 using System.Text;
 using GitTools.Testing.Internal;
 
-namespace GitTools.Testing
+namespace GitTools.Testing;
+
+/// <summary>
+/// Creates an abstraction over a PlantUML Sequence diagram to draw a sequence diagram of a git repository being created
+/// </summary>
+public class SequenceDiagram
 {
+    private readonly Dictionary<string, string> participants = new();
+    private readonly StringBuilder diagramBuilder;
+
     /// <summary>
-    /// Creates an abstraction over a PlantUML Sequence diagram to draw a sequence diagram of a git repository being created
+    /// Initializes a new instance of the <see cref="T:SequenceDiagram"/> class.
     /// </summary>
-    public class SequenceDiagram
+    public SequenceDiagram()
     {
-        private readonly Dictionary<string, string> participants = new();
-        private readonly StringBuilder diagramBuilder;
+        this.diagramBuilder = new StringBuilder();
+        this.diagramBuilder.AppendLine("@startuml");
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="T:SequenceDiagram"/> class.
-        /// </summary>
-        public SequenceDiagram()
-        {
-            this.diagramBuilder = new StringBuilder();
-            this.diagramBuilder.AppendLine("@startuml");
-        }
+    /// <summary>
+    /// Activates a branch/participant in the sequence diagram
+    /// </summary>
+    public void Activate(string branch) => this.diagramBuilder.AppendLineFormat("activate {0}", GetParticipant(branch));
 
-        /// <summary>
-        /// Activates a branch/participant in the sequence diagram
-        /// </summary>
-        public void Activate(string branch) => this.diagramBuilder.AppendLineFormat("activate {0}", GetParticipant(branch));
+    /// <summary>
+    /// Destroys a branch/participant in the sequence diagram
+    /// </summary>
+    public void Destroy(string branch) => this.diagramBuilder.AppendLineFormat("destroy {0}", GetParticipant(branch));
 
-        /// <summary>
-        /// Destroys a branch/participant in the sequence diagram
-        /// </summary>
-        public void Destroy(string branch) => this.diagramBuilder.AppendLineFormat("destroy {0}", GetParticipant(branch));
+    /// <summary>
+    /// Creates a participant in the sequence diagram
+    /// </summary>
+    public void Participant(string participant, string @as = null)
+    {
+        this.participants.Add(participant, @as ?? participant);
+        if (@as == null)
+            this.diagramBuilder.AppendLineFormat("participant {0}", participant);
+        else
+            this.diagramBuilder.AppendLineFormat("participant \"{0}\" as {1}", participant, @as);
+    }
 
-        /// <summary>
-        /// Creates a participant in the sequence diagram
-        /// </summary>
-        public void Participant(string participant, string @as = null)
-        {
-            this.participants.Add(participant, @as ?? participant);
-            if (@as == null)
-                this.diagramBuilder.AppendLineFormat("participant {0}", participant);
-            else
-                this.diagramBuilder.AppendLineFormat("participant \"{0}\" as {1}", participant, @as);
-        }
+    /// <summary>
+    /// Appends a divider with specified text to the sequence diagram
+    /// </summary>
+    public void Divider(string text) => this.diagramBuilder.AppendLineFormat("== {0} ==", text);
 
-        /// <summary>
-        /// Appends a divider with specified text to the sequence diagram
-        /// </summary>
-        public void Divider(string text) => this.diagramBuilder.AppendLineFormat("== {0} ==", text);
-
-        /// <summary>
-        /// Appends a note over one or many participants to the sequence diagram
-        /// </summary>
-        public void NoteOver(string noteText, string startParticipant, string endParticipant = null, string prefix = null, string color = null) =>
-            this.diagramBuilder.AppendLineFormat(
-                prefix + @"note over {0}{1}{2}
+    /// <summary>
+    /// Appends a note over one or many participants to the sequence diagram
+    /// </summary>
+    public void NoteOver(string noteText, string startParticipant, string endParticipant = null, string prefix = null, string color = null) =>
+        this.diagramBuilder.AppendLineFormat(
+            prefix + @"note over {0}{1}{2}
   {3}
 end note",
-                GetParticipant(startParticipant),
-                endParticipant == null ? null : ", " + GetParticipant(endParticipant),
-                color == null ? null : " " + color,
-                noteText.Replace("\n", "\n  "));
-
-        /// <summary>
-        /// Appends applying a tag to the specified branch/participant to the sequence diagram
-        /// </summary>
-        public void ApplyTag(string tag, string toBranch) => this.diagramBuilder.AppendLineFormat("{0} -> {0}: tag {1}", GetParticipant(toBranch), tag);
-
-        /// <summary>
-        /// Appends branching from a branch to another branch, @as can override the participant name
-        /// </summary>
-        public void BranchTo(string branchName, string currentName, string @as)
+            GetParticipant(startParticipant),
+            endParticipant == null ? null : ", " + GetParticipant(endParticipant),
+            color == null ? null : " " + color,
+            noteText.Replace("\n", "\n  "));
+
+    /// <summary>
+    /// Appends applying a tag to the specified branch/participant to the sequence diagram
+    /// </summary>
+    public void ApplyTag(string tag, string toBranch) => this.diagramBuilder.AppendLineFormat("{0} -> {0}: tag {1}", GetParticipant(toBranch), tag);
+
+    /// <summary>
+    /// Appends branching from a branch to another branch, @as can override the participant name
+    /// </summary>
+    public void BranchTo(string branchName, string currentName, string @as)
+    {
+        if (!this.participants.ContainsKey(branchName))
         {
-            if (!this.participants.ContainsKey(branchName))
-            {
-                this.diagramBuilder.Append("create ");
-                Participant(branchName, @as);
-            }
-
-            this.diagramBuilder.AppendLineFormat(
-                "{0} -> {1}: branch from {2}",
-                GetParticipant(currentName),
-                GetParticipant(branchName), currentName);
+            this.diagramBuilder.Append("create ");
+            Participant(branchName, @as);
         }
 
-        /// <summary>
-        /// Appends branching from a tag to a specified branch to the sequence diagram
-        /// </summary>
-        public void BranchToFromTag(string branchName, string fromTag, string onBranch, string @as)
-        {
-            if (!this.participants.ContainsKey(branchName))
-            {
-                this.diagramBuilder.Append("create ");
-                Participant(branchName, @as);
-            }
+        this.diagramBuilder.AppendLineFormat(
+            "{0} -> {1}: branch from {2}",
+            GetParticipant(currentName),
+            GetParticipant(branchName), currentName);
+    }
 
-            this.diagramBuilder.AppendLineFormat("{0} -> {1}: branch from tag ({2})", GetParticipant(onBranch), GetParticipant(branchName), fromTag);
+    /// <summary>
+    /// Appends branching from a tag to a specified branch to the sequence diagram
+    /// </summary>
+    public void BranchToFromTag(string branchName, string fromTag, string onBranch, string @as)
+    {
+        if (!this.participants.ContainsKey(branchName))
+        {
+            this.diagramBuilder.Append("create ");
+            Participant(branchName, @as);
         }
 
-        /// <summary>
-        /// Appends a commit on the target participant/branch to the sequence diagram
-        /// </summary>
-        public void MakeACommit(string toParticipant) => this.diagramBuilder.AppendLineFormat("{0} -> {0}: commit", GetParticipant(toParticipant));
-
-        /// <summary>
-        /// Append a merge to the sequence diagram
-        /// </summary>
-        public void Merge(string @from, string to) => this.diagramBuilder.AppendLineFormat("{0} -> {1}: merge", GetParticipant(@from), GetParticipant(to));
+        this.diagramBuilder.AppendLineFormat("{0} -> {1}: branch from tag ({2})", GetParticipant(onBranch), GetParticipant(branchName), fromTag);
+    }
 
-        private string GetParticipant(string branch)
-        {
-            if (this.participants.ContainsKey(branch))
-                return this.participants[branch];
+    /// <summary>
+    /// Appends a commit on the target participant/branch to the sequence diagram
+    /// </summary>
+    public void MakeACommit(string toParticipant) => this.diagramBuilder.AppendLineFormat("{0} -> {0}: commit", GetParticipant(toParticipant));
 
-            return branch;
-        }
+    /// <summary>
+    /// Append a merge to the sequence diagram
+    /// </summary>
+    public void Merge(string @from, string to) => this.diagramBuilder.AppendLineFormat("{0} -> {1}: merge", GetParticipant(@from), GetParticipant(to));
 
-        /// <summary>
-        /// Ends the sequence diagram
-        /// </summary>
-        public void End() => this.diagramBuilder.AppendLine("@enduml");
+    private string GetParticipant(string branch)
+    {
+        if (this.participants.ContainsKey(branch))
+            return this.participants[branch];
 
-        /// <summary>
-        /// returns the plantUML representation of the Sequence Diagram
-        /// </summary>
-        public string GetDiagram() => this.diagramBuilder.ToString();
+        return branch;
     }
-}
+
+    /// <summary>
+    /// Ends the sequence diagram
+    /// </summary>
+    public void End() => this.diagramBuilder.AppendLine("@enduml");
+
+    /// <summary>
+    /// returns the plantUML representation of the Sequence Diagram
+    /// </summary>
+    public string GetDiagram() => this.diagramBuilder.ToString();
+}
\ No newline at end of file
diff --git a/src/GitTools.Testing/Generate.cs b/src/GitTools.Testing/Generate.cs
index ec7bb2bdf1..0d13387e7d 100644
--- a/src/GitTools.Testing/Generate.cs
+++ b/src/GitTools.Testing/Generate.cs
@@ -1,25 +1,24 @@
 using System;
 using LibGit2Sharp;
 
-namespace GitTools.Testing
+namespace GitTools.Testing;
+
+/// <summary>
+/// Static helper class for generating data git needs, like signatures
+/// </summary>
+public static class Generate
 {
     /// <summary>
-    /// Static helper class for generating data git needs, like signatures
+    /// Create a libgit2sharp signature at VirtualTime.Now
     /// </summary>
-    public static class Generate
+    public static Signature SignatureNow()
     {
-        /// <summary>
-        /// Create a libgit2sharp signature at VirtualTime.Now
-        /// </summary>
-        public static Signature SignatureNow()
-        {
-            var dateTimeOffset = VirtualTime.Now;
-            return Signature(dateTimeOffset);
-        }
-
-        /// <summary>
-        /// Creates a libgit2sharp signature at the specified time
-        /// </summary>
-        public static Signature Signature(DateTimeOffset dateTimeOffset) => new("A. U. Thor", "thor@valhalla.asgard.com", dateTimeOffset);
+        var dateTimeOffset = VirtualTime.Now;
+        return Signature(dateTimeOffset);
     }
-}
+
+    /// <summary>
+    /// Creates a libgit2sharp signature at the specified time
+    /// </summary>
+    public static Signature Signature(DateTimeOffset dateTimeOffset) => new("A. U. Thor", "thor@valhalla.asgard.com", dateTimeOffset);
+}
\ No newline at end of file
diff --git a/src/GitTools.Testing/GitTestExtensions.cs b/src/GitTools.Testing/GitTestExtensions.cs
index bebbd03670..5b8c80fbc4 100644
--- a/src/GitTools.Testing/GitTestExtensions.cs
+++ b/src/GitTools.Testing/GitTestExtensions.cs
@@ -5,107 +5,106 @@
 using GitTools.Testing.Internal;
 using LibGit2Sharp;
 
-namespace GitTools.Testing
+namespace GitTools.Testing;
+
+public static class GitTestExtensions
 {
-    public static class GitTestExtensions
-    {
-        private static int _pad = 1;
+    private static int _pad = 1;
 
-        public static Commit MakeACommit(this IRepository repository, string commitMessage = null) => CreateFileAndCommit(repository, Guid.NewGuid().ToString(), commitMessage);
+    public static Commit MakeACommit(this IRepository repository, string commitMessage = null) => CreateFileAndCommit(repository, Guid.NewGuid().ToString(), commitMessage);
 
-        public static void MergeNoFF(this IRepository repository, string branch) => MergeNoFF(repository, branch, Generate.SignatureNow());
+    public static void MergeNoFF(this IRepository repository, string branch) => MergeNoFF(repository, branch, Generate.SignatureNow());
 
-        public static void MergeNoFF(this IRepository repository, string branch, Signature sig) => repository.Merge(repository.Branches[branch], sig, new MergeOptions
-        {
-            FastForwardStrategy = FastForwardStrategy.NoFastForward
-        });
+    public static void MergeNoFF(this IRepository repository, string branch, Signature sig) => repository.Merge(repository.Branches[branch], sig, new MergeOptions
+    {
+        FastForwardStrategy = FastForwardStrategy.NoFastForward
+    });
 
-        public static Commit[] MakeCommits(this IRepository repository, int numCommitsToMake) => Enumerable.Range(1, numCommitsToMake)
-                             .Select(_ => repository.MakeACommit())
-                             .ToArray();
+    public static Commit[] MakeCommits(this IRepository repository, int numCommitsToMake) => Enumerable.Range(1, numCommitsToMake)
+        .Select(_ => repository.MakeACommit())
+        .ToArray();
 
-        private static Commit CreateFileAndCommit(this IRepository repository, string relativeFileName, string commitMessage = null)
+    private static Commit CreateFileAndCommit(this IRepository repository, string relativeFileName, string commitMessage = null)
+    {
+        var randomFile = Path.Combine(repository.Info.WorkingDirectory, relativeFileName);
+        if (File.Exists(randomFile))
         {
-            var randomFile = Path.Combine(repository.Info.WorkingDirectory, relativeFileName);
-            if (File.Exists(randomFile))
-            {
-                File.Delete(randomFile);
-            }
+            File.Delete(randomFile);
+        }
 
-            var totalWidth = 36 + (_pad++ % 10);
-            var contents = Guid.NewGuid().ToString().PadRight(totalWidth, '.');
-            File.WriteAllText(randomFile, contents);
+        var totalWidth = 36 + (_pad++ % 10);
+        var contents = Guid.NewGuid().ToString().PadRight(totalWidth, '.');
+        File.WriteAllText(randomFile, contents);
 
-            Commands.Stage(repository, randomFile);
+        Commands.Stage(repository, randomFile);
 
-            return repository.Commit(commitMessage ?? $"Test Commit for file '{relativeFileName}'",
-                Generate.SignatureNow(), Generate.SignatureNow());
-        }
+        return repository.Commit(commitMessage ?? $"Test Commit for file '{relativeFileName}'",
+            Generate.SignatureNow(), Generate.SignatureNow());
+    }
 
-        public static Tag MakeATaggedCommit(this IRepository repository, string tag)
+    public static Tag MakeATaggedCommit(this IRepository repository, string tag)
+    {
+        var commit = repository.MakeACommit();
+        var existingTag = repository.Tags.SingleOrDefault(t => t.FriendlyName == tag);
+        if (existingTag != null)
+            return existingTag;
+        return repository.Tags.Add(tag, commit);
+    }
+
+    public static Commit CreatePullRequestRef(this IRepository repository, string from, string to, int prNumber = 2, bool normalise = false, bool allowFastFowardMerge = false)
+    {
+        Commands.Checkout(repository, repository.Branches[to].Tip);
+        if (allowFastFowardMerge)
         {
-            var commit = repository.MakeACommit();
-            var existingTag = repository.Tags.SingleOrDefault(t => t.FriendlyName == tag);
-            if (existingTag != null)
-                return existingTag;
-            return repository.Tags.Add(tag, commit);
+            repository.Merge(repository.Branches[from], Generate.SignatureNow());
         }
-
-        public static Commit CreatePullRequestRef(this IRepository repository, string from, string to, int prNumber = 2, bool normalise = false, bool allowFastFowardMerge = false)
+        else
         {
-            Commands.Checkout(repository, repository.Branches[to].Tip);
-            if (allowFastFowardMerge)
-            {
-                repository.Merge(repository.Branches[from], Generate.SignatureNow());
-            }
-            else
-            {
-                repository.MergeNoFF(from);
-            }
-            var commit = repository.Head.Tip;
-            repository.Refs.Add("refs/pull/" + prNumber + "/merge", commit.Id);
-            Commands.Checkout(repository, to);
-            if (normalise)
-            {
-                // Turn the ref into a real branch
-                Commands.Checkout(repository, repository.Branches.Add("pull/" + prNumber + "/merge", commit));
-            }
-
-            return commit;
+            repository.MergeNoFF(from);
         }
+        var commit = repository.Head.Tip;
+        repository.Refs.Add("refs/pull/" + prNumber + "/merge", commit.Id);
+        Commands.Checkout(repository, to);
+        if (normalise)
+        {
+            // Turn the ref into a real branch
+            Commands.Checkout(repository, repository.Branches.Add("pull/" + prNumber + "/merge", commit));
+        }
+
+        return commit;
+    }
 
-        public static void ExecuteGitCmd(string gitCmd, Action<string> writer = null)
+    public static void ExecuteGitCmd(string gitCmd, Action<string> writer = null)
+    {
+        var output = new StringBuilder();
+        try
         {
-            var output = new StringBuilder();
-            try
+            ProcessHelper.Run(
+                o => output.AppendLine(o),
+                e => output.AppendLineFormat("ERROR: {0}", e),
+                null,
+                "git",
+                gitCmd,
+                ".");
+        }
+        catch (FileNotFoundException exception)
+        {
+            if (exception.FileName != "git")
             {
-                ProcessHelper.Run(
-                    o => output.AppendLine(o),
-                    e => output.AppendLineFormat("ERROR: {0}", e),
-                    null,
-                    "git",
-                    gitCmd,
-                    ".");
+                throw;
             }
-            catch (FileNotFoundException exception)
-            {
-                if (exception.FileName != "git")
-                {
-                    throw;
-                }
 
-                output.AppendLine("Could not execute 'git log' due to the following error:");
-                output.AppendLine(exception.ToString());
-            }
+            output.AppendLine("Could not execute 'git log' due to the following error:");
+            output.AppendLine(exception.ToString());
+        }
 
-            if (writer != null)
-            {
-                writer(output.ToString());
-            }
-            else
-            {
-                Console.Write(output.ToString());
-            }
+        if (writer != null)
+        {
+            writer(output.ToString());
+        }
+        else
+        {
+            Console.Write(output.ToString());
         }
     }
 }
diff --git a/src/GitTools.Testing/Internal/DirectoryHelper.cs b/src/GitTools.Testing/Internal/DirectoryHelper.cs
index 278f0ba942..4fa7963dad 100644
--- a/src/GitTools.Testing/Internal/DirectoryHelper.cs
+++ b/src/GitTools.Testing/Internal/DirectoryHelper.cs
@@ -3,83 +3,82 @@
 using System.Diagnostics;
 using System.IO;
 
-namespace GitTools.Testing.Internal
+namespace GitTools.Testing.Internal;
+
+internal static class DirectoryHelper
 {
-    internal static class DirectoryHelper
+    private static readonly Dictionary<string, string> ToRename = new()
     {
-        private static readonly Dictionary<string, string> ToRename = new()
-        {
-            { "gitted", ".git" },
-            { "gitmodules", ".gitmodules" },
-        };
+        { "gitted", ".git" },
+        { "gitmodules", ".gitmodules" },
+    };
 
-        public static void CopyFilesRecursively(DirectoryInfo source, DirectoryInfo target)
-        {
-            // From http://stackoverflow.com/questions/58744/best-way-to-copy-the-entire-contents-of-a-directory-in-c/58779#58779
+    public static void CopyFilesRecursively(DirectoryInfo source, DirectoryInfo target)
+    {
+        // From http://stackoverflow.com/questions/58744/best-way-to-copy-the-entire-contents-of-a-directory-in-c/58779#58779
 
-            foreach (var dir in source.GetDirectories())
-            {
-                CopyFilesRecursively(dir, target.CreateSubdirectory(Rename(dir.Name)));
-            }
+        foreach (var dir in source.GetDirectories())
+        {
+            CopyFilesRecursively(dir, target.CreateSubdirectory(Rename(dir.Name)));
+        }
 
-            foreach (var file in source.GetFiles())
-            {
-                file.CopyTo(Path.Combine(target.FullName, Rename(file.Name)));
-            }
+        foreach (var file in source.GetFiles())
+        {
+            file.CopyTo(Path.Combine(target.FullName, Rename(file.Name)));
         }
+    }
 
-        private static string Rename(string name) => ToRename.ContainsKey(name) ? ToRename[name] : name;
+    private static string Rename(string name) => ToRename.ContainsKey(name) ? ToRename[name] : name;
 
-        public static void DeleteSubDirectories(string parentPath)
+    public static void DeleteSubDirectories(string parentPath)
+    {
+        var dirs = Directory.GetDirectories(parentPath);
+        foreach (var dir in dirs)
         {
-            var dirs = Directory.GetDirectories(parentPath);
-            foreach (var dir in dirs)
-            {
-                DeleteDirectory(dir);
-            }
+            DeleteDirectory(dir);
         }
+    }
 
-        public static void DeleteDirectory(string directoryPath)
-        {
-            // From http://stackoverflow.com/questions/329355/cannot-delete-directory-with-directory-deletepath-true/329502#329502
+    public static void DeleteDirectory(string directoryPath)
+    {
+        // From http://stackoverflow.com/questions/329355/cannot-delete-directory-with-directory-deletepath-true/329502#329502
 
-            if (!Directory.Exists(directoryPath))
-            {
-                Trace.WriteLine(
-                    string.Format("Directory '{0}' is missing and can't be removed.",
-                        directoryPath));
+        if (!Directory.Exists(directoryPath))
+        {
+            Trace.WriteLine(
+                string.Format("Directory '{0}' is missing and can't be removed.",
+                    directoryPath));
 
-                return;
-            }
+            return;
+        }
 
-            var files = Directory.GetFiles(directoryPath);
-            var dirs = Directory.GetDirectories(directoryPath);
+        var files = Directory.GetFiles(directoryPath);
+        var dirs = Directory.GetDirectories(directoryPath);
 
-            foreach (var file in files)
-            {
-                File.SetAttributes(file, FileAttributes.Normal);
-                File.Delete(file);
-            }
+        foreach (var file in files)
+        {
+            File.SetAttributes(file, FileAttributes.Normal);
+            File.Delete(file);
+        }
 
-            foreach (var dir in dirs)
-            {
-                DeleteDirectory(dir);
-            }
+        foreach (var dir in dirs)
+        {
+            DeleteDirectory(dir);
+        }
 
-            File.SetAttributes(directoryPath, FileAttributes.Normal);
-            try
-            {
-                Directory.Delete(directoryPath, false);
-            }
-            catch (IOException)
-            {
-                Trace.WriteLine(string.Format("{0}The directory '{1}' could not be deleted!" +
-                                              "{0}Most of the time, this is due to an external process accessing the files in the temporary repositories created during the test runs, and keeping a handle on the directory, thus preventing the deletion of those files." +
-                                              "{0}Known and common causes include:" +
-                                              "{0}- Windows Search Indexer (go to the Indexing Options, in the Windows Control Panel, and exclude the bin folder of LibGit2Sharp.Tests)" +
-                                              "{0}- Antivirus (exclude the bin folder of LibGit2Sharp.Tests from the paths scanned by your real-time antivirus){0}",
-                    Environment.NewLine, Path.GetFullPath(directoryPath)));
-            }
+        File.SetAttributes(directoryPath, FileAttributes.Normal);
+        try
+        {
+            Directory.Delete(directoryPath, false);
+        }
+        catch (IOException)
+        {
+            Trace.WriteLine(string.Format("{0}The directory '{1}' could not be deleted!" +
+                                          "{0}Most of the time, this is due to an external process accessing the files in the temporary repositories created during the test runs, and keeping a handle on the directory, thus preventing the deletion of those files." +
+                                          "{0}Known and common causes include:" +
+                                          "{0}- Windows Search Indexer (go to the Indexing Options, in the Windows Control Panel, and exclude the bin folder of LibGit2Sharp.Tests)" +
+                                          "{0}- Antivirus (exclude the bin folder of LibGit2Sharp.Tests from the paths scanned by your real-time antivirus){0}",
+                Environment.NewLine, Path.GetFullPath(directoryPath)));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitTools.Testing/Internal/PathHelper.cs b/src/GitTools.Testing/Internal/PathHelper.cs
index 47fff86064..93afe8ff8c 100644
--- a/src/GitTools.Testing/Internal/PathHelper.cs
+++ b/src/GitTools.Testing/Internal/PathHelper.cs
@@ -1,10 +1,9 @@
 using System;
 using System.IO;
 
-namespace GitTools.Testing.Internal
+namespace GitTools.Testing.Internal;
+
+internal static class PathHelper
 {
-    internal static class PathHelper
-    {
-        public static string GetTempPath() => Path.Combine(Path.GetTempPath(), "TestRepositories", Guid.NewGuid().ToString());
-    }
-}
+    public static string GetTempPath() => Path.Combine(Path.GetTempPath(), "TestRepositories", Guid.NewGuid().ToString());
+}
\ No newline at end of file
diff --git a/src/GitTools.Testing/Internal/ProcessHelper.cs b/src/GitTools.Testing/Internal/ProcessHelper.cs
index 90de503e3a..f4eb6f91f5 100644
--- a/src/GitTools.Testing/Internal/ProcessHelper.cs
+++ b/src/GitTools.Testing/Internal/ProcessHelper.cs
@@ -6,205 +6,204 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 
-namespace GitTools.Testing.Internal
+namespace GitTools.Testing.Internal;
+
+public static class ProcessHelper
 {
-    public static class ProcessHelper
+    private static readonly object LockObject = new();
+
+    // http://social.msdn.microsoft.com/Forums/en/netfxbcl/thread/f6069441-4ab1-4299-ad6a-b8bb9ed36be3
+    private static Process Start(ProcessStartInfo startInfo)
     {
-        private static readonly object LockObject = new();
+        Process process;
 
-        // http://social.msdn.microsoft.com/Forums/en/netfxbcl/thread/f6069441-4ab1-4299-ad6a-b8bb9ed36be3
-        private static Process Start(ProcessStartInfo startInfo)
+        lock (LockObject)
         {
-            Process process;
-
-            lock (LockObject)
+            using (new ChangeErrorMode(ErrorModes.FailCriticalErrors | ErrorModes.NoGpFaultErrorBox))
             {
-                using (new ChangeErrorMode(ErrorModes.FailCriticalErrors | ErrorModes.NoGpFaultErrorBox))
+                try
                 {
-                    try
-                    {
-                        process = Process.Start(startInfo);
-                    }
-                    catch (Win32Exception exception)
+                    process = Process.Start(startInfo);
+                }
+                catch (Win32Exception exception)
+                {
+                    switch ((NativeErrorCode)exception.NativeErrorCode)
                     {
-                        switch ((NativeErrorCode)exception.NativeErrorCode)
-                        {
-                            case NativeErrorCode.Success:
-                                // Success is not a failure.
-                                break;
-
-                            case NativeErrorCode.FileNotFound:
-                                throw new FileNotFoundException($"The executable file '{startInfo.FileName}' could not be found.",
-                                    startInfo.FileName,
-                                    exception);
-
-                            case NativeErrorCode.PathNotFound:
-                                throw new DirectoryNotFoundException($"The path to the executable file '{startInfo.FileName}' could not be found.",
-                                    exception);
-                        }
-
-                        throw;
+                        case NativeErrorCode.Success:
+                            // Success is not a failure.
+                            break;
+
+                        case NativeErrorCode.FileNotFound:
+                            throw new FileNotFoundException($"The executable file '{startInfo.FileName}' could not be found.",
+                                startInfo.FileName,
+                                exception);
+
+                        case NativeErrorCode.PathNotFound:
+                            throw new DirectoryNotFoundException($"The path to the executable file '{startInfo.FileName}' could not be found.",
+                                exception);
                     }
 
-                    try
-                    {
-                        if (process != null)
-                        {
-                            process.PriorityClass = ProcessPriorityClass.Idle;
-                        }
-                    }
-                    catch
+                    throw;
+                }
+
+                try
+                {
+                    if (process != null)
                     {
-                        // NOTE: It seems like in some situations, setting the priority class will throw a Win32Exception
-                        // with the error code set to "Success", which I think we can safely interpret as a success and
-                        // not an exception.
-                        //
-                        // See: https://travis-ci.org/GitTools/GitVersion/jobs/171288284#L2026
-                        // And: https://msdn.microsoft.com/en-us/library/windows/desktop/ms681382.aspx
-                        //
-                        // There's also the case where the process might be killed before we try to adjust its priority
-                        // class, in which case it will throw an InvalidOperationException. What we ideally should do
-                        // is start the process in a "suspended" state, adjust the priority class, then resume it, but
-                        // that's not possible in pure .NET.
-                        //
-                        // See: https://travis-ci.org/GitTools/GitVersion/jobs/166709203#L2278
-                        // And: http://www.codeproject.com/Articles/230005/Launch-a-process-suspended
-                        //
-                        // -- @asbjornu
+                        process.PriorityClass = ProcessPriorityClass.Idle;
                     }
                 }
+                catch
+                {
+                    // NOTE: It seems like in some situations, setting the priority class will throw a Win32Exception
+                    // with the error code set to "Success", which I think we can safely interpret as a success and
+                    // not an exception.
+                    //
+                    // See: https://travis-ci.org/GitTools/GitVersion/jobs/171288284#L2026
+                    // And: https://msdn.microsoft.com/en-us/library/windows/desktop/ms681382.aspx
+                    //
+                    // There's also the case where the process might be killed before we try to adjust its priority
+                    // class, in which case it will throw an InvalidOperationException. What we ideally should do
+                    // is start the process in a "suspended" state, adjust the priority class, then resume it, but
+                    // that's not possible in pure .NET.
+                    //
+                    // See: https://travis-ci.org/GitTools/GitVersion/jobs/166709203#L2278
+                    // And: http://www.codeproject.com/Articles/230005/Launch-a-process-suspended
+                    //
+                    // -- @asbjornu
+                }
             }
-
-            return process;
         }
 
-        // http://csharptest.net/532/using-processstart-to-capture-console-output/
-        public static int Run(Action<string> output, Action<string> errorOutput, TextReader input, string exe, string args, string workingDirectory, params KeyValuePair<string, string>[] environmentalVariables)
-        {
-            if (string.IsNullOrEmpty(exe))
-                throw new ArgumentNullException(nameof(exe));
-            if (output == null)
-                throw new ArgumentNullException(nameof(output));
+        return process;
+    }
 
-            workingDirectory ??= Environment.CurrentDirectory;
+    // http://csharptest.net/532/using-processstart-to-capture-console-output/
+    public static int Run(Action<string> output, Action<string> errorOutput, TextReader input, string exe, string args, string workingDirectory, params KeyValuePair<string, string>[] environmentalVariables)
+    {
+        if (string.IsNullOrEmpty(exe))
+            throw new ArgumentNullException(nameof(exe));
+        if (output == null)
+            throw new ArgumentNullException(nameof(output));
 
-            var psi = new ProcessStartInfo
-            {
-                UseShellExecute = false,
-                RedirectStandardError = true,
-                RedirectStandardOutput = true,
-                RedirectStandardInput = true,
-                WindowStyle = ProcessWindowStyle.Hidden,
-                CreateNoWindow = true,
-                ErrorDialog = false,
-                WorkingDirectory = workingDirectory,
-                FileName = exe,
-                Arguments = args
-            };
-            foreach (var environmentalVariable in environmentalVariables)
+        workingDirectory ??= Environment.CurrentDirectory;
+
+        var psi = new ProcessStartInfo
+        {
+            UseShellExecute = false,
+            RedirectStandardError = true,
+            RedirectStandardOutput = true,
+            RedirectStandardInput = true,
+            WindowStyle = ProcessWindowStyle.Hidden,
+            CreateNoWindow = true,
+            ErrorDialog = false,
+            WorkingDirectory = workingDirectory,
+            FileName = exe,
+            Arguments = args
+        };
+        foreach (var environmentalVariable in environmentalVariables)
+        {
+            if (psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key))
             {
-                if (psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key))
-                {
-                    psi.EnvironmentVariables[environmentalVariable.Key] = environmentalVariable.Value;
-                }
-                else
-                {
-                    psi.EnvironmentVariables.Add(environmentalVariable.Key, environmentalVariable.Value);
-                }
-                if (psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key) && environmentalVariable.Value == null)
-                {
-                    psi.EnvironmentVariables.Remove(environmentalVariable.Key);
-                }
+                psi.EnvironmentVariables[environmentalVariable.Key] = environmentalVariable.Value;
             }
-
-            using var process = Start(psi);
-            using var mreOut = new ManualResetEvent(false);
-            using var mreErr = new ManualResetEvent(false);
-            process.EnableRaisingEvents = true;
-            process.OutputDataReceived += (_, e) =>
+            else
             {
-                // ReSharper disable once AccessToDisposedClosure
-                if (e.Data == null)
-                    mreOut.Set();
-                else
-                    output(e.Data);
-            };
-            process.BeginOutputReadLine();
-            process.ErrorDataReceived += (_, e) =>
+                psi.EnvironmentVariables.Add(environmentalVariable.Key, environmentalVariable.Value);
+            }
+            if (psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key) && environmentalVariable.Value == null)
             {
-                // ReSharper disable once AccessToDisposedClosure
-                if (e.Data == null)
-                    mreErr.Set();
-                else
-                    errorOutput(e.Data);
-            };
-            process.BeginErrorReadLine();
+                psi.EnvironmentVariables.Remove(environmentalVariable.Key);
+            }
+        }
 
-            string line;
-            while (input != null && null != (line = input.ReadLine()))
-                process.StandardInput.WriteLine(line);
+        using var process = Start(psi);
+        using var mreOut = new ManualResetEvent(false);
+        using var mreErr = new ManualResetEvent(false);
+        process.EnableRaisingEvents = true;
+        process.OutputDataReceived += (_, e) =>
+        {
+            // ReSharper disable once AccessToDisposedClosure
+            if (e.Data == null)
+                mreOut.Set();
+            else
+                output(e.Data);
+        };
+        process.BeginOutputReadLine();
+        process.ErrorDataReceived += (_, e) =>
+        {
+            // ReSharper disable once AccessToDisposedClosure
+            if (e.Data == null)
+                mreErr.Set();
+            else
+                errorOutput(e.Data);
+        };
+        process.BeginErrorReadLine();
 
-            process.StandardInput.Close();
-            process.WaitForExit();
+        string line;
+        while (input != null && null != (line = input.ReadLine()))
+            process.StandardInput.WriteLine(line);
 
-            mreOut.WaitOne();
-            mreErr.WaitOne();
+        process.StandardInput.Close();
+        process.WaitForExit();
 
-            return process.ExitCode;
-        }
+        mreOut.WaitOne();
+        mreErr.WaitOne();
 
-        /// <summary>
-        /// System error codes.
-        /// See: https://msdn.microsoft.com/en-us/library/windows/desktop/ms681382.aspx
-        /// </summary>
-        private enum NativeErrorCode
-        {
-            Success = 0x0,
-            FileNotFound = 0x2,
-            PathNotFound = 0x3
-        }
+        return process.ExitCode;
+    }
 
-        [Flags]
-        public enum ErrorModes
-        {
-            Default = 0x0,
-            FailCriticalErrors = 0x1,
-            NoGpFaultErrorBox = 0x2,
-            NoAlignmentFaultExcept = 0x4,
-            NoOpenFileErrorBox = 0x8000
-        }
+    /// <summary>
+    /// System error codes.
+    /// See: https://msdn.microsoft.com/en-us/library/windows/desktop/ms681382.aspx
+    /// </summary>
+    private enum NativeErrorCode
+    {
+        Success = 0x0,
+        FileNotFound = 0x2,
+        PathNotFound = 0x3
+    }
 
-        private struct ChangeErrorMode : IDisposable
-        {
-            private readonly int oldMode;
+    [Flags]
+    public enum ErrorModes
+    {
+        Default = 0x0,
+        FailCriticalErrors = 0x1,
+        NoGpFaultErrorBox = 0x2,
+        NoAlignmentFaultExcept = 0x4,
+        NoOpenFileErrorBox = 0x8000
+    }
 
-            public ChangeErrorMode(ErrorModes mode)
+    private struct ChangeErrorMode : IDisposable
+    {
+        private readonly int oldMode;
+
+        public ChangeErrorMode(ErrorModes mode)
+        {
+            try
             {
-                try
-                {
-                    this.oldMode = SetErrorMode((int)mode);
-                }
-                catch (Exception ex) when (ex is EntryPointNotFoundException || ex is DllNotFoundException)
-                {
-                    this.oldMode = (int)mode;
-                }
+                this.oldMode = SetErrorMode((int)mode);
             }
+            catch (Exception ex) when (ex is EntryPointNotFoundException || ex is DllNotFoundException)
+            {
+                this.oldMode = (int)mode;
+            }
+        }
 
 
-            void IDisposable.Dispose()
+        void IDisposable.Dispose()
+        {
+            try
             {
-                try
-                {
-                    SetErrorMode(this.oldMode);
-                }
-                catch (Exception ex) when (ex is EntryPointNotFoundException || ex is DllNotFoundException)
-                {
-                    // NOTE: Mono doesn't support DllImport("kernel32.dll") and its SetErrorMode method, obviously. @asbjornu
-                }
+                SetErrorMode(this.oldMode);
+            }
+            catch (Exception ex) when (ex is EntryPointNotFoundException || ex is DllNotFoundException)
+            {
+                // NOTE: Mono doesn't support DllImport("kernel32.dll") and its SetErrorMode method, obviously. @asbjornu
             }
-
-            [DllImport("kernel32.dll")]
-            private static extern int SetErrorMode(int newMode);
         }
+
+        [DllImport("kernel32.dll")]
+        private static extern int SetErrorMode(int newMode);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitTools.Testing/Internal/StringBuilderExtensions.cs b/src/GitTools.Testing/Internal/StringBuilderExtensions.cs
index 1c75b51501..a983330601 100644
--- a/src/GitTools.Testing/Internal/StringBuilderExtensions.cs
+++ b/src/GitTools.Testing/Internal/StringBuilderExtensions.cs
@@ -1,15 +1,14 @@
 using System.Text;
 using JetBrains.Annotations;
 
-namespace GitTools.Testing.Internal
+namespace GitTools.Testing.Internal;
+
+internal static class StringBuilderExtensions
 {
-    internal static class StringBuilderExtensions
+    [StringFormatMethod("format")]
+    public static void AppendLineFormat(this StringBuilder stringBuilder, string format, params object[] args)
     {
-        [StringFormatMethod("format")]
-        public static void AppendLineFormat(this StringBuilder stringBuilder, string format, params object[] args)
-        {
-            stringBuilder.AppendFormat(format, args);
-            stringBuilder.AppendLine();
-        }
+        stringBuilder.AppendFormat(format, args);
+        stringBuilder.AppendLine();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitTools.Testing/VirtualTime.cs b/src/GitTools.Testing/VirtualTime.cs
index 9cff927a96..ec5f5d3956 100644
--- a/src/GitTools.Testing/VirtualTime.cs
+++ b/src/GitTools.Testing/VirtualTime.cs
@@ -1,25 +1,24 @@
 using System;
 
-namespace GitTools.Testing
+namespace GitTools.Testing;
+
+/// <summary>
+/// VirtualTime starts at an hour before now, then each time it is called increments by a minute
+/// Useful when interacting with git to make sure commits and other interactions are not at the same time
+/// </summary>
+public static class VirtualTime
 {
+    private static DateTimeOffset _simulatedTime = DateTimeOffset.Now.AddHours(-1);
+
     /// <summary>
-    /// VirtualTime starts at an hour before now, then each time it is called increments by a minute
-    /// Useful when interacting with git to make sure commits and other interactions are not at the same time
+    /// Increments by 1 minute each time it is called
     /// </summary>
-    public static class VirtualTime
+    public static DateTimeOffset Now
     {
-        private static DateTimeOffset _simulatedTime = DateTimeOffset.Now.AddHours(-1);
-
-        /// <summary>
-        /// Increments by 1 minute each time it is called
-        /// </summary>
-        public static DateTimeOffset Now
+        get
         {
-            get
-            {
-                _simulatedTime = _simulatedTime.AddMinutes(1);
-                return _simulatedTime;
-            }
+            _simulatedTime = _simulatedTime.AddMinutes(1);
+            return _simulatedTime;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/ArgumentParserOnBuildServerTests.cs b/src/GitVersion.App.Tests/ArgumentParserOnBuildServerTests.cs
index e66317f350..bea513a1c5 100644
--- a/src/GitVersion.App.Tests/ArgumentParserOnBuildServerTests.cs
+++ b/src/GitVersion.App.Tests/ArgumentParserOnBuildServerTests.cs
@@ -6,43 +6,42 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.App.Tests
+namespace GitVersion.App.Tests;
+
+[TestFixture]
+public class ArgumentParserOnBuildServerTests : TestBase
 {
-    [TestFixture]
-    public class ArgumentParserOnBuildServerTests : TestBase
-    {
-        private IArgumentParser argumentParser;
+    private IArgumentParser argumentParser;
 
-        [SetUp]
-        public void SetUp()
-        {
-            var sp = ConfigureServices(services =>
-            {
-                services.AddSingleton<IArgumentParser, ArgumentParser>();
-                services.AddSingleton<IGlobbingResolver, GlobbingResolver>();
-                services.AddSingleton<ICurrentBuildAgent, MockBuildAgent>();
-            });
-            this.argumentParser = sp.GetService<IArgumentParser>();
-        }
-
-        [Test]
-        public void EmptyOnFetchDisabledBuildServerMeansNoFetchIsTrue()
+    [SetUp]
+    public void SetUp()
+    {
+        var sp = ConfigureServices(services =>
         {
-            var arguments = this.argumentParser.ParseArguments("");
-            arguments.NoFetch.ShouldBe(true);
-        }
+            services.AddSingleton<IArgumentParser, ArgumentParser>();
+            services.AddSingleton<IGlobbingResolver, GlobbingResolver>();
+            services.AddSingleton<ICurrentBuildAgent, MockBuildAgent>();
+        });
+        this.argumentParser = sp.GetService<IArgumentParser>();
+    }
 
-        private class MockBuildAgent : ICurrentBuildAgent
-        {
-            public bool CanApplyToCurrentContext() => throw new NotImplementedException();
+    [Test]
+    public void EmptyOnFetchDisabledBuildServerMeansNoFetchIsTrue()
+    {
+        var arguments = this.argumentParser.ParseArguments("");
+        arguments.NoFetch.ShouldBe(true);
+    }
+
+    private class MockBuildAgent : ICurrentBuildAgent
+    {
+        public bool CanApplyToCurrentContext() => throw new NotImplementedException();
 
-            public void WriteIntegration(Action<string> writer, VersionVariables variables, bool updateBuildNumber = true) => throw new NotImplementedException();
+        public void WriteIntegration(Action<string> writer, VersionVariables variables, bool updateBuildNumber = true) => throw new NotImplementedException();
 
-            public string GetCurrentBranch(bool usingDynamicRepos) => throw new NotImplementedException();
+        public string GetCurrentBranch(bool usingDynamicRepos) => throw new NotImplementedException();
 
-            public bool PreventFetch() => true;
+        public bool PreventFetch() => true;
 
-            public bool ShouldCleanUpRemotes() => throw new NotImplementedException();
-        }
+        public bool ShouldCleanUpRemotes() => throw new NotImplementedException();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/ArgumentParserTests.cs b/src/GitVersion.App.Tests/ArgumentParserTests.cs
index be13b3e5bb..40535a670e 100644
--- a/src/GitVersion.App.Tests/ArgumentParserTests.cs
+++ b/src/GitVersion.App.Tests/ArgumentParserTests.cs
@@ -11,754 +11,753 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.App.Tests
+namespace GitVersion.App.Tests;
+
+[TestFixture]
+public class ArgumentParserTests : TestBase
 {
-    [TestFixture]
-    public class ArgumentParserTests : TestBase
-    {
-        private IEnvironment environment;
-        private IArgumentParser argumentParser;
+    private IEnvironment environment;
+    private IArgumentParser argumentParser;
 
-        [SetUp]
-        public void SetUp()
+    [SetUp]
+    public void SetUp()
+    {
+        var sp = ConfigureServices(services =>
         {
-            var sp = ConfigureServices(services =>
-            {
-                services.AddSingleton<IArgumentParser, ArgumentParser>();
-                services.AddSingleton<IGlobbingResolver, GlobbingResolver>();
-            });
-            this.environment = sp.GetService<IEnvironment>();
-            this.argumentParser = sp.GetService<IArgumentParser>();
-        }
+            services.AddSingleton<IArgumentParser, ArgumentParser>();
+            services.AddSingleton<IGlobbingResolver, GlobbingResolver>();
+        });
+        this.environment = sp.GetService<IEnvironment>();
+        this.argumentParser = sp.GetService<IArgumentParser>();
+    }
 
-        [Test]
-        public void EmptyMeansUseCurrentDirectory()
-        {
-            var arguments = this.argumentParser.ParseArguments("");
-            arguments.TargetPath.ShouldBe(System.Environment.CurrentDirectory);
-            arguments.LogFilePath.ShouldBe(null);
-            arguments.IsHelp.ShouldBe(false);
-        }
+    [Test]
+    public void EmptyMeansUseCurrentDirectory()
+    {
+        var arguments = this.argumentParser.ParseArguments("");
+        arguments.TargetPath.ShouldBe(System.Environment.CurrentDirectory);
+        arguments.LogFilePath.ShouldBe(null);
+        arguments.IsHelp.ShouldBe(false);
+    }
 
-        [Test]
-        public void SingleMeansUseAsTargetDirectory()
-        {
-            var arguments = this.argumentParser.ParseArguments("path");
-            arguments.TargetPath.ShouldBe("path");
-            arguments.LogFilePath.ShouldBe(null);
-            arguments.IsHelp.ShouldBe(false);
-        }
+    [Test]
+    public void SingleMeansUseAsTargetDirectory()
+    {
+        var arguments = this.argumentParser.ParseArguments("path");
+        arguments.TargetPath.ShouldBe("path");
+        arguments.LogFilePath.ShouldBe(null);
+        arguments.IsHelp.ShouldBe(false);
+    }
 
-        [Test]
-        public void NoPathAndLogfileShouldUseCurrentDirectoryTargetDirectory()
-        {
-            var arguments = this.argumentParser.ParseArguments("-l logFilePath");
-            arguments.TargetPath.ShouldBe(System.Environment.CurrentDirectory);
-            arguments.LogFilePath.ShouldBe("logFilePath");
-            arguments.IsHelp.ShouldBe(false);
-        }
+    [Test]
+    public void NoPathAndLogfileShouldUseCurrentDirectoryTargetDirectory()
+    {
+        var arguments = this.argumentParser.ParseArguments("-l logFilePath");
+        arguments.TargetPath.ShouldBe(System.Environment.CurrentDirectory);
+        arguments.LogFilePath.ShouldBe("logFilePath");
+        arguments.IsHelp.ShouldBe(false);
+    }
 
-        [Test]
-        public void HelpSwitchTest()
-        {
-            var arguments = this.argumentParser.ParseArguments("-h");
-            Assert.IsNull(arguments.TargetPath);
-            Assert.IsNull(arguments.LogFilePath);
-            arguments.IsHelp.ShouldBe(true);
-        }
+    [Test]
+    public void HelpSwitchTest()
+    {
+        var arguments = this.argumentParser.ParseArguments("-h");
+        Assert.IsNull(arguments.TargetPath);
+        Assert.IsNull(arguments.LogFilePath);
+        arguments.IsHelp.ShouldBe(true);
+    }
 
-        [Test]
-        public void VersionSwitchTest()
-        {
-            var arguments = this.argumentParser.ParseArguments("-version");
-            Assert.IsNull(arguments.TargetPath);
-            Assert.IsNull(arguments.LogFilePath);
-            arguments.IsVersion.ShouldBe(true);
-        }
+    [Test]
+    public void VersionSwitchTest()
+    {
+        var arguments = this.argumentParser.ParseArguments("-version");
+        Assert.IsNull(arguments.TargetPath);
+        Assert.IsNull(arguments.LogFilePath);
+        arguments.IsVersion.ShouldBe(true);
+    }
 
-        [Test]
-        public void TargetDirectoryAndLogFilePathCanBeParsed()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -l logFilePath");
-            arguments.TargetPath.ShouldBe("targetDirectoryPath");
-            arguments.LogFilePath.ShouldBe("logFilePath");
-            arguments.IsHelp.ShouldBe(false);
-        }
+    [Test]
+    public void TargetDirectoryAndLogFilePathCanBeParsed()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -l logFilePath");
+        arguments.TargetPath.ShouldBe("targetDirectoryPath");
+        arguments.LogFilePath.ShouldBe("logFilePath");
+        arguments.IsHelp.ShouldBe(false);
+    }
 
-        [Test]
-        public void UsernameAndPasswordCanBeParsed()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -u [username] -p [password]");
-            arguments.TargetPath.ShouldBe("targetDirectoryPath");
-            arguments.Authentication.Username.ShouldBe("[username]");
-            arguments.Authentication.Password.ShouldBe("[password]");
-            arguments.IsHelp.ShouldBe(false);
-        }
+    [Test]
+    public void UsernameAndPasswordCanBeParsed()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -u [username] -p [password]");
+        arguments.TargetPath.ShouldBe("targetDirectoryPath");
+        arguments.Authentication.Username.ShouldBe("[username]");
+        arguments.Authentication.Password.ShouldBe("[password]");
+        arguments.IsHelp.ShouldBe(false);
+    }
 
-        [Test]
-        public void UnknownOutputShouldThrow()
-        {
-            var exception = Assert.Throws<WarningException>(() => this.argumentParser.ParseArguments("targetDirectoryPath -output invalid_value"));
-            exception.Message.ShouldBe("Value 'invalid_value' cannot be parsed as output type, please use 'json', 'file' or 'buildserver'");
-        }
+    [Test]
+    public void UnknownOutputShouldThrow()
+    {
+        var exception = Assert.Throws<WarningException>(() => this.argumentParser.ParseArguments("targetDirectoryPath -output invalid_value"));
+        exception.Message.ShouldBe("Value 'invalid_value' cannot be parsed as output type, please use 'json', 'file' or 'buildserver'");
+    }
 
-        [Test]
-        public void OutputDefaultsToJson()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetDirectoryPath");
-            arguments.Output.ShouldContain(OutputType.Json);
-            arguments.Output.ShouldNotContain(OutputType.BuildServer);
-            arguments.Output.ShouldNotContain(OutputType.File);
-        }
+    [Test]
+    public void OutputDefaultsToJson()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetDirectoryPath");
+        arguments.Output.ShouldContain(OutputType.Json);
+        arguments.Output.ShouldNotContain(OutputType.BuildServer);
+        arguments.Output.ShouldNotContain(OutputType.File);
+    }
 
-        [Test]
-        public void OutputJsonCanBeParsed()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output json");
-            arguments.Output.ShouldContain(OutputType.Json);
-            arguments.Output.ShouldNotContain(OutputType.BuildServer);
-            arguments.Output.ShouldNotContain(OutputType.File);
-        }
+    [Test]
+    public void OutputJsonCanBeParsed()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output json");
+        arguments.Output.ShouldContain(OutputType.Json);
+        arguments.Output.ShouldNotContain(OutputType.BuildServer);
+        arguments.Output.ShouldNotContain(OutputType.File);
+    }
 
-        [Test]
-        public void MultipleOutputJsonCanBeParsed()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output json -output json");
-            arguments.Output.ShouldContain(OutputType.Json);
-            arguments.Output.ShouldNotContain(OutputType.BuildServer);
-            arguments.Output.ShouldNotContain(OutputType.File);
-        }
+    [Test]
+    public void MultipleOutputJsonCanBeParsed()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output json -output json");
+        arguments.Output.ShouldContain(OutputType.Json);
+        arguments.Output.ShouldNotContain(OutputType.BuildServer);
+        arguments.Output.ShouldNotContain(OutputType.File);
+    }
 
-        [Test]
-        public void OutputBuildserverCanBeParsed()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output buildserver");
-            arguments.Output.ShouldContain(OutputType.BuildServer);
-            arguments.Output.ShouldNotContain(OutputType.Json);
-            arguments.Output.ShouldNotContain(OutputType.File);
-        }
+    [Test]
+    public void OutputBuildserverCanBeParsed()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output buildserver");
+        arguments.Output.ShouldContain(OutputType.BuildServer);
+        arguments.Output.ShouldNotContain(OutputType.Json);
+        arguments.Output.ShouldNotContain(OutputType.File);
+    }
 
-        [Test]
-        public void MultipleOutputBuildserverCanBeParsed()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output buildserver -output buildserver");
-            arguments.Output.ShouldContain(OutputType.BuildServer);
-            arguments.Output.ShouldNotContain(OutputType.Json);
-            arguments.Output.ShouldNotContain(OutputType.File);
-        }
+    [Test]
+    public void MultipleOutputBuildserverCanBeParsed()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output buildserver -output buildserver");
+        arguments.Output.ShouldContain(OutputType.BuildServer);
+        arguments.Output.ShouldNotContain(OutputType.Json);
+        arguments.Output.ShouldNotContain(OutputType.File);
+    }
 
-        [Test]
-        public void OutputFileCanBeParsed()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output file");
-            arguments.Output.ShouldContain(OutputType.File);
-            arguments.Output.ShouldNotContain(OutputType.BuildServer);
-            arguments.Output.ShouldNotContain(OutputType.Json);
-        }
+    [Test]
+    public void OutputFileCanBeParsed()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output file");
+        arguments.Output.ShouldContain(OutputType.File);
+        arguments.Output.ShouldNotContain(OutputType.BuildServer);
+        arguments.Output.ShouldNotContain(OutputType.Json);
+    }
 
-        [Test]
-        public void MultipleOutputFileCanBeParsed()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output file -output file");
-            arguments.Output.ShouldContain(OutputType.File);
-            arguments.Output.ShouldNotContain(OutputType.BuildServer);
-            arguments.Output.ShouldNotContain(OutputType.Json);
-        }
+    [Test]
+    public void MultipleOutputFileCanBeParsed()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output file -output file");
+        arguments.Output.ShouldContain(OutputType.File);
+        arguments.Output.ShouldNotContain(OutputType.BuildServer);
+        arguments.Output.ShouldNotContain(OutputType.Json);
+    }
 
-        [Test]
-        public void OutputBuildserverAndJsonCanBeParsed()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output buildserver -output json");
-            arguments.Output.ShouldContain(OutputType.BuildServer);
-            arguments.Output.ShouldContain(OutputType.Json);
-            arguments.Output.ShouldNotContain(OutputType.File);
-        }
+    [Test]
+    public void OutputBuildserverAndJsonCanBeParsed()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output buildserver -output json");
+        arguments.Output.ShouldContain(OutputType.BuildServer);
+        arguments.Output.ShouldContain(OutputType.Json);
+        arguments.Output.ShouldNotContain(OutputType.File);
+    }
 
-        [Test]
-        public void OutputBuildserverAndJsonAndFileCanBeParsed()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output buildserver -output json -output file");
-            arguments.Output.ShouldContain(OutputType.BuildServer);
-            arguments.Output.ShouldContain(OutputType.Json);
-            arguments.Output.ShouldContain(OutputType.File);
-        }
+    [Test]
+    public void OutputBuildserverAndJsonAndFileCanBeParsed()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output buildserver -output json -output file");
+        arguments.Output.ShouldContain(OutputType.BuildServer);
+        arguments.Output.ShouldContain(OutputType.Json);
+        arguments.Output.ShouldContain(OutputType.File);
+    }
 
-        [Test]
-        public void MultipleArgsAndFlag()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output buildserver -updateAssemblyInfo");
-            arguments.Output.ShouldContain(OutputType.BuildServer);
-        }
+    [Test]
+    public void MultipleArgsAndFlag()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -output buildserver -updateAssemblyInfo");
+        arguments.Output.ShouldContain(OutputType.BuildServer);
+    }
 
-        [TestCase("-output file", "GitVersion.json")]
-        [TestCase("-output file -outputfile version.json", "version.json")]
-        public void OutputFileArgumentCanBeParsed(string args, string outputFile)
-        {
-            var arguments = this.argumentParser.ParseArguments(args);
+    [TestCase("-output file", "GitVersion.json")]
+    [TestCase("-output file -outputfile version.json", "version.json")]
+    public void OutputFileArgumentCanBeParsed(string args, string outputFile)
+    {
+        var arguments = this.argumentParser.ParseArguments(args);
 
-            arguments.Output.ShouldContain(OutputType.File);
-            arguments.OutputFile.ShouldBe(outputFile);
-        }
+        arguments.Output.ShouldContain(OutputType.File);
+        arguments.OutputFile.ShouldBe(outputFile);
+    }
 
-        [Test]
-        public void UrlAndBranchNameCanBeParsed()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -url http://github.com/Particular/GitVersion.git -b somebranch");
-            arguments.TargetPath.ShouldBe("targetDirectoryPath");
-            arguments.TargetUrl.ShouldBe("http://github.com/Particular/GitVersion.git");
-            arguments.TargetBranch.ShouldBe("somebranch");
-            arguments.IsHelp.ShouldBe(false);
-        }
+    [Test]
+    public void UrlAndBranchNameCanBeParsed()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetDirectoryPath -url http://github.com/Particular/GitVersion.git -b somebranch");
+        arguments.TargetPath.ShouldBe("targetDirectoryPath");
+        arguments.TargetUrl.ShouldBe("http://github.com/Particular/GitVersion.git");
+        arguments.TargetBranch.ShouldBe("somebranch");
+        arguments.IsHelp.ShouldBe(false);
+    }
 
-        [Test]
-        public void WrongNumberOfArgumentsShouldThrow()
-        {
-            var exception = Assert.Throws<WarningException>(() => this.argumentParser.ParseArguments("targetDirectoryPath -l logFilePath extraArg"));
-            exception.Message.ShouldBe("Could not parse command line parameter 'extraArg'.");
-        }
+    [Test]
+    public void WrongNumberOfArgumentsShouldThrow()
+    {
+        var exception = Assert.Throws<WarningException>(() => this.argumentParser.ParseArguments("targetDirectoryPath -l logFilePath extraArg"));
+        exception.Message.ShouldBe("Could not parse command line parameter 'extraArg'.");
+    }
 
-        [TestCase("targetDirectoryPath -x logFilePath")]
-        [TestCase("/invalid-argument")]
-        public void UnknownArgumentsShouldThrow(string arguments)
-        {
-            var exception = Assert.Throws<WarningException>(() => this.argumentParser.ParseArguments(arguments));
-            exception.Message.ShouldStartWith("Could not parse command line parameter");
-        }
+    [TestCase("targetDirectoryPath -x logFilePath")]
+    [TestCase("/invalid-argument")]
+    public void UnknownArgumentsShouldThrow(string arguments)
+    {
+        var exception = Assert.Throws<WarningException>(() => this.argumentParser.ParseArguments(arguments));
+        exception.Message.ShouldStartWith("Could not parse command line parameter");
+    }
 
-        [TestCase("-updateAssemblyInfo true")]
-        [TestCase("-updateAssemblyInfo 1")]
-        [TestCase("-updateAssemblyInfo")]
-        [TestCase("-updateAssemblyInfo assemblyInfo.cs")]
-        [TestCase("-updateAssemblyInfo assemblyInfo.cs -ensureassemblyinfo")]
-        [TestCase("-updateAssemblyInfo assemblyInfo.cs otherAssemblyInfo.cs")]
-        [TestCase("-updateAssemblyInfo Assembly.cs Assembly.cs -ensureassemblyinfo")]
-        public void UpdateAssemblyInfoTrue(string command)
-        {
-            var arguments = this.argumentParser.ParseArguments(command);
-            arguments.UpdateAssemblyInfo.ShouldBe(true);
-        }
+    [TestCase("-updateAssemblyInfo true")]
+    [TestCase("-updateAssemblyInfo 1")]
+    [TestCase("-updateAssemblyInfo")]
+    [TestCase("-updateAssemblyInfo assemblyInfo.cs")]
+    [TestCase("-updateAssemblyInfo assemblyInfo.cs -ensureassemblyinfo")]
+    [TestCase("-updateAssemblyInfo assemblyInfo.cs otherAssemblyInfo.cs")]
+    [TestCase("-updateAssemblyInfo Assembly.cs Assembly.cs -ensureassemblyinfo")]
+    public void UpdateAssemblyInfoTrue(string command)
+    {
+        var arguments = this.argumentParser.ParseArguments(command);
+        arguments.UpdateAssemblyInfo.ShouldBe(true);
+    }
 
-        [TestCase("-updateProjectFiles assemblyInfo.csproj")]
-        [TestCase("-updateProjectFiles assemblyInfo.csproj")]
-        [TestCase("-updateProjectFiles assemblyInfo.csproj otherAssemblyInfo.fsproj")]
-        [TestCase("-updateProjectFiles")]
-        public void UpdateProjectTrue(string command)
-        {
-            var arguments = this.argumentParser.ParseArguments(command);
-            arguments.UpdateProjectFiles.ShouldBe(true);
-        }
+    [TestCase("-updateProjectFiles assemblyInfo.csproj")]
+    [TestCase("-updateProjectFiles assemblyInfo.csproj")]
+    [TestCase("-updateProjectFiles assemblyInfo.csproj otherAssemblyInfo.fsproj")]
+    [TestCase("-updateProjectFiles")]
+    public void UpdateProjectTrue(string command)
+    {
+        var arguments = this.argumentParser.ParseArguments(command);
+        arguments.UpdateProjectFiles.ShouldBe(true);
+    }
 
-        [TestCase("-updateAssemblyInfo false")]
-        [TestCase("-updateAssemblyInfo 0")]
-        public void UpdateAssemblyInfoFalse(string command)
-        {
-            var arguments = this.argumentParser.ParseArguments(command);
-            arguments.UpdateAssemblyInfo.ShouldBe(false);
-        }
+    [TestCase("-updateAssemblyInfo false")]
+    [TestCase("-updateAssemblyInfo 0")]
+    public void UpdateAssemblyInfoFalse(string command)
+    {
+        var arguments = this.argumentParser.ParseArguments(command);
+        arguments.UpdateAssemblyInfo.ShouldBe(false);
+    }
 
-        [TestCase("-updateAssemblyInfo Assembly.cs Assembly1.cs -ensureassemblyinfo")]
-        public void CreateMulitpleAssemblyInfoProtected(string command)
-        {
-            var exception = Assert.Throws<WarningException>(() => this.argumentParser.ParseArguments(command));
-            exception.Message.ShouldBe("Can't specify multiple assembly info files when using /ensureassemblyinfo switch, either use a single assembly info file or do not specify /ensureassemblyinfo and create assembly info files manually");
-        }
+    [TestCase("-updateAssemblyInfo Assembly.cs Assembly1.cs -ensureassemblyinfo")]
+    public void CreateMulitpleAssemblyInfoProtected(string command)
+    {
+        var exception = Assert.Throws<WarningException>(() => this.argumentParser.ParseArguments(command));
+        exception.Message.ShouldBe("Can't specify multiple assembly info files when using /ensureassemblyinfo switch, either use a single assembly info file or do not specify /ensureassemblyinfo and create assembly info files manually");
+    }
 
-        [TestCase("-updateProjectFiles Assembly.csproj -ensureassemblyinfo")]
-        public void UpdateProjectInfoWithEnsureAssemblyInfoProtected(string command)
-        {
-            var exception = Assert.Throws<WarningException>(() => this.argumentParser.ParseArguments(command));
-            exception.Message.ShouldBe("Cannot specify -ensureassemblyinfo with updateprojectfiles: please ensure your project file exists before attempting to update it");
-        }
+    [TestCase("-updateProjectFiles Assembly.csproj -ensureassemblyinfo")]
+    public void UpdateProjectInfoWithEnsureAssemblyInfoProtected(string command)
+    {
+        var exception = Assert.Throws<WarningException>(() => this.argumentParser.ParseArguments(command));
+        exception.Message.ShouldBe("Cannot specify -ensureassemblyinfo with updateprojectfiles: please ensure your project file exists before attempting to update it");
+    }
 
-        [Test]
-        public void UpdateAssemblyInfoWithFilename()
-        {
-            using var repo = new EmptyRepositoryFixture();
+    [Test]
+    public void UpdateAssemblyInfoWithFilename()
+    {
+        using var repo = new EmptyRepositoryFixture();
 
-            var assemblyFile = Path.Combine(repo.RepositoryPath, "CommonAssemblyInfo.cs");
-            using var file = File.Create(assemblyFile);
+        var assemblyFile = Path.Combine(repo.RepositoryPath, "CommonAssemblyInfo.cs");
+        using var file = File.Create(assemblyFile);
 
-            var arguments = this.argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateAssemblyInfo CommonAssemblyInfo.cs");
-            arguments.UpdateAssemblyInfo.ShouldBe(true);
-            arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(1);
-            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
-        }
+        var arguments = this.argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateAssemblyInfo CommonAssemblyInfo.cs");
+        arguments.UpdateAssemblyInfo.ShouldBe(true);
+        arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(1);
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
+    }
 
-        [Test]
-        public void UpdateAssemblyInfoWithMultipleFilenames()
-        {
-            using var repo = new EmptyRepositoryFixture();
+    [Test]
+    public void UpdateAssemblyInfoWithMultipleFilenames()
+    {
+        using var repo = new EmptyRepositoryFixture();
 
-            var assemblyFile1 = Path.Combine(repo.RepositoryPath, "CommonAssemblyInfo.cs");
-            using var file = File.Create(assemblyFile1);
+        var assemblyFile1 = Path.Combine(repo.RepositoryPath, "CommonAssemblyInfo.cs");
+        using var file = File.Create(assemblyFile1);
 
-            var assemblyFile2 = Path.Combine(repo.RepositoryPath, "VersionAssemblyInfo.cs");
-            using var file2 = File.Create(assemblyFile2);
+        var assemblyFile2 = Path.Combine(repo.RepositoryPath, "VersionAssemblyInfo.cs");
+        using var file2 = File.Create(assemblyFile2);
 
-            var arguments = this.argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateAssemblyInfo CommonAssemblyInfo.cs VersionAssemblyInfo.cs");
-            arguments.UpdateAssemblyInfo.ShouldBe(true);
-            arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(2);
-            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
-            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("VersionAssemblyInfo.cs"));
-        }
+        var arguments = this.argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateAssemblyInfo CommonAssemblyInfo.cs VersionAssemblyInfo.cs");
+        arguments.UpdateAssemblyInfo.ShouldBe(true);
+        arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(2);
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("VersionAssemblyInfo.cs"));
+    }
 
-        [Test]
-        public void UpdateProjectFilesWithMultipleFilenames()
-        {
-            using var repo = new EmptyRepositoryFixture();
+    [Test]
+    public void UpdateProjectFilesWithMultipleFilenames()
+    {
+        using var repo = new EmptyRepositoryFixture();
 
-            var assemblyFile1 = Path.Combine(repo.RepositoryPath, "CommonAssemblyInfo.csproj");
-            using var file = File.Create(assemblyFile1);
+        var assemblyFile1 = Path.Combine(repo.RepositoryPath, "CommonAssemblyInfo.csproj");
+        using var file = File.Create(assemblyFile1);
 
-            var assemblyFile2 = Path.Combine(repo.RepositoryPath, "VersionAssemblyInfo.csproj");
-            using var file2 = File.Create(assemblyFile2);
+        var assemblyFile2 = Path.Combine(repo.RepositoryPath, "VersionAssemblyInfo.csproj");
+        using var file2 = File.Create(assemblyFile2);
 
-            var arguments = this.argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateProjectFiles CommonAssemblyInfo.csproj VersionAssemblyInfo.csproj");
-            arguments.UpdateProjectFiles.ShouldBe(true);
-            arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(2);
-            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.csproj"));
-            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("VersionAssemblyInfo.csproj"));
-        }
+        var arguments = this.argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateProjectFiles CommonAssemblyInfo.csproj VersionAssemblyInfo.csproj");
+        arguments.UpdateProjectFiles.ShouldBe(true);
+        arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(2);
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.csproj"));
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("VersionAssemblyInfo.csproj"));
+    }
 
-        [Test]
-        public void UpdateAssemblyInfoWithMultipleFilenamesMatchingGlobbing()
-        {
-            using var repo = new EmptyRepositoryFixture();
+    [Test]
+    public void UpdateAssemblyInfoWithMultipleFilenamesMatchingGlobbing()
+    {
+        using var repo = new EmptyRepositoryFixture();
 
-            var assemblyFile1 = Path.Combine(repo.RepositoryPath, "CommonAssemblyInfo.cs");
-            using var file = File.Create(assemblyFile1);
+        var assemblyFile1 = Path.Combine(repo.RepositoryPath, "CommonAssemblyInfo.cs");
+        using var file = File.Create(assemblyFile1);
 
-            var assemblyFile2 = Path.Combine(repo.RepositoryPath, "VersionAssemblyInfo.cs");
-            using var file2 = File.Create(assemblyFile2);
+        var assemblyFile2 = Path.Combine(repo.RepositoryPath, "VersionAssemblyInfo.cs");
+        using var file2 = File.Create(assemblyFile2);
 
-            var subdir = Path.Combine(repo.RepositoryPath, "subdir");
-            Directory.CreateDirectory(subdir);
-            var assemblyFile3 = Path.Combine(subdir, "LocalAssemblyInfo.cs");
-            using var file3 = File.Create(assemblyFile3);
+        var subdir = Path.Combine(repo.RepositoryPath, "subdir");
+        Directory.CreateDirectory(subdir);
+        var assemblyFile3 = Path.Combine(subdir, "LocalAssemblyInfo.cs");
+        using var file3 = File.Create(assemblyFile3);
 
-            var arguments = this.argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateAssemblyInfo **/*AssemblyInfo.cs");
-            arguments.UpdateAssemblyInfo.ShouldBe(true);
-            arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(3);
-            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
-            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("VersionAssemblyInfo.cs"));
-            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("LocalAssemblyInfo.cs"));
-        }
+        var arguments = this.argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateAssemblyInfo **/*AssemblyInfo.cs");
+        arguments.UpdateAssemblyInfo.ShouldBe(true);
+        arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(3);
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("VersionAssemblyInfo.cs"));
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("LocalAssemblyInfo.cs"));
+    }
 
-        [Test]
-        public void UpdateAssemblyInfoWithRelativeFilename()
-        {
-            using var repo = new EmptyRepositoryFixture();
+    [Test]
+    public void UpdateAssemblyInfoWithRelativeFilename()
+    {
+        using var repo = new EmptyRepositoryFixture();
 
-            var assemblyFile = Path.Combine(repo.RepositoryPath, "CommonAssemblyInfo.cs");
-            using var file = File.Create(assemblyFile);
+        var assemblyFile = Path.Combine(repo.RepositoryPath, "CommonAssemblyInfo.cs");
+        using var file = File.Create(assemblyFile);
 
-            var targetPath = Path.Combine(repo.RepositoryPath, "subdir1", "subdir2");
-            Directory.CreateDirectory(targetPath);
+        var targetPath = Path.Combine(repo.RepositoryPath, "subdir1", "subdir2");
+        Directory.CreateDirectory(targetPath);
 
-            var arguments = this.argumentParser.ParseArguments($"-targetpath {targetPath} -updateAssemblyInfo ..\\..\\CommonAssemblyInfo.cs");
-            arguments.UpdateAssemblyInfo.ShouldBe(true);
-            arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(1);
-            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
-        }
+        var arguments = this.argumentParser.ParseArguments($"-targetpath {targetPath} -updateAssemblyInfo ..\\..\\CommonAssemblyInfo.cs");
+        arguments.UpdateAssemblyInfo.ShouldBe(true);
+        arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(1);
+        arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
+    }
 
-        [Test]
-        public void OverrideconfigWithNoOptions()
-        {
-            var arguments = this.argumentParser.ParseArguments("/overrideconfig");
-            arguments.OverrideConfig.ShouldBeNull();
-        }
+    [Test]
+    public void OverrideconfigWithNoOptions()
+    {
+        var arguments = this.argumentParser.ParseArguments("/overrideconfig");
+        arguments.OverrideConfig.ShouldBeNull();
+    }
 
-        [TestCaseSource(nameof(OverrideconfigWithInvalidOptionTestData))]
-        public string OverrideconfigWithInvalidOption(string options)
-        {
-            var exception = Assert.Throws<WarningException>(() => this.argumentParser.ParseArguments($"/overrideconfig {options}"));
-            return exception.Message;
-        }
+    [TestCaseSource(nameof(OverrideconfigWithInvalidOptionTestData))]
+    public string OverrideconfigWithInvalidOption(string options)
+    {
+        var exception = Assert.Throws<WarningException>(() => this.argumentParser.ParseArguments($"/overrideconfig {options}"));
+        return exception.Message;
+    }
 
-        private static IEnumerable<TestCaseData> OverrideconfigWithInvalidOptionTestData()
-        {
-            yield return new TestCaseData("tag-prefix=sample=asdf")
+    private static IEnumerable<TestCaseData> OverrideconfigWithInvalidOptionTestData()
+    {
+        yield return new TestCaseData("tag-prefix=sample=asdf")
+        {
+            ExpectedResult = "Could not parse /overrideconfig option: tag-prefix=sample=asdf. Ensure it is in format 'key=value'."
+        };
+        yield return new TestCaseData("unknown-option=25")
+        {
+            ExpectedResult = "Could not parse /overrideconfig option: unknown-option=25. Unsuported 'key'."
+        };
+        yield return new TestCaseData("update-build-number=1")
+        {
+            ExpectedResult = "Could not parse /overrideconfig option: update-build-number=1. Ensure that 'value' is 'true' or 'false'."
+        };
+        yield return new TestCaseData("tag-pre-release-weight=invalid-value")
+        {
+            ExpectedResult = "Could not parse /overrideconfig option: tag-pre-release-weight=invalid-value. Ensure that 'value' is valid integer number."
+        };
+        yield return new TestCaseData("assembly-versioning-scheme=WrongEnumValue")
+        {
+            ExpectedResult = $"Could not parse /overrideconfig option: assembly-versioning-scheme=WrongEnumValue. Ensure that 'value' is valid for specified 'key' enumeration: {System.Environment.NewLine}" +
+                             $"MajorMinorPatchTag{System.Environment.NewLine}" +
+                             $"MajorMinorPatch{System.Environment.NewLine}" +
+                             $"MajorMinor{System.Environment.NewLine}" +
+                             $"Major{System.Environment.NewLine}" +
+                             $"None{System.Environment.NewLine}"
+        };
+    }
+
+    [TestCaseSource(nameof(OverrideconfigWithSingleOptionTestData))]
+    public void OverrideconfigWithSingleOptions(string options, Config expected)
+    {
+        var arguments = this.argumentParser.ParseArguments($"/overrideconfig {options}");
+        arguments.OverrideConfig.ShouldBeEquivalentTo(expected);
+    }
+
+    private static IEnumerable<TestCaseData> OverrideconfigWithSingleOptionTestData()
+    {
+        yield return new TestCaseData(
+            "assembly-versioning-scheme=MajorMinor",
+            new Config
             {
-                ExpectedResult = "Could not parse /overrideconfig option: tag-prefix=sample=asdf. Ensure it is in format 'key=value'."
-            };
-            yield return new TestCaseData("unknown-option=25")
+                AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinor,
+            }
+        );
+        yield return new TestCaseData(
+            "assembly-file-versioning-scheme=\"MajorMinorPatch\"",
+            new Config
             {
-                ExpectedResult = "Could not parse /overrideconfig option: unknown-option=25. Unsuported 'key'."
-            };
-            yield return new TestCaseData("update-build-number=1")
+                AssemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,
+            }
+        );
+        yield return new TestCaseData(
+            "assembly-informational-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\"",
+            new Config
             {
-                ExpectedResult = "Could not parse /overrideconfig option: update-build-number=1. Ensure that 'value' is 'true' or 'false'."
-            };
-            yield return new TestCaseData("tag-pre-release-weight=invalid-value")
+                AssemblyInformationalFormat = "{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}",
+            }
+        );
+        yield return new TestCaseData(
+            "assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\"",
+            new Config
             {
-                ExpectedResult = "Could not parse /overrideconfig option: tag-pre-release-weight=invalid-value. Ensure that 'value' is valid integer number."
-            };
-            yield return new TestCaseData("assembly-versioning-scheme=WrongEnumValue")
+                AssemblyVersioningFormat = "{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}",
+            }
+        );
+        yield return new TestCaseData(
+            "assembly-file-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\"",
+            new Config
             {
-                ExpectedResult = $"Could not parse /overrideconfig option: assembly-versioning-scheme=WrongEnumValue. Ensure that 'value' is valid for specified 'key' enumeration: {System.Environment.NewLine}" +
-                    $"MajorMinorPatchTag{System.Environment.NewLine}" +
-                    $"MajorMinorPatch{System.Environment.NewLine}" +
-                    $"MajorMinor{System.Environment.NewLine}" +
-                    $"Major{System.Environment.NewLine}" +
-                    $"None{System.Environment.NewLine}"
-            };
-        }
-
-        [TestCaseSource(nameof(OverrideconfigWithSingleOptionTestData))]
-        public void OverrideconfigWithSingleOptions(string options, Config expected)
-        {
-            var arguments = this.argumentParser.ParseArguments($"/overrideconfig {options}");
-            arguments.OverrideConfig.ShouldBeEquivalentTo(expected);
-        }
+                AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}",
+            }
+        );
+        yield return new TestCaseData(
+            "mode=ContinuousDelivery",
+            new Config
+            {
+                VersioningMode = GitVersion.VersionCalculation.VersioningMode.ContinuousDelivery
+            }
+        );
+        yield return new TestCaseData(
+            "tag-prefix=sample",
+            new Config
+            {
+                TagPrefix = "sample"
+            }
+        );
+        yield return new TestCaseData(
+            "continuous-delivery-fallback-tag=cd-tag",
+            new Config
+            {
+                ContinuousDeploymentFallbackTag = "cd-tag"
+            }
+        );
+        yield return new TestCaseData(
+            "next-version=1",
+            new Config
+            {
+                NextVersion = "1"
+            }
+        );
+        yield return new TestCaseData(
+            "major-version-bump-message=\"This is major version bump message.\"",
+            new Config
+            {
+                MajorVersionBumpMessage = "This is major version bump message."
+            }
+        );
+        yield return new TestCaseData(
+            "minor-version-bump-message=\"This is minor version bump message.\"",
+            new Config
+            {
+                MinorVersionBumpMessage = "This is minor version bump message."
+            }
+        );
+        yield return new TestCaseData(
+            "patch-version-bump-message=\"This is patch version bump message.\"",
+            new Config
+            {
+                PatchVersionBumpMessage = "This is patch version bump message."
+            }
+        );
+        yield return new TestCaseData(
+            "no-bump-message=\"This is no bump message.\"",
+            new Config
+            {
+                NoBumpMessage = "This is no bump message."
+            }
+        );
+        yield return new TestCaseData(
+            "legacy-semver-padding=99",
+            new Config
+            {
+                LegacySemVerPadding = 99
+            }
+        );
+        yield return new TestCaseData(
+            "build-metadata-padding=30",
+            new Config
+            {
+                BuildMetaDataPadding = 30
+            }
+        );
+        yield return new TestCaseData(
+            "commits-since-version-source-padding=5",
+            new Config
+            {
+                CommitsSinceVersionSourcePadding = 5
+            }
+        );
+        yield return new TestCaseData(
+            "tag-pre-release-weight=2",
+            new Config
+            {
+                TagPreReleaseWeight = 2
+            }
+        );
+        yield return new TestCaseData(
+            "commit-message-incrementing=MergeMessageOnly",
+            new Config
+            {
+                CommitMessageIncrementing = CommitMessageIncrementMode.MergeMessageOnly
+            }
+        );
+        yield return new TestCaseData(
+            "increment=Minor",
+            new Config
+            {
+                Increment = IncrementStrategy.Minor
+            }
+        );
+        yield return new TestCaseData(
+            "commit-date-format=\"MM/dd/yyyy h:mm tt\"",
+            new Config
+            {
+                CommitDateFormat = "MM/dd/yyyy h:mm tt"
+            }
+        );
+        yield return new TestCaseData(
+            "update-build-number=true",
+            new Config
+            {
+                UpdateBuildNumber = true
+            }
+        );
+    }
 
-        private static IEnumerable<TestCaseData> OverrideconfigWithSingleOptionTestData()
-        {
-            yield return new TestCaseData(
-               "assembly-versioning-scheme=MajorMinor",
-               new Config
-               {
-                   AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinor,
-               }
-           );
-            yield return new TestCaseData(
-               "assembly-file-versioning-scheme=\"MajorMinorPatch\"",
-               new Config
-               {
-                   AssemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,
-               }
-            );
-            yield return new TestCaseData(
-               "assembly-informational-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\"",
-               new Config
-               {
-                   AssemblyInformationalFormat = "{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}",
-               }
-            );
-            yield return new TestCaseData(
-               "assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\"",
-               new Config
-               {
-                   AssemblyVersioningFormat = "{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}",
-               }
-            );
-            yield return new TestCaseData(
-               "assembly-file-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\"",
-               new Config
-               {
-                   AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}",
-               }
-            );
-            yield return new TestCaseData(
-               "mode=ContinuousDelivery",
-               new Config
-               {
-                   VersioningMode = GitVersion.VersionCalculation.VersioningMode.ContinuousDelivery
-               }
-            );
-            yield return new TestCaseData(
-               "tag-prefix=sample",
-               new Config
-               {
-                   TagPrefix = "sample"
-               }
-            );
-            yield return new TestCaseData(
-               "continuous-delivery-fallback-tag=cd-tag",
-               new Config
-               {
-                   ContinuousDeploymentFallbackTag = "cd-tag"
-               }
-            );
-            yield return new TestCaseData(
-               "next-version=1",
-               new Config
-               {
-                   NextVersion = "1"
-               }
-            );
-            yield return new TestCaseData(
-               "major-version-bump-message=\"This is major version bump message.\"",
-               new Config
-               {
-                   MajorVersionBumpMessage = "This is major version bump message."
-               }
-            );
-            yield return new TestCaseData(
-               "minor-version-bump-message=\"This is minor version bump message.\"",
-               new Config
-               {
-                   MinorVersionBumpMessage = "This is minor version bump message."
-               }
-            );
-            yield return new TestCaseData(
-               "patch-version-bump-message=\"This is patch version bump message.\"",
-               new Config
-               {
-                   PatchVersionBumpMessage = "This is patch version bump message."
-               }
-            );
-            yield return new TestCaseData(
-               "no-bump-message=\"This is no bump message.\"",
-               new Config
-               {
-                   NoBumpMessage = "This is no bump message."
-               }
-            );
-            yield return new TestCaseData(
-               "legacy-semver-padding=99",
-               new Config
-               {
-                   LegacySemVerPadding = 99
-               }
-            );
-            yield return new TestCaseData(
-               "build-metadata-padding=30",
-               new Config
-               {
-                   BuildMetaDataPadding = 30
-               }
-            );
-            yield return new TestCaseData(
-               "commits-since-version-source-padding=5",
-               new Config
-               {
-                   CommitsSinceVersionSourcePadding = 5
-               }
-            );
-            yield return new TestCaseData(
-               "tag-pre-release-weight=2",
-               new Config
-               {
-                   TagPreReleaseWeight = 2
-               }
-            );
-            yield return new TestCaseData(
-               "commit-message-incrementing=MergeMessageOnly",
-               new Config
-               {
-                   CommitMessageIncrementing = CommitMessageIncrementMode.MergeMessageOnly
-               }
-            );
-            yield return new TestCaseData(
-               "increment=Minor",
-               new Config
-               {
-                   Increment = IncrementStrategy.Minor
-               }
-            );
-            yield return new TestCaseData(
-               "commit-date-format=\"MM/dd/yyyy h:mm tt\"",
-               new Config
-               {
-                   CommitDateFormat = "MM/dd/yyyy h:mm tt"
-               }
-            );
-            yield return new TestCaseData(
-               "update-build-number=true",
-               new Config
-               {
-                   UpdateBuildNumber = true
-               }
-            );
-        }
+    [TestCaseSource(nameof(OverrideconfigWithMultipleOptionsTestData))]
+    public void OverrideconfigWithMultipleOptions(string options, Config expected)
+    {
+        var arguments = this.argumentParser.ParseArguments(options);
+        arguments.OverrideConfig.ShouldBeEquivalentTo(expected);
+    }
 
-        [TestCaseSource(nameof(OverrideconfigWithMultipleOptionsTestData))]
-        public void OverrideconfigWithMultipleOptions(string options, Config expected)
-        {
-            var arguments = this.argumentParser.ParseArguments(options);
-            arguments.OverrideConfig.ShouldBeEquivalentTo(expected);
-        }
+    private static IEnumerable<TestCaseData> OverrideconfigWithMultipleOptionsTestData()
+    {
+        yield return new TestCaseData(
+            "/overrideconfig tag-prefix=sample /overrideconfig assembly-versioning-scheme=MajorMinor",
+            new Config
+            {
+                TagPrefix = "sample",
+                AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinor,
+            }
+        );
+        yield return new TestCaseData(
+            "/overrideconfig tag-prefix=sample /overrideconfig assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\"",
+            new Config
+            {
+                TagPrefix = "sample",
+                AssemblyVersioningFormat = "{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}"
+            }
+        );
+        yield return new TestCaseData(
+            "/overrideconfig tag-prefix=sample /overrideconfig assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\" /overrideconfig update-build-number=true /overrideconfig assembly-versioning-scheme=MajorMinorPatchTag /overrideconfig mode=ContinuousDelivery /overrideconfig tag-pre-release-weight=4",
+            new Config
+            {
+                TagPrefix = "sample",
+                AssemblyVersioningFormat = "{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}",
+                UpdateBuildNumber = true,
+                AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
+                VersioningMode = GitVersion.VersionCalculation.VersioningMode.ContinuousDelivery,
+                TagPreReleaseWeight = 4
+            }
+        );
+    }
 
-        private static IEnumerable<TestCaseData> OverrideconfigWithMultipleOptionsTestData()
-        {
-            yield return new TestCaseData(
-               "/overrideconfig tag-prefix=sample /overrideconfig assembly-versioning-scheme=MajorMinor",
-               new Config
-               {
-                   TagPrefix = "sample",
-                   AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinor,
-               }
-            );
-            yield return new TestCaseData(
-                "/overrideconfig tag-prefix=sample /overrideconfig assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\"",
-                new Config
-                {
-                    TagPrefix = "sample",
-                    AssemblyVersioningFormat = "{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}"
-                }
-            );
-            yield return new TestCaseData(
-                "/overrideconfig tag-prefix=sample /overrideconfig assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\" /overrideconfig update-build-number=true /overrideconfig assembly-versioning-scheme=MajorMinorPatchTag /overrideconfig mode=ContinuousDelivery /overrideconfig tag-pre-release-weight=4",
-                new Config
-                {
-                    TagPrefix = "sample",
-                    AssemblyVersioningFormat = "{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}",
-                    UpdateBuildNumber = true,
-                    AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
-                    VersioningMode = GitVersion.VersionCalculation.VersioningMode.ContinuousDelivery,
-                    TagPreReleaseWeight = 4
-                }
-            );
-        }
+    [Test]
+    public void EnsureAssemblyInfoTrueWhenFound()
+    {
+        var arguments = this.argumentParser.ParseArguments("-ensureAssemblyInfo");
+        arguments.EnsureAssemblyInfo.ShouldBe(true);
+    }
 
-        [Test]
-        public void EnsureAssemblyInfoTrueWhenFound()
-        {
-            var arguments = this.argumentParser.ParseArguments("-ensureAssemblyInfo");
-            arguments.EnsureAssemblyInfo.ShouldBe(true);
-        }
+    [Test]
+    public void EnsureAssemblyInfoTrue()
+    {
+        var arguments = this.argumentParser.ParseArguments("-ensureAssemblyInfo true");
+        arguments.EnsureAssemblyInfo.ShouldBe(true);
+    }
 
-        [Test]
-        public void EnsureAssemblyInfoTrue()
-        {
-            var arguments = this.argumentParser.ParseArguments("-ensureAssemblyInfo true");
-            arguments.EnsureAssemblyInfo.ShouldBe(true);
-        }
+    [Test]
+    public void EnsureAssemblyInfoFalse()
+    {
+        var arguments = this.argumentParser.ParseArguments("-ensureAssemblyInfo false");
+        arguments.EnsureAssemblyInfo.ShouldBe(false);
+    }
 
-        [Test]
-        public void EnsureAssemblyInfoFalse()
-        {
-            var arguments = this.argumentParser.ParseArguments("-ensureAssemblyInfo false");
-            arguments.EnsureAssemblyInfo.ShouldBe(false);
-        }
+    [Test]
+    public void DynamicRepoLocation()
+    {
+        var arguments = this.argumentParser.ParseArguments("-dynamicRepoLocation c:\\foo\\");
+        arguments.DynamicRepositoryClonePath.ShouldBe("c:\\foo\\");
+    }
 
-        [Test]
-        public void DynamicRepoLocation()
-        {
-            var arguments = this.argumentParser.ParseArguments("-dynamicRepoLocation c:\\foo\\");
-            arguments.DynamicRepositoryClonePath.ShouldBe("c:\\foo\\");
-        }
+    [Test]
+    public void CanLogToConsole()
+    {
+        var arguments = this.argumentParser.ParseArguments("-l console");
+        arguments.LogFilePath.ShouldBe("console");
+    }
 
-        [Test]
-        public void CanLogToConsole()
-        {
-            var arguments = this.argumentParser.ParseArguments("-l console");
-            arguments.LogFilePath.ShouldBe("console");
-        }
+    [Test]
+    public void NofetchTrueWhenDefined()
+    {
+        var arguments = this.argumentParser.ParseArguments("-nofetch");
+        arguments.NoFetch.ShouldBe(true);
+    }
 
-        [Test]
-        public void NofetchTrueWhenDefined()
-        {
-            var arguments = this.argumentParser.ParseArguments("-nofetch");
-            arguments.NoFetch.ShouldBe(true);
-        }
+    [Test]
+    public void NonormilizeTrueWhenDefined()
+    {
+        var arguments = this.argumentParser.ParseArguments("-nonormalize");
+        arguments.NoNormalize.ShouldBe(true);
+    }
 
-        [Test]
-        public void NonormilizeTrueWhenDefined()
-        {
-            var arguments = this.argumentParser.ParseArguments("-nonormalize");
-            arguments.NoNormalize.ShouldBe(true);
-        }
+    [Test]
+    public void OtherArgumentsCanBeParsedBeforeNofetch()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetpath -nofetch ");
+        arguments.TargetPath.ShouldBe("targetpath");
+        arguments.NoFetch.ShouldBe(true);
+    }
 
-        [Test]
-        public void OtherArgumentsCanBeParsedBeforeNofetch()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetpath -nofetch ");
-            arguments.TargetPath.ShouldBe("targetpath");
-            arguments.NoFetch.ShouldBe(true);
-        }
+    [Test]
+    public void OtherArgumentsCanBeParsedBeforeNonormalize()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetpath -nonormalize");
+        arguments.TargetPath.ShouldBe("targetpath");
+        arguments.NoNormalize.ShouldBe(true);
+    }
 
-        [Test]
-        public void OtherArgumentsCanBeParsedBeforeNonormalize()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetpath -nonormalize");
-            arguments.TargetPath.ShouldBe("targetpath");
-            arguments.NoNormalize.ShouldBe(true);
-        }
+    [Test]
+    public void OtherArgumentsCanBeParsedBeforeNocache()
+    {
+        var arguments = this.argumentParser.ParseArguments("targetpath -nocache");
+        arguments.TargetPath.ShouldBe("targetpath");
+        arguments.NoCache.ShouldBe(true);
+    }
 
-        [Test]
-        public void OtherArgumentsCanBeParsedBeforeNocache()
-        {
-            var arguments = this.argumentParser.ParseArguments("targetpath -nocache");
-            arguments.TargetPath.ShouldBe("targetpath");
-            arguments.NoCache.ShouldBe(true);
-        }
+    [TestCase("-nofetch -nonormalize -nocache")]
+    [TestCase("-nofetch -nocache -nonormalize")]
+    [TestCase("-nocache -nofetch -nonormalize")]
+    [TestCase("-nocache -nonormalize -nofetch")]
+    [TestCase("-nonormalize -nocache -nofetch")]
+    [TestCase("-nonormalize -nofetch -nocache")]
+    public void SeveralSwitchesCanBeParsed(string commandLineArgs)
+    {
+        var arguments = this.argumentParser.ParseArguments(commandLineArgs);
+        arguments.NoCache.ShouldBe(true);
+        arguments.NoNormalize.ShouldBe(true);
+        arguments.NoFetch.ShouldBe(true);
+    }
 
-        [TestCase("-nofetch -nonormalize -nocache")]
-        [TestCase("-nofetch -nocache -nonormalize")]
-        [TestCase("-nocache -nofetch -nonormalize")]
-        [TestCase("-nocache -nonormalize -nofetch")]
-        [TestCase("-nonormalize -nocache -nofetch")]
-        [TestCase("-nonormalize -nofetch -nocache")]
-        public void SeveralSwitchesCanBeParsed(string commandLineArgs)
-        {
-            var arguments = this.argumentParser.ParseArguments(commandLineArgs);
-            arguments.NoCache.ShouldBe(true);
-            arguments.NoNormalize.ShouldBe(true);
-            arguments.NoFetch.ShouldBe(true);
-        }
+    [Test]
+    public void LogPathCanContainForwardSlash()
+    {
+        var arguments = this.argumentParser.ParseArguments("-l /some/path");
+        arguments.LogFilePath.ShouldBe("/some/path");
+    }
 
-        [Test]
-        public void LogPathCanContainForwardSlash()
-        {
-            var arguments = this.argumentParser.ParseArguments("-l /some/path");
-            arguments.LogFilePath.ShouldBe("/some/path");
-        }
+    [Test]
+    public void BooleanArgumentHandling()
+    {
+        var arguments = this.argumentParser.ParseArguments("/nofetch /updateassemblyinfo true");
+        arguments.NoFetch.ShouldBe(true);
+        arguments.UpdateAssemblyInfo.ShouldBe(true);
+    }
 
-        [Test]
-        public void BooleanArgumentHandling()
-        {
-            var arguments = this.argumentParser.ParseArguments("/nofetch /updateassemblyinfo true");
-            arguments.NoFetch.ShouldBe(true);
-            arguments.UpdateAssemblyInfo.ShouldBe(true);
-        }
+    [Test]
+    public void NocacheTrueWhenDefined()
+    {
+        var arguments = this.argumentParser.ParseArguments("-nocache");
+        arguments.NoCache.ShouldBe(true);
+    }
 
-        [Test]
-        public void NocacheTrueWhenDefined()
+    [TestCase("-verbosity x", true, Verbosity.Normal)]
+    [TestCase("-verbosity diagnostic", false, Verbosity.Diagnostic)]
+    [TestCase("-verbosity Minimal", false, Verbosity.Minimal)]
+    [TestCase("-verbosity NORMAL", false, Verbosity.Normal)]
+    [TestCase("-verbosity quiet", false, Verbosity.Quiet)]
+    [TestCase("-verbosity Verbose", false, Verbosity.Verbose)]
+    public void CheckVerbosityParsing(string command, bool shouldThrow, Verbosity expectedVerbosity)
+    {
+        if (shouldThrow)
         {
-            var arguments = this.argumentParser.ParseArguments("-nocache");
-            arguments.NoCache.ShouldBe(true);
+            Assert.Throws<WarningException>(() => this.argumentParser.ParseArguments(command));
         }
-
-        [TestCase("-verbosity x", true, Verbosity.Normal)]
-        [TestCase("-verbosity diagnostic", false, Verbosity.Diagnostic)]
-        [TestCase("-verbosity Minimal", false, Verbosity.Minimal)]
-        [TestCase("-verbosity NORMAL", false, Verbosity.Normal)]
-        [TestCase("-verbosity quiet", false, Verbosity.Quiet)]
-        [TestCase("-verbosity Verbose", false, Verbosity.Verbose)]
-        public void CheckVerbosityParsing(string command, bool shouldThrow, Verbosity expectedVerbosity)
+        else
         {
-            if (shouldThrow)
-            {
-                Assert.Throws<WarningException>(() => this.argumentParser.ParseArguments(command));
-            }
-            else
-            {
-                var arguments = this.argumentParser.ParseArguments(command);
-                arguments.Verbosity.ShouldBe(expectedVerbosity);
-            }
+            var arguments = this.argumentParser.ParseArguments(command);
+            arguments.Verbosity.ShouldBe(expectedVerbosity);
         }
+    }
 
-        [Test]
-        public void EmptyArgumentsRemoteUsernameDefinedSetsUsername()
-        {
-            this.environment.SetEnvironmentVariable("GITVERSION_REMOTE_USERNAME", "value");
-            var arguments = this.argumentParser.ParseArguments(string.Empty);
-            arguments.Authentication.Username.ShouldBe("value");
-        }
+    [Test]
+    public void EmptyArgumentsRemoteUsernameDefinedSetsUsername()
+    {
+        this.environment.SetEnvironmentVariable("GITVERSION_REMOTE_USERNAME", "value");
+        var arguments = this.argumentParser.ParseArguments(string.Empty);
+        arguments.Authentication.Username.ShouldBe("value");
+    }
 
-        [Test]
-        public void EmptyArgumentsRemotePasswordDefinedSetsPassword()
-        {
-            this.environment.SetEnvironmentVariable("GITVERSION_REMOTE_PASSWORD", "value");
-            var arguments = this.argumentParser.ParseArguments(string.Empty);
-            arguments.Authentication.Password.ShouldBe("value");
-        }
+    [Test]
+    public void EmptyArgumentsRemotePasswordDefinedSetsPassword()
+    {
+        this.environment.SetEnvironmentVariable("GITVERSION_REMOTE_PASSWORD", "value");
+        var arguments = this.argumentParser.ParseArguments(string.Empty);
+        arguments.Authentication.Password.ShouldBe("value");
+    }
 
-        [Test]
-        public void ArbitraryArgumentsRemoteUsernameDefinedSetsUsername()
-        {
-            this.environment.SetEnvironmentVariable("GITVERSION_REMOTE_USERNAME", "value");
-            var arguments = this.argumentParser.ParseArguments("-nocache");
-            arguments.Authentication.Username.ShouldBe("value");
-        }
+    [Test]
+    public void ArbitraryArgumentsRemoteUsernameDefinedSetsUsername()
+    {
+        this.environment.SetEnvironmentVariable("GITVERSION_REMOTE_USERNAME", "value");
+        var arguments = this.argumentParser.ParseArguments("-nocache");
+        arguments.Authentication.Username.ShouldBe("value");
+    }
 
-        [Test]
-        public void ArbitraryArgumentsRemotePasswordDefinedSetsPassword()
-        {
-            this.environment.SetEnvironmentVariable("GITVERSION_REMOTE_PASSWORD", "value");
-            var arguments = this.argumentParser.ParseArguments("-nocache");
-            arguments.Authentication.Password.ShouldBe("value");
-        }
+    [Test]
+    public void ArbitraryArgumentsRemotePasswordDefinedSetsPassword()
+    {
+        this.environment.SetEnvironmentVariable("GITVERSION_REMOTE_PASSWORD", "value");
+        var arguments = this.argumentParser.ParseArguments("-nocache");
+        arguments.Authentication.Password.ShouldBe("value");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/ExecCmdLineArgumentTest.cs b/src/GitVersion.App.Tests/ExecCmdLineArgumentTest.cs
index c20106d271..24421cc753 100644
--- a/src/GitVersion.App.Tests/ExecCmdLineArgumentTest.cs
+++ b/src/GitVersion.App.Tests/ExecCmdLineArgumentTest.cs
@@ -7,91 +7,90 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.App.Tests
+namespace GitVersion.App.Tests;
+
+[TestFixture]
+[Parallelizable(ParallelScope.None)]
+public class ExecCmdLineArgumentTest
 {
-    [TestFixture]
-    [Parallelizable(ParallelScope.None)]
-    public class ExecCmdLineArgumentTest
+    [Test]
+    public void InvalidArgumentsExitCodeShouldNotBeZero()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /invalid-argument");
+
+        result.ExitCode.ShouldNotBe(0);
+        result.Output.ShouldContain("Could not parse command line parameter '/invalid-argument'");
+    }
+
+    [Test]
+    public void LogPathContainsForwardSlash()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeATaggedCommit("1.2.3");
+        fixture.MakeACommit();
+
+        var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: @" /l ""/tmp/path""", logToFile: false);
+
+        result.ExitCode.ShouldBe(0);
+        result.Output.ShouldContain(@"""MajorMinorPatch"": ""1.2.4""");
+    }
+
+    [Theory]
+    [TestCase("", "INFO [")]
+    [TestCase("-verbosity NORMAL", "INFO [")]
+    [TestCase("-verbosity quiet", "")]
+    public void CheckBuildServerVerbosityConsole(string verbosityArg, string expectedOutput)
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeATaggedCommit("1.2.3");
+        fixture.MakeACommit();
+
+        var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: $@" {verbosityArg} -output buildserver /l ""/tmp/path""", logToFile: false);
+
+        result.ExitCode.ShouldBe(0);
+        result.Output.ShouldContain(expectedOutput);
+    }
+
+    [Test]
+    public void WorkingDirectoryWithoutGitFolderFailsWithInformativeMessage()
+    {
+        var result = GitVersionHelper.ExecuteIn(System.Environment.SystemDirectory, arguments: null, logToFile: false);
+
+        result.ExitCode.ShouldNotBe(0);
+        result.Output.ShouldContain("Cannot find the .git directory");
+    }
+
+    [Test]
+    public void WorkingDirectoryWithoutCommitsFailsWithInformativeMessage()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+
+        var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: null, logToFile: false);
+
+        result.ExitCode.ShouldNotBe(0);
+        result.Output.ShouldContain("No commits found on the current branch.");
+    }
+
+    [Test]
+    public void WorkingDirectoryDoesNotExistFailsWithInformativeMessage()
     {
-        [Test]
-        public void InvalidArgumentsExitCodeShouldNotBeZero()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /invalid-argument");
-
-            result.ExitCode.ShouldNotBe(0);
-            result.Output.ShouldContain("Could not parse command line parameter '/invalid-argument'");
-        }
-
-        [Test]
-        public void LogPathContainsForwardSlash()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeATaggedCommit("1.2.3");
-            fixture.MakeACommit();
-
-            var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: @" /l ""/tmp/path""", logToFile: false);
-
-            result.ExitCode.ShouldBe(0);
-            result.Output.ShouldContain(@"""MajorMinorPatch"": ""1.2.4""");
-        }
-
-        [Theory]
-        [TestCase("", "INFO [")]
-        [TestCase("-verbosity NORMAL", "INFO [")]
-        [TestCase("-verbosity quiet", "")]
-        public void CheckBuildServerVerbosityConsole(string verbosityArg, string expectedOutput)
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeATaggedCommit("1.2.3");
-            fixture.MakeACommit();
-
-            var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: $@" {verbosityArg} -output buildserver /l ""/tmp/path""", logToFile: false);
-
-            result.ExitCode.ShouldBe(0);
-            result.Output.ShouldContain(expectedOutput);
-        }
-
-        [Test]
-        public void WorkingDirectoryWithoutGitFolderFailsWithInformativeMessage()
-        {
-            var result = GitVersionHelper.ExecuteIn(System.Environment.SystemDirectory, arguments: null, logToFile: false);
-
-            result.ExitCode.ShouldNotBe(0);
-            result.Output.ShouldContain("Cannot find the .git directory");
-        }
-
-        [Test]
-        public void WorkingDirectoryWithoutCommitsFailsWithInformativeMessage()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-
-            var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: null, logToFile: false);
-
-            result.ExitCode.ShouldNotBe(0);
-            result.Output.ShouldContain("No commits found on the current branch.");
-        }
-
-        [Test]
-        public void WorkingDirectoryDoesNotExistFailsWithInformativeMessage()
-        {
-            var workingDirectory = Path.Combine(PathHelper.GetCurrentDirectory(), Guid.NewGuid().ToString("N"));
-            var executable = PathHelper.GetExecutable();
-
-            var output = new StringBuilder();
-            var args = PathHelper.GetExecutableArgs($" /targetpath {workingDirectory} ");
-
-            var exitCode = ProcessHelper.Run(
-                s => output.AppendLine(s),
-                s => output.AppendLine(s),
-                null,
-                executable,
-                args,
-                PathHelper.GetCurrentDirectory());
-
-            exitCode.ShouldNotBe(0);
-            var outputString = output.ToString();
-            outputString.ShouldContain($"The working directory '{workingDirectory}' does not exist.", Case.Insensitive, outputString);
-        }
+        var workingDirectory = Path.Combine(PathHelper.GetCurrentDirectory(), Guid.NewGuid().ToString("N"));
+        var executable = PathHelper.GetExecutable();
+
+        var output = new StringBuilder();
+        var args = PathHelper.GetExecutableArgs($" /targetpath {workingDirectory} ");
+
+        var exitCode = ProcessHelper.Run(
+            s => output.AppendLine(s),
+            s => output.AppendLine(s),
+            null,
+            executable,
+            args,
+            PathHelper.GetCurrentDirectory());
+
+        exitCode.ShouldNotBe(0);
+        var outputString = output.ToString();
+        outputString.ShouldContain($"The working directory '{workingDirectory}' does not exist.", Case.Insensitive, outputString);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/HelpWriterTests.cs b/src/GitVersion.App.Tests/HelpWriterTests.cs
index b287a13df3..89af3f30fe 100644
--- a/src/GitVersion.App.Tests/HelpWriterTests.cs
+++ b/src/GitVersion.App.Tests/HelpWriterTests.cs
@@ -6,57 +6,56 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.App.Tests
+namespace GitVersion.App.Tests;
+
+public class HelpWriterTests : TestBase
 {
-    public class HelpWriterTests : TestBase
+    private readonly IHelpWriter helpWriter;
+
+    public HelpWriterTests()
     {
-        private readonly IHelpWriter helpWriter;
+        var sp = ConfigureServices(services => services.AddModule(new GitVersionAppModule()));
+        this.helpWriter = sp.GetService<IHelpWriter>();
+    }
 
-        public HelpWriterTests()
+    [Test]
+    public void AllArgsAreInHelp()
+    {
+        var lookup = new Dictionary<string, string>
         {
-            var sp = ConfigureServices(services => services.AddModule(new GitVersionAppModule()));
-            this.helpWriter = sp.GetService<IHelpWriter>();
-        }
+            { nameof(Arguments.TargetUrl), "/url" },
+            { nameof(Arguments.Init), "init" },
+            { nameof(Arguments.TargetBranch), "/b" },
+            { nameof(Arguments.LogFilePath) , "/l" },
+            { nameof(Arguments.OutputFile) , "/outputfile" },
+            { nameof(Arguments.DynamicRepositoryClonePath), "/dynamicRepoLocation" },
+            { nameof(Arguments.IsHelp), "/?" },
+            { nameof(Arguments.IsVersion), "/version" },
+            { nameof(Arguments.UpdateWixVersionFile), "/updatewixversionfile" },
+            { nameof(Arguments.ConfigFile), "/config" },
+            { nameof(Arguments.Verbosity), "/verbosity" },
+            { nameof(Arguments.CommitId), "/c" },
+        };
+        string helpText = null;
 
-        [Test]
-        public void AllArgsAreInHelp()
-        {
-            var lookup = new Dictionary<string, string>
-            {
-                { nameof(Arguments.TargetUrl), "/url" },
-                { nameof(Arguments.Init), "init" },
-                { nameof(Arguments.TargetBranch), "/b" },
-                { nameof(Arguments.LogFilePath) , "/l" },
-                { nameof(Arguments.OutputFile) , "/outputfile" },
-                { nameof(Arguments.DynamicRepositoryClonePath), "/dynamicRepoLocation" },
-                { nameof(Arguments.IsHelp), "/?" },
-                { nameof(Arguments.IsVersion), "/version" },
-                { nameof(Arguments.UpdateWixVersionFile), "/updatewixversionfile" },
-                { nameof(Arguments.ConfigFile), "/config" },
-                { nameof(Arguments.Verbosity), "/verbosity" },
-                { nameof(Arguments.CommitId), "/c" },
-            };
-            string helpText = null;
-
-            this.helpWriter.WriteTo(s => helpText = s);
-
-            var ignored = new[]
-            {
-                nameof(Arguments.Authentication),
-            };
-            typeof(Arguments).GetFields()
-                .Select(p => p.Name)
-                .Where(p => IsNotInHelp(lookup, p, helpText))
-                .Except(ignored)
-                .ShouldBeEmpty();
-        }
-
-        private static bool IsNotInHelp(IReadOnlyDictionary<string, string> lookup, string propertyName, string helpText)
+        this.helpWriter.WriteTo(s => helpText = s);
+
+        var ignored = new[]
         {
-            if (lookup.ContainsKey(propertyName))
-                return !helpText.Contains(lookup[propertyName]);
+            nameof(Arguments.Authentication),
+        };
+        typeof(Arguments).GetFields()
+            .Select(p => p.Name)
+            .Where(p => IsNotInHelp(lookup, p, helpText))
+            .Except(ignored)
+            .ShouldBeEmpty();
+    }
+
+    private static bool IsNotInHelp(IReadOnlyDictionary<string, string> lookup, string propertyName, string helpText)
+    {
+        if (lookup.ContainsKey(propertyName))
+            return !helpText.Contains(lookup[propertyName]);
 
-            return !helpText.Contains("/" + propertyName.ToLower());
-        }
+        return !helpText.Contains("/" + propertyName.ToLower());
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs b/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs
index 1bd3ad410f..6bd61369ae 100644
--- a/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs
+++ b/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs
@@ -1,75 +1,74 @@
 using System.Text;
 using GitVersion.Extensions;
 
-namespace GitVersion.App.Tests
-{
-    public class ArgumentBuilder
-    {
-        public ArgumentBuilder(string workingDirectory) => this.workingDirectory = workingDirectory;
+namespace GitVersion.App.Tests;
 
-        public ArgumentBuilder(string workingDirectory, string exec, string execArgs, string projectFile, string projectArgs, string logFile)
-        {
-            this.workingDirectory = workingDirectory;
-            this.exec = exec;
-            this.execArgs = execArgs;
-            this.projectFile = projectFile;
-            this.projectArgs = projectArgs;
-            this.logFile = logFile;
-        }
-
-        public ArgumentBuilder(string workingDirectory, string additionalArguments, string logFile)
-        {
-            this.workingDirectory = workingDirectory;
-            this.additionalArguments = additionalArguments;
-            this.logFile = logFile;
-        }
+public class ArgumentBuilder
+{
+    public ArgumentBuilder(string workingDirectory) => this.workingDirectory = workingDirectory;
 
-        public string WorkingDirectory => this.workingDirectory;
+    public ArgumentBuilder(string workingDirectory, string exec, string execArgs, string projectFile, string projectArgs, string logFile)
+    {
+        this.workingDirectory = workingDirectory;
+        this.exec = exec;
+        this.execArgs = execArgs;
+        this.projectFile = projectFile;
+        this.projectArgs = projectArgs;
+        this.logFile = logFile;
+    }
 
-        public string LogFile => this.logFile;
+    public ArgumentBuilder(string workingDirectory, string additionalArguments, string logFile)
+    {
+        this.workingDirectory = workingDirectory;
+        this.additionalArguments = additionalArguments;
+        this.logFile = logFile;
+    }
 
-        public override string ToString()
-        {
-            var arguments = new StringBuilder();
+    public string WorkingDirectory => this.workingDirectory;
 
-            arguments.AppendFormat(" /targetpath \"{0}\"", this.workingDirectory);
+    public string LogFile => this.logFile;
 
-            if (!this.exec.IsNullOrWhiteSpace())
-            {
-                arguments.AppendFormat(" /exec \"{0}\"", this.exec);
-            }
+    public override string ToString()
+    {
+        var arguments = new StringBuilder();
 
-            if (!this.execArgs.IsNullOrWhiteSpace())
-            {
-                arguments.AppendFormat(" /execArgs \"{0}\"", this.execArgs);
-            }
+        arguments.AppendFormat(" /targetpath \"{0}\"", this.workingDirectory);
 
-            if (!this.projectFile.IsNullOrWhiteSpace())
-            {
-                arguments.AppendFormat(" /proj \"{0}\"", this.projectFile);
-            }
+        if (!this.exec.IsNullOrWhiteSpace())
+        {
+            arguments.AppendFormat(" /exec \"{0}\"", this.exec);
+        }
 
-            if (!this.projectArgs.IsNullOrWhiteSpace())
-            {
-                arguments.AppendFormat(" /projargs \"{0}\"", this.projectArgs);
-            }
+        if (!this.execArgs.IsNullOrWhiteSpace())
+        {
+            arguments.AppendFormat(" /execArgs \"{0}\"", this.execArgs);
+        }
 
-            if (!this.logFile.IsNullOrWhiteSpace())
-            {
-                arguments.AppendFormat(" /l \"{0}\"", this.logFile);
-            }
+        if (!this.projectFile.IsNullOrWhiteSpace())
+        {
+            arguments.AppendFormat(" /proj \"{0}\"", this.projectFile);
+        }
 
-            arguments.Append(this.additionalArguments);
+        if (!this.projectArgs.IsNullOrWhiteSpace())
+        {
+            arguments.AppendFormat(" /projargs \"{0}\"", this.projectArgs);
+        }
 
-            return arguments.ToString();
+        if (!this.logFile.IsNullOrWhiteSpace())
+        {
+            arguments.AppendFormat(" /l \"{0}\"", this.logFile);
         }
 
-        private readonly string additionalArguments;
-        private readonly string exec;
-        private readonly string execArgs;
-        private readonly string logFile;
-        private readonly string projectArgs;
-        private readonly string projectFile;
-        private readonly string workingDirectory;
+        arguments.Append(this.additionalArguments);
+
+        return arguments.ToString();
     }
-}
+
+    private readonly string additionalArguments;
+    private readonly string exec;
+    private readonly string execArgs;
+    private readonly string logFile;
+    private readonly string projectArgs;
+    private readonly string projectFile;
+    private readonly string workingDirectory;
+}
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/Helpers/ExecutionResults.cs b/src/GitVersion.App.Tests/Helpers/ExecutionResults.cs
index c1d0456048..2ec49dfa42 100644
--- a/src/GitVersion.App.Tests/Helpers/ExecutionResults.cs
+++ b/src/GitVersion.App.Tests/Helpers/ExecutionResults.cs
@@ -1,31 +1,30 @@
 using System;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.App.Tests
+namespace GitVersion.App.Tests;
+
+public class ExecutionResults
 {
-    public class ExecutionResults
+    public ExecutionResults(int exitCode, string output, string logContents)
     {
-        public ExecutionResults(int exitCode, string output, string logContents)
-        {
-            ExitCode = exitCode;
-            Output = output;
-            Log = logContents;
-        }
+        ExitCode = exitCode;
+        Output = output;
+        Log = logContents;
+    }
 
-        public int ExitCode { get; }
-        public string Output { get; }
-        public string Log { get; }
+    public int ExitCode { get; }
+    public string Output { get; }
+    public string Log { get; }
 
-        public virtual VersionVariables OutputVariables
+    public virtual VersionVariables OutputVariables
+    {
+        get
         {
-            get
-            {
-                var jsonStartIndex = Output.IndexOf("{", StringComparison.Ordinal);
-                var jsonEndIndex = Output.IndexOf("}", StringComparison.Ordinal);
-                var json = Output.Substring(jsonStartIndex, jsonEndIndex - jsonStartIndex + 1);
+            var jsonStartIndex = Output.IndexOf("{", StringComparison.Ordinal);
+            var jsonEndIndex = Output.IndexOf("}", StringComparison.Ordinal);
+            var json = Output.Substring(jsonStartIndex, jsonEndIndex - jsonStartIndex + 1);
 
-                return VersionVariables.FromJson(json);
-            }
+            return VersionVariables.FromJson(json);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs b/src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs
index e1552a0987..1d17390c78 100644
--- a/src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs
+++ b/src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs
@@ -8,113 +8,112 @@
 using GitVersion.Extensions;
 using GitVersion.Helpers;
 
-namespace GitVersion.App.Tests
+namespace GitVersion.App.Tests;
+
+public static class GitVersionHelper
 {
-    public static class GitVersionHelper
+    public static ExecutionResults ExecuteIn(string workingDirectory,
+        string exec = null,
+        string execArgs = null,
+        string projectFile = null,
+        string projectArgs = null,
+        bool logToFile = true,
+        params KeyValuePair<string, string>[] environments
+    )
     {
-        public static ExecutionResults ExecuteIn(string workingDirectory,
-            string exec = null,
-            string execArgs = null,
-            string projectFile = null,
-            string projectArgs = null,
-            bool logToFile = true,
-            params KeyValuePair<string, string>[] environments
-            )
-        {
-            var logFile = logToFile ? Path.Combine(workingDirectory, "log.txt") : null;
-            var args = new ArgumentBuilder(workingDirectory, exec, execArgs, projectFile, projectArgs, logFile);
-            return ExecuteIn(args, environments);
-        }
+        var logFile = logToFile ? Path.Combine(workingDirectory, "log.txt") : null;
+        var args = new ArgumentBuilder(workingDirectory, exec, execArgs, projectFile, projectArgs, logFile);
+        return ExecuteIn(args, environments);
+    }
 
-        public static ExecutionResults ExecuteIn(
-            string workingDirectory,
-            string arguments,
-            bool logToFile = true,
-            params KeyValuePair<string, string>[] environments)
-        {
-            var logFile = logToFile ? Path.Combine(workingDirectory, "log.txt") : null;
-            var args = new ArgumentBuilder(workingDirectory, arguments, logFile);
-            return ExecuteIn(args, environments);
-        }
+    public static ExecutionResults ExecuteIn(
+        string workingDirectory,
+        string arguments,
+        bool logToFile = true,
+        params KeyValuePair<string, string>[] environments)
+    {
+        var logFile = logToFile ? Path.Combine(workingDirectory, "log.txt") : null;
+        var args = new ArgumentBuilder(workingDirectory, arguments, logFile);
+        return ExecuteIn(args, environments);
+    }
 
-        private static ExecutionResults ExecuteIn(ArgumentBuilder arguments,
-            params KeyValuePair<string, string>[] environments
-        )
-        {
-            var executable = PathHelper.GetExecutable();
-            var output = new StringBuilder();
+    private static ExecutionResults ExecuteIn(ArgumentBuilder arguments,
+        params KeyValuePair<string, string>[] environments
+    )
+    {
+        var executable = PathHelper.GetExecutable();
+        var output = new StringBuilder();
 
-            var environmentalVariables = new Dictionary<string, string>
-            {
-                { TeamCity.EnvironmentVariableName, null },
-                { AppVeyor.EnvironmentVariableName, null },
-                { TravisCi.EnvironmentVariableName, null },
-                { Jenkins.EnvironmentVariableName, null },
-                { AzurePipelines.EnvironmentVariableName, null },
-                { GitHubActions.EnvironmentVariableName, null },
-                { SpaceAutomation.EnvironmentVariableName, null },
-            };
+        var environmentalVariables = new Dictionary<string, string>
+        {
+            { TeamCity.EnvironmentVariableName, null },
+            { AppVeyor.EnvironmentVariableName, null },
+            { TravisCi.EnvironmentVariableName, null },
+            { Jenkins.EnvironmentVariableName, null },
+            { AzurePipelines.EnvironmentVariableName, null },
+            { GitHubActions.EnvironmentVariableName, null },
+            { SpaceAutomation.EnvironmentVariableName, null },
+        };
 
-            foreach (var environment in environments)
+        foreach (var environment in environments)
+        {
+            if (environmentalVariables.ContainsKey(environment.Key))
             {
-                if (environmentalVariables.ContainsKey(environment.Key))
-                {
-                    environmentalVariables[environment.Key] = environment.Value;
-                }
-                else
-                {
-                    environmentalVariables.Add(environment.Key, environment.Value);
-                }
+                environmentalVariables[environment.Key] = environment.Value;
             }
-
-            var exitCode = -1;
-
-            try
+            else
             {
-                var args = PathHelper.GetExecutableArgs(arguments.ToString());
+                environmentalVariables.Add(environment.Key, environment.Value);
+            }
+        }
 
-                Console.WriteLine("Executing: {0} {1}", executable, args);
-                Console.WriteLine();
+        var exitCode = -1;
 
-                exitCode = ProcessHelper.Run(
-                    s => output.AppendLine(s),
-                    s => output.AppendLine(s),
-                    null,
-                    executable,
-                    args,
-                    arguments.WorkingDirectory,
-                    environmentalVariables.ToArray());
-            }
-            catch (Exception exception)
-            {
-                // NOTE: It's the exit code and output from the process we want to test,
-                //       not the internals of the ProcessHelper. That's why we're catching
-                //       any exceptions here, because problems in the process being executed
-                //       should be visible in the output or exit code. @asbjornu
-                Console.WriteLine(exception);
-            }
+        try
+        {
+            var args = PathHelper.GetExecutableArgs(arguments.ToString());
 
-            Console.WriteLine("Output from gitversion tool");
-            Console.WriteLine("-------------------------------------------------------");
-            Console.WriteLine(output.ToString());
-            Console.WriteLine();
+            Console.WriteLine("Executing: {0} {1}", executable, args);
             Console.WriteLine();
-            Console.WriteLine("-------------------------------------------------------");
 
-            if (arguments.LogFile.IsNullOrWhiteSpace() || !File.Exists(arguments.LogFile))
-            {
-                return new ExecutionResults(exitCode, output.ToString(), null);
-            }
+            exitCode = ProcessHelper.Run(
+                s => output.AppendLine(s),
+                s => output.AppendLine(s),
+                null,
+                executable,
+                args,
+                arguments.WorkingDirectory,
+                environmentalVariables.ToArray());
+        }
+        catch (Exception exception)
+        {
+            // NOTE: It's the exit code and output from the process we want to test,
+            //       not the internals of the ProcessHelper. That's why we're catching
+            //       any exceptions here, because problems in the process being executed
+            //       should be visible in the output or exit code. @asbjornu
+            Console.WriteLine(exception);
+        }
 
-            var logContents = File.ReadAllText(arguments.LogFile);
-            Console.WriteLine("Log from gitversion tool");
-            Console.WriteLine("-------------------------------------------------------");
-            Console.WriteLine(logContents);
-            Console.WriteLine();
-            Console.WriteLine();
-            Console.WriteLine("-------------------------------------------------------");
+        Console.WriteLine("Output from gitversion tool");
+        Console.WriteLine("-------------------------------------------------------");
+        Console.WriteLine(output.ToString());
+        Console.WriteLine();
+        Console.WriteLine();
+        Console.WriteLine("-------------------------------------------------------");
 
-            return new ExecutionResults(exitCode, output.ToString(), logContents);
+        if (arguments.LogFile.IsNullOrWhiteSpace() || !File.Exists(arguments.LogFile))
+        {
+            return new ExecutionResults(exitCode, output.ToString(), null);
         }
+
+        var logContents = File.ReadAllText(arguments.LogFile);
+        Console.WriteLine("Log from gitversion tool");
+        Console.WriteLine("-------------------------------------------------------");
+        Console.WriteLine(logContents);
+        Console.WriteLine();
+        Console.WriteLine();
+        Console.WriteLine("-------------------------------------------------------");
+
+        return new ExecutionResults(exitCode, output.ToString(), logContents);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/Helpers/ProgramFixture.cs b/src/GitVersion.App.Tests/Helpers/ProgramFixture.cs
index 16b9dabeda..aa8e694dee 100644
--- a/src/GitVersion.App.Tests/Helpers/ProgramFixture.cs
+++ b/src/GitVersion.App.Tests/Helpers/ProgramFixture.cs
@@ -9,93 +9,92 @@
 using GitVersion.OutputVariables;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GitVersion.App.Tests
+namespace GitVersion.App.Tests;
+
+public sealed class ProgramFixture
 {
-    public sealed class ProgramFixture
-    {
-        private readonly IEnvironment environment;
-        public List<Action<IServiceCollection>> Overrides { get; } = new List<Action<IServiceCollection>>();
-        private readonly Lazy<string> logger;
-        private readonly Lazy<string> output;
+    private readonly IEnvironment environment;
+    public List<Action<IServiceCollection>> Overrides { get; } = new List<Action<IServiceCollection>>();
+    private readonly Lazy<string> logger;
+    private readonly Lazy<string> output;
 
-        private readonly string workingDirectory;
+    private readonly string workingDirectory;
 
-        public ProgramFixture(string workingDirectory = "")
-        {
-            this.workingDirectory = workingDirectory;
-            var logBuilder = new StringBuilder();
-            var logAppender = new TestLogAppender(m => logBuilder.AppendLine(m));
-            ILog log = new Log(logAppender);
+    public ProgramFixture(string workingDirectory = "")
+    {
+        this.workingDirectory = workingDirectory;
+        var logBuilder = new StringBuilder();
+        var logAppender = new TestLogAppender(m => logBuilder.AppendLine(m));
+        ILog log = new Log(logAppender);
 
-            var consoleBuilder = new StringBuilder();
-            IConsole consoleAdapter = new TestConsoleAdapter(consoleBuilder);
+        var consoleBuilder = new StringBuilder();
+        IConsole consoleAdapter = new TestConsoleAdapter(consoleBuilder);
 
-            this.environment = new TestEnvironment();
+        this.environment = new TestEnvironment();
 
-            Overrides.Add(services =>
-            {
-                services.AddSingleton(log);
-                services.AddSingleton(consoleAdapter);
-                services.AddSingleton(this.environment);
-            });
+        Overrides.Add(services =>
+        {
+            services.AddSingleton(log);
+            services.AddSingleton(consoleAdapter);
+            services.AddSingleton(this.environment);
+        });
 
-            this.logger = new Lazy<string>(() => logBuilder.ToString());
-            this.output = new Lazy<string>(() => consoleAdapter.ToString());
-        }
+        this.logger = new Lazy<string>(() => logBuilder.ToString());
+        this.output = new Lazy<string>(() => consoleAdapter.ToString());
+    }
 
-        public void WithEnv(params KeyValuePair<string, string>[] envs)
+    public void WithEnv(params KeyValuePair<string, string>[] envs)
+    {
+        foreach (var env in envs)
         {
-            foreach (var env in envs)
-            {
-                this.environment.SetEnvironmentVariable(env.Key, env.Value);
-            }
+            this.environment.SetEnvironmentVariable(env.Key, env.Value);
         }
+    }
+
+    public Task<ProgramFixtureResult> Run(string arg)
+    {
+        var args = arg.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries).ToArray();
+        return Run(args);
+    }
+
+    public async Task<ProgramFixtureResult> Run(params string[] args)
+    {
+        // Create the application and override registrations.
+        var program = new Program(builder => Overrides.ForEach(action => action(builder)));
 
-        public Task<ProgramFixtureResult> Run(string arg)
+        if (!this.workingDirectory.IsNullOrWhiteSpace())
         {
-            var args = arg.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries).ToArray();
-            return Run(args);
+            args = new[] { "-targetpath", this.workingDirectory }.Concat(args).ToArray();
         }
+        await program.RunAsync(args);
 
-        public async Task<ProgramFixtureResult> Run(params string[] args)
+        return new ProgramFixtureResult
         {
-            // Create the application and override registrations.
-            var program = new Program(builder => Overrides.ForEach(action => action(builder)));
-
-            if (!this.workingDirectory.IsNullOrWhiteSpace())
-            {
-                args = new[] { "-targetpath", this.workingDirectory }.Concat(args).ToArray();
-            }
-            await program.RunAsync(args);
-
-            return new ProgramFixtureResult
-            {
-                ExitCode = System.Environment.ExitCode,
-                Output = this.output.Value,
-                Log = this.logger.Value
-            };
-        }
+            ExitCode = System.Environment.ExitCode,
+            Output = this.output.Value,
+            Log = this.logger.Value
+        };
     }
+}
 
-    public class ProgramFixtureResult
-    {
-        public int ExitCode { get; set; }
-        public string Output { get; set; }
-        public string Log { get; set; }
+public class ProgramFixtureResult
+{
+    public int ExitCode { get; set; }
+    public string Output { get; set; }
+    public string Log { get; set; }
 
-        public VersionVariables OutputVariables
+    public VersionVariables OutputVariables
+    {
+        get
         {
-            get
-            {
-                if (Output.IsNullOrWhiteSpace()) return null;
+            if (Output.IsNullOrWhiteSpace()) return null;
 
-                var jsonStartIndex = Output.IndexOf("{", StringComparison.Ordinal);
-                var jsonEndIndex = Output.IndexOf("}", StringComparison.Ordinal);
-                var json = Output.Substring(jsonStartIndex, jsonEndIndex - jsonStartIndex + 1);
+            var jsonStartIndex = Output.IndexOf("{", StringComparison.Ordinal);
+            var jsonEndIndex = Output.IndexOf("}", StringComparison.Ordinal);
+            var json = Output.Substring(jsonStartIndex, jsonEndIndex - jsonStartIndex + 1);
 
-                return VersionVariables.FromJson(json);
-            }
+            return VersionVariables.FromJson(json);
         }
-
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/Helpers/TestConsoleAdapter.cs b/src/GitVersion.App.Tests/Helpers/TestConsoleAdapter.cs
index 90748eace8..895ebaa57c 100644
--- a/src/GitVersion.App.Tests/Helpers/TestConsoleAdapter.cs
+++ b/src/GitVersion.App.Tests/Helpers/TestConsoleAdapter.cs
@@ -2,22 +2,21 @@
 using System.Text;
 using GitVersion.Logging;
 
-namespace GitVersion.App.Tests
+namespace GitVersion.App.Tests;
+
+public class TestConsoleAdapter : IConsole
 {
-    public class TestConsoleAdapter : IConsole
-    {
-        private readonly StringBuilder sb;
-        public TestConsoleAdapter(StringBuilder sb) => this.sb = sb;
-        public void WriteLine(string msg) => this.sb.AppendLine(msg);
+    private readonly StringBuilder sb;
+    public TestConsoleAdapter(StringBuilder sb) => this.sb = sb;
+    public void WriteLine(string msg) => this.sb.AppendLine(msg);
 
-        public void WriteLine() => this.sb.AppendLine();
+    public void WriteLine() => this.sb.AppendLine();
 
-        public void Write(string msg) => this.sb.Append(msg);
+    public void Write(string msg) => this.sb.Append(msg);
 
-        public override string ToString() => this.sb.ToString();
+    public override string ToString() => this.sb.ToString();
 
-        public string ReadLine() => throw new NotImplementedException();
+    public string ReadLine() => throw new NotImplementedException();
 
-        public IDisposable UseColor(ConsoleColor consoleColor) => Disposable.Empty;
-    }
-}
+    public IDisposable UseColor(ConsoleColor consoleColor) => Disposable.Empty;
+}
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/JsonOutputOnBuildServerTest.cs b/src/GitVersion.App.Tests/JsonOutputOnBuildServerTest.cs
index a28b72d935..3df96bcda4 100644
--- a/src/GitVersion.App.Tests/JsonOutputOnBuildServerTest.cs
+++ b/src/GitVersion.App.Tests/JsonOutputOnBuildServerTest.cs
@@ -6,68 +6,67 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.App.Tests
+namespace GitVersion.App.Tests;
+
+public class JsonOutputOnBuildServerTest
 {
-    public class JsonOutputOnBuildServerTest
+    [Test]
+    public void BeingOnBuildServerDoesntOverrideOutputJson()
     {
-        [Test]
-        public void BeingOnBuildServerDoesntOverrideOutputJson()
-        {
-            using var fixture = new RemoteRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.2.3");
-            fixture.Repository.MakeACommit();
+        using var fixture = new RemoteRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.2.3");
+        fixture.Repository.MakeACommit();
 
-            var env = new KeyValuePair<string, string>(TeamCity.EnvironmentVariableName, "8.0.0");
+        var env = new KeyValuePair<string, string>(TeamCity.EnvironmentVariableName, "8.0.0");
 
-            var result = GitVersionHelper.ExecuteIn(fixture.LocalRepositoryFixture.RepositoryPath, arguments: " /output json", environments: env);
+        var result = GitVersionHelper.ExecuteIn(fixture.LocalRepositoryFixture.RepositoryPath, arguments: " /output json", environments: env);
 
-            result.ExitCode.ShouldBe(0);
-            result.Output.ShouldStartWith("{");
-            result.Output.TrimEnd().ShouldEndWith("}");
-        }
+        result.ExitCode.ShouldBe(0);
+        result.Output.ShouldStartWith("{");
+        result.Output.TrimEnd().ShouldEndWith("}");
+    }
 
-        [Test]
-        public void BeingOnBuildServerWithOutputJsonDoesNotFail()
-        {
-            using var fixture = new RemoteRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.2.3");
-            fixture.Repository.MakeACommit();
+    [Test]
+    public void BeingOnBuildServerWithOutputJsonDoesNotFail()
+    {
+        using var fixture = new RemoteRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.2.3");
+        fixture.Repository.MakeACommit();
 
-            var env = new KeyValuePair<string, string>(TeamCity.EnvironmentVariableName, "8.0.0");
+        var env = new KeyValuePair<string, string>(TeamCity.EnvironmentVariableName, "8.0.0");
 
-            var result = GitVersionHelper.ExecuteIn(fixture.LocalRepositoryFixture.RepositoryPath, arguments: " /output json /output buildserver", environments: env);
+        var result = GitVersionHelper.ExecuteIn(fixture.LocalRepositoryFixture.RepositoryPath, arguments: " /output json /output buildserver", environments: env);
 
-            result.ExitCode.ShouldBe(0);
-            const string version = "0.1.0+4";
-            result.Output.ShouldContain($"##teamcity[buildNumber '{version}']");
-            result.OutputVariables.ShouldNotBeNull();
-            result.OutputVariables.FullSemVer.ShouldBeEquivalentTo(version);
-        }
+        result.ExitCode.ShouldBe(0);
+        const string version = "0.1.0+4";
+        result.Output.ShouldContain($"##teamcity[buildNumber '{version}']");
+        result.OutputVariables.ShouldNotBeNull();
+        result.OutputVariables.FullSemVer.ShouldBeEquivalentTo(version);
+    }
 
-        [TestCase("", "GitVersion.json")]
-        [TestCase("version.json", "version.json")]
-        public void BeingOnBuildServerWithOutputJsonAndOutputFileDoesNotFail(string outputFile, string fileName)
-        {
-            using var fixture = new RemoteRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.2.3");
-            fixture.Repository.MakeACommit();
+    [TestCase("", "GitVersion.json")]
+    [TestCase("version.json", "version.json")]
+    public void BeingOnBuildServerWithOutputJsonAndOutputFileDoesNotFail(string outputFile, string fileName)
+    {
+        using var fixture = new RemoteRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.2.3");
+        fixture.Repository.MakeACommit();
 
-            var env = new KeyValuePair<string, string>(TeamCity.EnvironmentVariableName, "8.0.0");
+        var env = new KeyValuePair<string, string>(TeamCity.EnvironmentVariableName, "8.0.0");
 
-            var result = GitVersionHelper.ExecuteIn(fixture.LocalRepositoryFixture.RepositoryPath, arguments: $" /output json /output buildserver /output file /outputfile {outputFile}", environments: env);
+        var result = GitVersionHelper.ExecuteIn(fixture.LocalRepositoryFixture.RepositoryPath, arguments: $" /output json /output buildserver /output file /outputfile {outputFile}", environments: env);
 
-            result.ExitCode.ShouldBe(0);
-            const string version = "0.1.0+4";
-            result.Output.ShouldContain($"##teamcity[buildNumber '{version}']");
-            result.OutputVariables.ShouldNotBeNull();
-            result.OutputVariables.FullSemVer.ShouldBeEquivalentTo(version);
+        result.ExitCode.ShouldBe(0);
+        const string version = "0.1.0+4";
+        result.Output.ShouldContain($"##teamcity[buildNumber '{version}']");
+        result.OutputVariables.ShouldNotBeNull();
+        result.OutputVariables.FullSemVer.ShouldBeEquivalentTo(version);
 
-            var filePath = Path.Combine(fixture.LocalRepositoryFixture.RepositoryPath, fileName);
-            var json = File.ReadAllText(filePath);
+        var filePath = Path.Combine(fixture.LocalRepositoryFixture.RepositoryPath, fileName);
+        var json = File.ReadAllText(filePath);
 
-            var outputVariables = VersionVariables.FromJson(json);
-            outputVariables.ShouldNotBeNull();
-            outputVariables.FullSemVer.ShouldBeEquivalentTo(version);
-        }
+        var outputVariables = VersionVariables.FromJson(json);
+        outputVariables.ShouldNotBeNull();
+        outputVariables.FullSemVer.ShouldBeEquivalentTo(version);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs b/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs
index dccd02cdeb..011f970c00 100644
--- a/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs
+++ b/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs
@@ -9,166 +9,165 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.App.Tests
+namespace GitVersion.App.Tests;
+
+[TestFixture]
+public class PullRequestInBuildAgentTest
 {
-    [TestFixture]
-    public class PullRequestInBuildAgentTest
+    private const string PullRequestBranchName = "PR-5";
+    private static readonly string[] PrMergeRefs =
     {
-        private const string PullRequestBranchName = "PR-5";
-        private static readonly string[] PrMergeRefs =
-        {
-            "refs/pull-requests/5/merge",
-            "refs/pull/5/merge",
-            "refs/heads/pull/5/head"
-        };
+        "refs/pull-requests/5/merge",
+        "refs/pull/5/merge",
+        "refs/heads/pull/5/head"
+    };
 
-        [TestCaseSource(nameof(PrMergeRefs))]
-        public async Task VerifyAzurePipelinesPullRequest(string pullRequestRef)
+    [TestCaseSource(nameof(PrMergeRefs))]
+    public async Task VerifyAzurePipelinesPullRequest(string pullRequestRef)
+    {
+        var env = new Dictionary<string, string>
         {
-            var env = new Dictionary<string, string>
-            {
-                { AzurePipelines.EnvironmentVariableName, "true" },
-                { "BUILD_SOURCEBRANCH", PullRequestBranchName }
-            };
-            await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
-        }
+            { AzurePipelines.EnvironmentVariableName, "true" },
+            { "BUILD_SOURCEBRANCH", PullRequestBranchName }
+        };
+        await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
+    }
 
-        [TestCaseSource(nameof(PrMergeRefs))]
-        public async Task VerifyCodeBuildPullRequest(string pullRequestRef)
+    [TestCaseSource(nameof(PrMergeRefs))]
+    public async Task VerifyCodeBuildPullRequest(string pullRequestRef)
+    {
+        var env = new Dictionary<string, string>
         {
-            var env = new Dictionary<string, string>
-            {
-                { CodeBuild.WebHookEnvironmentVariableName, PullRequestBranchName },
-            };
-            await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
-        }
+            { CodeBuild.WebHookEnvironmentVariableName, PullRequestBranchName },
+        };
+        await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
+    }
 
-        [TestCaseSource(nameof(PrMergeRefs))]
-        public async Task VerifyContinuaCIPullRequest(string pullRequestRef)
+    [TestCaseSource(nameof(PrMergeRefs))]
+    public async Task VerifyContinuaCIPullRequest(string pullRequestRef)
+    {
+        var env = new Dictionary<string, string>
         {
-            var env = new Dictionary<string, string>
-            {
-                { ContinuaCi.EnvironmentVariableName, "true" },
-            };
-            await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
-        }
+            { ContinuaCi.EnvironmentVariableName, "true" },
+        };
+        await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
+    }
 
 
-        [TestCaseSource(nameof(PrMergeRefs))]
-        public async Task VerifyDronePullRequest(string pullRequestRef)
+    [TestCaseSource(nameof(PrMergeRefs))]
+    public async Task VerifyDronePullRequest(string pullRequestRef)
+    {
+        var env = new Dictionary<string, string>
         {
-            var env = new Dictionary<string, string>
-            {
-                { Drone.EnvironmentVariableName, "true" },
-                { "DRONE_PULL_REQUEST", PullRequestBranchName },
-            };
-            await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
-        }
+            { Drone.EnvironmentVariableName, "true" },
+            { "DRONE_PULL_REQUEST", PullRequestBranchName },
+        };
+        await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
+    }
 
-        [TestCaseSource(nameof(PrMergeRefs))]
-        public async Task VerifyGitHubActionsPullRequest(string pullRequestRef)
+    [TestCaseSource(nameof(PrMergeRefs))]
+    public async Task VerifyGitHubActionsPullRequest(string pullRequestRef)
+    {
+        var env = new Dictionary<string, string>
         {
-            var env = new Dictionary<string, string>
-            {
-                { GitHubActions.EnvironmentVariableName, "true" },
-                { "GITHUB_REF", PullRequestBranchName },
-            };
-            await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
-        }
+            { GitHubActions.EnvironmentVariableName, "true" },
+            { "GITHUB_REF", PullRequestBranchName },
+        };
+        await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
+    }
 
-        [TestCaseSource(nameof(PrMergeRefs))]
-        public async Task VerifyGitLabCIPullRequest(string pullRequestRef)
+    [TestCaseSource(nameof(PrMergeRefs))]
+    public async Task VerifyGitLabCIPullRequest(string pullRequestRef)
+    {
+        var env = new Dictionary<string, string>
         {
-            var env = new Dictionary<string, string>
-            {
-                { GitLabCi.EnvironmentVariableName, "true" },
-                { "CI_COMMIT_REF_NAME", PullRequestBranchName },
-            };
-            await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
-        }
+            { GitLabCi.EnvironmentVariableName, "true" },
+            { "CI_COMMIT_REF_NAME", PullRequestBranchName },
+        };
+        await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
+    }
 
-        [TestCaseSource(nameof(PrMergeRefs))]
-        public async Task VerifyJenkinsPullRequest(string pullRequestRef)
+    [TestCaseSource(nameof(PrMergeRefs))]
+    public async Task VerifyJenkinsPullRequest(string pullRequestRef)
+    {
+        var env = new Dictionary<string, string>
         {
-            var env = new Dictionary<string, string>
+            { Jenkins.EnvironmentVariableName, "url" },
             {
-                { Jenkins.EnvironmentVariableName, "url" },
-                 {
                 "BRANCH_NAME", PullRequestBranchName }
-            };
+        };
 
-            await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
-        }
+        await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
+    }
 
-        [TestCaseSource(nameof(PrMergeRefs))]
-        public async Task VerifyMyGetPullRequest(string pullRequestRef)
+    [TestCaseSource(nameof(PrMergeRefs))]
+    public async Task VerifyMyGetPullRequest(string pullRequestRef)
+    {
+        var env = new Dictionary<string, string>
         {
-            var env = new Dictionary<string, string>
-            {
-                { MyGet.EnvironmentVariableName, "MyGet" },
-            };
+            { MyGet.EnvironmentVariableName, "MyGet" },
+        };
 
-            await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
-        }
+        await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
+    }
 
-        [TestCaseSource(nameof(PrMergeRefs))]
-        public async Task VerifyTeamCityPullRequest(string pullRequestRef)
+    [TestCaseSource(nameof(PrMergeRefs))]
+    public async Task VerifyTeamCityPullRequest(string pullRequestRef)
+    {
+        var env = new Dictionary<string, string>
         {
-            var env = new Dictionary<string, string>
-            {
-                { TeamCity.EnvironmentVariableName, "8.0.0" },
-            };
-            await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
-        }
+            { TeamCity.EnvironmentVariableName, "8.0.0" },
+        };
+        await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
+    }
 
-        [TestCaseSource(nameof(PrMergeRefs))]
-        public async Task VerifyTravisCIPullRequest(string pullRequestRef)
+    [TestCaseSource(nameof(PrMergeRefs))]
+    public async Task VerifyTravisCIPullRequest(string pullRequestRef)
+    {
+        var env = new Dictionary<string, string>
         {
-            var env = new Dictionary<string, string>
-            {
-                { TravisCi.EnvironmentVariableName, "true" },
-                {  "CI", "true" },
-            };
-            await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
-        }
+            { TravisCi.EnvironmentVariableName, "true" },
+            {  "CI", "true" },
+        };
+        await VerifyPullRequestVersionIsCalculatedProperly(pullRequestRef, env);
+    }
 
-        private static async Task VerifyPullRequestVersionIsCalculatedProperly(string pullRequestRef, Dictionary<string, string> env)
+    private static async Task VerifyPullRequestVersionIsCalculatedProperly(string pullRequestRef, Dictionary<string, string> env)
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        var remoteRepositoryPath = PathHelper.GetTempPath();
+        RepositoryFixtureBase.Init(remoteRepositoryPath);
+        using (var remoteRepository = new Repository(remoteRepositoryPath))
         {
-            using var fixture = new EmptyRepositoryFixture();
-            var remoteRepositoryPath = PathHelper.GetTempPath();
-            RepositoryFixtureBase.Init(remoteRepositoryPath);
-            using (var remoteRepository = new Repository(remoteRepositoryPath))
-            {
-                remoteRepository.Config.Set("user.name", "Test");
-                remoteRepository.Config.Set("user.email", "test@email.com");
-                fixture.Repository.Network.Remotes.Add("origin", remoteRepositoryPath);
-                Console.WriteLine("Created git repository at {0}", remoteRepositoryPath);
-                remoteRepository.MakeATaggedCommit("1.0.3");
-
-                var branch = remoteRepository.CreateBranch("FeatureBranch");
-                Commands.Checkout(remoteRepository, branch);
-                remoteRepository.MakeCommits(2);
-                Commands.Checkout(remoteRepository, remoteRepository.Head.Tip.Sha);
-                //Emulate merge commit
-                var mergeCommitSha = remoteRepository.MakeACommit().Sha;
-                Commands.Checkout(remoteRepository, TestBase.MainBranch); // HEAD cannot be pointing at the merge commit
-                remoteRepository.Refs.Add(pullRequestRef, new ObjectId(mergeCommitSha));
-
-                // Checkout PR commit
-                Commands.Fetch((Repository)fixture.Repository, "origin", Array.Empty<string>(), new FetchOptions(), null);
-                Commands.Checkout(fixture.Repository, mergeCommitSha);
-            }
-
-            var programFixture = new ProgramFixture(fixture.RepositoryPath);
-            programFixture.WithEnv(env.ToArray());
-
-            var result = await programFixture.Run();
-
-            result.ExitCode.ShouldBe(0);
-            result.OutputVariables.FullSemVer.ShouldBe("1.0.4-PullRequest0005.3");
-
-            // Cleanup repository files
-            DirectoryHelper.DeleteDirectory(remoteRepositoryPath);
+            remoteRepository.Config.Set("user.name", "Test");
+            remoteRepository.Config.Set("user.email", "test@email.com");
+            fixture.Repository.Network.Remotes.Add("origin", remoteRepositoryPath);
+            Console.WriteLine("Created git repository at {0}", remoteRepositoryPath);
+            remoteRepository.MakeATaggedCommit("1.0.3");
+
+            var branch = remoteRepository.CreateBranch("FeatureBranch");
+            Commands.Checkout(remoteRepository, branch);
+            remoteRepository.MakeCommits(2);
+            Commands.Checkout(remoteRepository, remoteRepository.Head.Tip.Sha);
+            //Emulate merge commit
+            var mergeCommitSha = remoteRepository.MakeACommit().Sha;
+            Commands.Checkout(remoteRepository, TestBase.MainBranch); // HEAD cannot be pointing at the merge commit
+            remoteRepository.Refs.Add(pullRequestRef, new ObjectId(mergeCommitSha));
+
+            // Checkout PR commit
+            Commands.Fetch((Repository)fixture.Repository, "origin", Array.Empty<string>(), new FetchOptions(), null);
+            Commands.Checkout(fixture.Repository, mergeCommitSha);
         }
+
+        var programFixture = new ProgramFixture(fixture.RepositoryPath);
+        programFixture.WithEnv(env.ToArray());
+
+        var result = await programFixture.Run();
+
+        result.ExitCode.ShouldBe(0);
+        result.OutputVariables.FullSemVer.ShouldBe("1.0.4-PullRequest0005.3");
+
+        // Cleanup repository files
+        DirectoryHelper.DeleteDirectory(remoteRepositoryPath);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/QuotedStringHelpersTests.cs b/src/GitVersion.App.Tests/QuotedStringHelpersTests.cs
index 79c8275a37..e4a65deaa8 100644
--- a/src/GitVersion.App.Tests/QuotedStringHelpersTests.cs
+++ b/src/GitVersion.App.Tests/QuotedStringHelpersTests.cs
@@ -2,120 +2,119 @@
 using GitVersion;
 using NUnit.Framework;
 
-namespace GitVersionExe.Tests
+namespace GitVersionExe.Tests;
+
+[TestFixture]
+public class QuotedStringHelpersTests
 {
-    [TestFixture]
-    public class QuotedStringHelpersTests
-    {
-        [TestCaseSource(nameof(SplitUnquotedTestData))]
-        public string[] SplitUnquotedTests(string input, char splitChar) => QuotedStringHelpers.SplitUnquoted(input, splitChar);
+    [TestCaseSource(nameof(SplitUnquotedTestData))]
+    public string[] SplitUnquotedTests(string input, char splitChar) => QuotedStringHelpers.SplitUnquoted(input, splitChar);
 
-        private static IEnumerable<TestCaseData> SplitUnquotedTestData()
+    private static IEnumerable<TestCaseData> SplitUnquotedTestData()
+    {
+        yield return new TestCaseData(null, ' ')
         {
-            yield return new TestCaseData(null, ' ')
-            {
-                ExpectedResult = System.Array.Empty<string>()
-            };
-            yield return new TestCaseData("one two three", ' ')
-            {
-                ExpectedResult = new[] { "one", "two", "three" }
-            };
-            yield return new TestCaseData("one \"two three\"", ' ')
-            {
-                ExpectedResult = new[] { "one", "\"two three\"" }
-            };
-            yield return new TestCaseData("one \"two three", ' ')
-            {
-                ExpectedResult = new[] { "one", "\"two three" }
-            };
-            yield return new TestCaseData("/overrideconfig tag-prefix=Sample", ' ')
+            ExpectedResult = System.Array.Empty<string>()
+        };
+        yield return new TestCaseData("one two three", ' ')
+        {
+            ExpectedResult = new[] { "one", "two", "three" }
+        };
+        yield return new TestCaseData("one \"two three\"", ' ')
+        {
+            ExpectedResult = new[] { "one", "\"two three\"" }
+        };
+        yield return new TestCaseData("one \"two three", ' ')
+        {
+            ExpectedResult = new[] { "one", "\"two three" }
+        };
+        yield return new TestCaseData("/overrideconfig tag-prefix=Sample", ' ')
+        {
+            ExpectedResult = new[]
             {
-                ExpectedResult = new[]
-                {
-                    "/overrideconfig",
-                    "tag-prefix=Sample"
-                }
-            };
-            yield return new TestCaseData("/overrideconfig tag-prefix=Sample 2", ' ')
+                "/overrideconfig",
+                "tag-prefix=Sample"
+            }
+        };
+        yield return new TestCaseData("/overrideconfig tag-prefix=Sample 2", ' ')
+        {
+            ExpectedResult = new[]
             {
-                ExpectedResult = new[]
-                {
-                    "/overrideconfig",
-                    "tag-prefix=Sample",
-                    "2"
-                }
-            };
-            yield return new TestCaseData("/overrideconfig tag-prefix=\"Sample 2\"", ' ')
+                "/overrideconfig",
+                "tag-prefix=Sample",
+                "2"
+            }
+        };
+        yield return new TestCaseData("/overrideconfig tag-prefix=\"Sample 2\"", ' ')
+        {
+            ExpectedResult = new[]
             {
-                ExpectedResult = new[]
-                {
-                    "/overrideconfig",
-                    "tag-prefix=\"Sample 2\""
-                }
-            };
-            yield return new TestCaseData("/overrideconfig tag-prefix=\"Sample \\\"quoted\\\"\"", ' ')
+                "/overrideconfig",
+                "tag-prefix=\"Sample 2\""
+            }
+        };
+        yield return new TestCaseData("/overrideconfig tag-prefix=\"Sample \\\"quoted\\\"\"", ' ')
+        {
+            ExpectedResult = new[]
             {
-                ExpectedResult = new[]
-                {
-                    "/overrideconfig",
-                    "tag-prefix=\"Sample \\\"quoted\\\"\""
-                }
-            };
-            yield return new TestCaseData("/overrideconfig tag-prefix=sample;assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\"", ' ')
+                "/overrideconfig",
+                "tag-prefix=\"Sample \\\"quoted\\\"\""
+            }
+        };
+        yield return new TestCaseData("/overrideconfig tag-prefix=sample;assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\"", ' ')
+        {
+            ExpectedResult = new[]
             {
-                ExpectedResult = new[]
-                {
-                    "/overrideconfig",
-                    "tag-prefix=sample;assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\""
-                }
-            };
-            yield return new TestCaseData("tag-prefix=sample;assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\"", ';')
+                "/overrideconfig",
+                "tag-prefix=sample;assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\""
+            }
+        };
+        yield return new TestCaseData("tag-prefix=sample;assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\"", ';')
+        {
+            ExpectedResult = new[]
             {
-                ExpectedResult = new[]
-                {
-                    "tag-prefix=sample",
-                    "assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\""
-                }
-            };
-            yield return new TestCaseData("assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\"", '=')
+                "tag-prefix=sample",
+                "assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\""
+            }
+        };
+        yield return new TestCaseData("assembly-versioning-format=\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\"", '=')
+        {
+            ExpectedResult = new[]
             {
-                ExpectedResult = new[]
-                {
-                    "assembly-versioning-format",
-                    "\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\""
-                }
-            };
-        }
+                "assembly-versioning-format",
+                "\"{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}\""
+            }
+        };
+    }
 
-        [TestCaseSource(nameof(RemoveEmptyEntriesTestData))]
-        public string[] SplitUnquotedRemovesEmptyEntries(string input, char splitChar) => QuotedStringHelpers.SplitUnquoted(input, splitChar);
+    [TestCaseSource(nameof(RemoveEmptyEntriesTestData))]
+    public string[] SplitUnquotedRemovesEmptyEntries(string input, char splitChar) => QuotedStringHelpers.SplitUnquoted(input, splitChar);
 
-        private static IEnumerable<TestCaseData> RemoveEmptyEntriesTestData()
+    private static IEnumerable<TestCaseData> RemoveEmptyEntriesTestData()
+    {
+        yield return new TestCaseData(" /switch1 value1  /switch2 ", ' ')
         {
-            yield return new TestCaseData(" /switch1 value1  /switch2 ", ' ')
+            ExpectedResult = new[]
             {
-                ExpectedResult = new[]
-                {
-                    "/switch1",
-                    "value1",
-                    "/switch2"
-                }
-            };
-        }
+                "/switch1",
+                "value1",
+                "/switch2"
+            }
+        };
+    }
 
-        [TestCaseSource(nameof(UnquoteTextTestData))]
-        public string UnquoteTextTests(string input) => QuotedStringHelpers.UnquoteText(input);
+    [TestCaseSource(nameof(UnquoteTextTestData))]
+    public string UnquoteTextTests(string input) => QuotedStringHelpers.UnquoteText(input);
 
-        private static IEnumerable<TestCaseData> UnquoteTextTestData()
+    private static IEnumerable<TestCaseData> UnquoteTextTestData()
+    {
+        yield return new TestCaseData("\"sample\"")
         {
-            yield return new TestCaseData("\"sample\"")
-            {
-                ExpectedResult = "sample"
-            };
-            yield return new TestCaseData("\"escaped \\\"quote\"")
-            {
-                ExpectedResult = "escaped \"quote"
-            };
-        }
+            ExpectedResult = "sample"
+        };
+        yield return new TestCaseData("\"escaped \\\"quote\"")
+        {
+            ExpectedResult = "escaped \"quote"
+        };
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs b/src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs
index ee53cf685e..54922e8101 100644
--- a/src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs
+++ b/src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs
@@ -9,69 +9,68 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.App.Tests
+namespace GitVersion.App.Tests;
+
+[TestFixture]
+public class TagCheckoutInBuildAgentTests
 {
-    [TestFixture]
-    public class TagCheckoutInBuildAgentTests
+    [Test]
+    public async Task VerifyTagCheckoutOnAzurePipelines()
     {
-        [Test]
-        public async Task VerifyTagCheckoutOnAzurePipelines()
+        var env = new Dictionary<string, string>
         {
-            var env = new Dictionary<string, string>
-            {
-                { AzurePipelines.EnvironmentVariableName, "true" },
-                { "BUILD_SOURCEBRANCH", "refs/tags/0.2.0" },
-            };
+            { AzurePipelines.EnvironmentVariableName, "true" },
+            { "BUILD_SOURCEBRANCH", "refs/tags/0.2.0" },
+        };
 
-            await VerifyTagCheckoutVersionIsCalculatedProperly(env);
-        }
+        await VerifyTagCheckoutVersionIsCalculatedProperly(env);
+    }
 
-        [Test]
-        public async Task VerifyTagCheckoutOnGitHubActions()
+    [Test]
+    public async Task VerifyTagCheckoutOnGitHubActions()
+    {
+        var env = new Dictionary<string, string>
         {
-            var env = new Dictionary<string, string>
-            {
-                { GitHubActions.EnvironmentVariableName, "true" },
-                { "GITHUB_REF", "ref/tags/0.2.0" },
-            };
+            { GitHubActions.EnvironmentVariableName, "true" },
+            { "GITHUB_REF", "ref/tags/0.2.0" },
+        };
 
-            await VerifyTagCheckoutVersionIsCalculatedProperly(env);
-        }
+        await VerifyTagCheckoutVersionIsCalculatedProperly(env);
+    }
 
-        private static async Task VerifyTagCheckoutVersionIsCalculatedProperly(Dictionary<string, string> env)
+    private static async Task VerifyTagCheckoutVersionIsCalculatedProperly(Dictionary<string, string> env)
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        var remoteRepositoryPath = PathHelper.GetTempPath();
+        RepositoryFixtureBase.Init(remoteRepositoryPath);
+        using (var remoteRepository = new Repository(remoteRepositoryPath))
         {
-            using var fixture = new EmptyRepositoryFixture();
-            var remoteRepositoryPath = PathHelper.GetTempPath();
-            RepositoryFixtureBase.Init(remoteRepositoryPath);
-            using (var remoteRepository = new Repository(remoteRepositoryPath))
-            {
-                remoteRepository.Config.Set("user.name", "Test");
-                remoteRepository.Config.Set("user.email", "test@email.com");
-                fixture.Repository.Network.Remotes.Add("origin", remoteRepositoryPath);
-                Console.WriteLine("Created git repository at {0}", remoteRepositoryPath);
-                remoteRepository.MakeATaggedCommit("0.1.0");
-                Commands.Checkout(remoteRepository, remoteRepository.CreateBranch("develop"));
-                remoteRepository.MakeACommit();
-                Commands.Checkout(remoteRepository, remoteRepository.CreateBranch("release/0.2.0"));
-                remoteRepository.MakeACommit();
-                Commands.Checkout(remoteRepository, TestBase.MainBranch);
-                remoteRepository.MergeNoFF("release/0.2.0", Generate.SignatureNow());
-                remoteRepository.MakeATaggedCommit("0.2.0");
+            remoteRepository.Config.Set("user.name", "Test");
+            remoteRepository.Config.Set("user.email", "test@email.com");
+            fixture.Repository.Network.Remotes.Add("origin", remoteRepositoryPath);
+            Console.WriteLine("Created git repository at {0}", remoteRepositoryPath);
+            remoteRepository.MakeATaggedCommit("0.1.0");
+            Commands.Checkout(remoteRepository, remoteRepository.CreateBranch("develop"));
+            remoteRepository.MakeACommit();
+            Commands.Checkout(remoteRepository, remoteRepository.CreateBranch("release/0.2.0"));
+            remoteRepository.MakeACommit();
+            Commands.Checkout(remoteRepository, TestBase.MainBranch);
+            remoteRepository.MergeNoFF("release/0.2.0", Generate.SignatureNow());
+            remoteRepository.MakeATaggedCommit("0.2.0");
 
-                Commands.Fetch((Repository)fixture.Repository, "origin", Array.Empty<string>(), new FetchOptions(), null);
-                Commands.Checkout(fixture.Repository, "0.2.0");
-            }
+            Commands.Fetch((Repository)fixture.Repository, "origin", Array.Empty<string>(), new FetchOptions(), null);
+            Commands.Checkout(fixture.Repository, "0.2.0");
+        }
 
-            var programFixture = new ProgramFixture(fixture.RepositoryPath);
-            programFixture.WithEnv(env.ToArray());
+        var programFixture = new ProgramFixture(fixture.RepositoryPath);
+        programFixture.WithEnv(env.ToArray());
 
-            var result = await programFixture.Run();
+        var result = await programFixture.Run();
 
-            result.ExitCode.ShouldBe(0);
-            result.OutputVariables.FullSemVer.ShouldBe("0.2.0");
+        result.ExitCode.ShouldBe(0);
+        result.OutputVariables.FullSemVer.ShouldBe("0.2.0");
 
-            // Cleanup repository files
-            DirectoryHelper.DeleteDirectory(remoteRepositoryPath);
-        }
+        // Cleanup repository files
+        DirectoryHelper.DeleteDirectory(remoteRepositoryPath);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/UpdateWixVersionFileTests.cs b/src/GitVersion.App.Tests/UpdateWixVersionFileTests.cs
index b6ced7f1a7..960fd71680 100644
--- a/src/GitVersion.App.Tests/UpdateWixVersionFileTests.cs
+++ b/src/GitVersion.App.Tests/UpdateWixVersionFileTests.cs
@@ -7,86 +7,85 @@
 using GitVersion.VersionConverters.WixUpdater;
 using NUnit.Framework;
 
-namespace GitVersion.App.Tests
+namespace GitVersion.App.Tests;
+
+[TestFixture]
+[Parallelizable(ParallelScope.None)]
+internal class UpdateWixVersionFileTests
 {
-    [TestFixture]
-    [Parallelizable(ParallelScope.None)]
-    internal class UpdateWixVersionFileTests
-    {
-        private string wixVersionFileName;
+    private string wixVersionFileName;
 
-        [SetUp]
-        public void Setup() => this.wixVersionFileName = WixVersionFileUpdater.WixVersionFileName;
+    [SetUp]
+    public void Setup() => this.wixVersionFileName = WixVersionFileUpdater.WixVersionFileName;
 
-        [Test]
-        public void WixVersionFileCreationTest()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeATaggedCommit("1.2.3");
-            fixture.MakeACommit();
+    [Test]
+    public void WixVersionFileCreationTest()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeATaggedCommit("1.2.3");
+        fixture.MakeACommit();
 
-            GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /updatewixversionfile");
-            Assert.IsTrue(File.Exists(Path.Combine(fixture.RepositoryPath, this.wixVersionFileName)));
-        }
+        GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /updatewixversionfile");
+        Assert.IsTrue(File.Exists(Path.Combine(fixture.RepositoryPath, this.wixVersionFileName)));
+    }
 
-        [Test]
-        public void WixVersionFileVarCountTest()
-        {
-            //Make sure we have captured all the version variables by count in the Wix version file
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeATaggedCommit("1.2.3");
-            fixture.MakeACommit();
+    [Test]
+    public void WixVersionFileVarCountTest()
+    {
+        //Make sure we have captured all the version variables by count in the Wix version file
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeATaggedCommit("1.2.3");
+        fixture.MakeACommit();
 
-            GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: null);
+        GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: null);
 
-            GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /updatewixversionfile");
+        GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /updatewixversionfile");
 
-            var gitVersionVarsInWix = GetGitVersionVarsInWixFile(Path.Combine(fixture.RepositoryPath, this.wixVersionFileName));
-            var gitVersionVars = VersionVariables.AvailableVariables;
+        var gitVersionVarsInWix = GetGitVersionVarsInWixFile(Path.Combine(fixture.RepositoryPath, this.wixVersionFileName));
+        var gitVersionVars = VersionVariables.AvailableVariables;
 
-            Assert.AreEqual(gitVersionVars.Count(), gitVersionVarsInWix.Count);
-        }
+        Assert.AreEqual(gitVersionVars.Count(), gitVersionVarsInWix.Count);
+    }
 
-        [Test]
-        public void WixVersionFileContentTest()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeATaggedCommit("1.2.3");
-            fixture.MakeACommit();
+    [Test]
+    public void WixVersionFileContentTest()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeATaggedCommit("1.2.3");
+        fixture.MakeACommit();
 
-            var gitVersionExecutionResults = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: null);
-            var vars = gitVersionExecutionResults.OutputVariables;
+        var gitVersionExecutionResults = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: null);
+        var vars = gitVersionExecutionResults.OutputVariables;
 
-            GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /updatewixversionfile");
+        GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /updatewixversionfile");
 
-            var gitVersionVarsInWix = GetGitVersionVarsInWixFile(Path.Combine(fixture.RepositoryPath, this.wixVersionFileName));
-            var gitVersionVars = VersionVariables.AvailableVariables;
+        var gitVersionVarsInWix = GetGitVersionVarsInWixFile(Path.Combine(fixture.RepositoryPath, this.wixVersionFileName));
+        var gitVersionVars = VersionVariables.AvailableVariables;
 
-            foreach (var variable in gitVersionVars)
-            {
-                vars.TryGetValue(variable, out var value);
-                //Make sure the variable is present in the Wix file
-                Assert.IsTrue(gitVersionVarsInWix.ContainsKey(variable));
-                //Make sure the values are equal
-                Assert.AreEqual(value, gitVersionVarsInWix[variable]);
-            }
+        foreach (var variable in gitVersionVars)
+        {
+            vars.TryGetValue(variable, out var value);
+            //Make sure the variable is present in the Wix file
+            Assert.IsTrue(gitVersionVarsInWix.ContainsKey(variable));
+            //Make sure the values are equal
+            Assert.AreEqual(value, gitVersionVarsInWix[variable]);
         }
+    }
 
-        private static Dictionary<string, string> GetGitVersionVarsInWixFile(string file)
+    private static Dictionary<string, string> GetGitVersionVarsInWixFile(string file)
+    {
+        var gitVersionVarsInWix = new Dictionary<string, string>();
+        using (var reader = new XmlTextReader(file))
         {
-            var gitVersionVarsInWix = new Dictionary<string, string>();
-            using (var reader = new XmlTextReader(file))
+            while (reader.Read())
             {
-                while (reader.Read())
+                if (reader.Name == "define")
                 {
-                    if (reader.Name == "define")
-                    {
-                        var component = reader.Value.Split('=');
-                        gitVersionVarsInWix[component[0]] = component[1].TrimStart('"').TrimEnd('"');
-                    }
+                    var component = reader.Value.Split('=');
+                    gitVersionVarsInWix[component[0]] = component[1].TrimStart('"').TrimEnd('"');
                 }
             }
-            return gitVersionVarsInWix;
         }
+        return gitVersionVarsInWix;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/VersionWriterTests.cs b/src/GitVersion.App.Tests/VersionWriterTests.cs
index 8f22e12c6a..2589e855c8 100644
--- a/src/GitVersion.App.Tests/VersionWriterTests.cs
+++ b/src/GitVersion.App.Tests/VersionWriterTests.cs
@@ -7,58 +7,57 @@
 using Mono.Cecil;
 using NUnit.Framework;
 
-namespace GitVersion.App.Tests
+namespace GitVersion.App.Tests;
+
+[TestFixture]
+public class VersionWriterTests : TestBase
 {
-    [TestFixture]
-    public class VersionWriterTests : TestBase
-    {
-        private readonly IVersionWriter versionWriter;
+    private readonly IVersionWriter versionWriter;
 
-        public VersionWriterTests()
-        {
-            var sp = ConfigureServices(services => services.AddModule(new GitVersionAppModule()));
+    public VersionWriterTests()
+    {
+        var sp = ConfigureServices(services => services.AddModule(new GitVersionAppModule()));
 
-            this.versionWriter = sp.GetService<IVersionWriter>();
-        }
-        [Test]
-        public void WriteVersionShouldWriteFileVersionWithNoPrereleaseTag()
-        {
-            var asm = GenerateAssembly(new Version(1, 0, 0), "");
+        this.versionWriter = sp.GetService<IVersionWriter>();
+    }
+    [Test]
+    public void WriteVersionShouldWriteFileVersionWithNoPrereleaseTag()
+    {
+        var asm = GenerateAssembly(new Version(1, 0, 0), "");
 
-            string version = null;
-            this.versionWriter.WriteTo(asm, v => version = v);
+        string version = null;
+        this.versionWriter.WriteTo(asm, v => version = v);
 
-            Assert.IsNotNull(asm);
-            Assert.AreEqual("1.0.0", version);
-        }
+        Assert.IsNotNull(asm);
+        Assert.AreEqual("1.0.0", version);
+    }
 
-        [Test]
-        public void WriteVersionShouldWriteFileVersionWithPrereleaseTag()
-        {
-            var asm = GenerateAssembly(new Version(1, 0, 0), "-beta0004");
+    [Test]
+    public void WriteVersionShouldWriteFileVersionWithPrereleaseTag()
+    {
+        var asm = GenerateAssembly(new Version(1, 0, 0), "-beta0004");
 
-            string version = null;
-            this.versionWriter.WriteTo(asm, v => version = v);
+        string version = null;
+        this.versionWriter.WriteTo(asm, v => version = v);
 
-            Assert.IsNotNull(asm);
-            Assert.AreEqual("1.0.0-beta0004", version);
-        }
+        Assert.IsNotNull(asm);
+        Assert.AreEqual("1.0.0-beta0004", version);
+    }
 
-        private static Assembly GenerateAssembly(Version fileVersion, string prereleaseInfo)
-        {
-            var definition = new AssemblyNameDefinition("test-asm", fileVersion);
+    private static Assembly GenerateAssembly(Version fileVersion, string prereleaseInfo)
+    {
+        var definition = new AssemblyNameDefinition("test-asm", fileVersion);
 
-            var asmDef = AssemblyDefinition.CreateAssembly(definition, "test-asm", ModuleKind.Dll);
-            var constructor = typeof(AssemblyInformationalVersionAttribute).GetConstructor(new[] { typeof(string) });
-            var methodReference = asmDef.MainModule.ImportReference(constructor);
-            var customAttribute = new CustomAttribute(methodReference);
-            customAttribute.ConstructorArguments.Add(new CustomAttributeArgument(asmDef.MainModule.TypeSystem.String, fileVersion + prereleaseInfo));
-            asmDef.CustomAttributes.Add(customAttribute);
+        var asmDef = AssemblyDefinition.CreateAssembly(definition, "test-asm", ModuleKind.Dll);
+        var constructor = typeof(AssemblyInformationalVersionAttribute).GetConstructor(new[] { typeof(string) });
+        var methodReference = asmDef.MainModule.ImportReference(constructor);
+        var customAttribute = new CustomAttribute(methodReference);
+        customAttribute.ConstructorArguments.Add(new CustomAttributeArgument(asmDef.MainModule.TypeSystem.String, fileVersion + prereleaseInfo));
+        asmDef.CustomAttributes.Add(customAttribute);
 
-            using var memoryStream = new MemoryStream();
-            asmDef.Write(memoryStream);
+        using var memoryStream = new MemoryStream();
+        asmDef.Write(memoryStream);
 
-            return Assembly.Load(memoryStream.ToArray());
-        }
+        return Assembly.Load(memoryStream.ToArray());
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/ArgumentParser.cs b/src/GitVersion.App/ArgumentParser.cs
index 354036dfc3..632e7ec3da 100644
--- a/src/GitVersion.App/ArgumentParser.cs
+++ b/src/GitVersion.App/ArgumentParser.cs
@@ -9,580 +9,579 @@
 using GitVersion.Model;
 using GitVersion.OutputVariables;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class ArgumentParser : IArgumentParser
 {
-    public class ArgumentParser : IArgumentParser
-    {
-        private readonly IEnvironment environment;
-        private readonly ICurrentBuildAgent buildAgent;
-        private readonly IConsole console;
-        private readonly IGlobbingResolver globbingResolver;
-        private const string defaultOutputFileName = "GitVersion.json";
+    private readonly IEnvironment environment;
+    private readonly ICurrentBuildAgent buildAgent;
+    private readonly IConsole console;
+    private readonly IGlobbingResolver globbingResolver;
+    private const string defaultOutputFileName = "GitVersion.json";
 
-        public ArgumentParser(IEnvironment environment, ICurrentBuildAgent buildAgent, IConsole console, IGlobbingResolver globbingResolver)
-        {
-            this.environment = environment ?? throw new ArgumentNullException(nameof(environment));
-            this.console = console ?? throw new ArgumentNullException(nameof(console));
-            this.globbingResolver = globbingResolver ?? throw new ArgumentNullException(nameof(globbingResolver));
-            this.buildAgent = buildAgent;
-        }
+    public ArgumentParser(IEnvironment environment, ICurrentBuildAgent buildAgent, IConsole console, IGlobbingResolver globbingResolver)
+    {
+        this.environment = environment ?? throw new ArgumentNullException(nameof(environment));
+        this.console = console ?? throw new ArgumentNullException(nameof(console));
+        this.globbingResolver = globbingResolver ?? throw new ArgumentNullException(nameof(globbingResolver));
+        this.buildAgent = buildAgent;
+    }
 
-        public Arguments ParseArguments(string commandLineArguments)
-        {
-            var arguments = QuotedStringHelpers.SplitUnquoted(commandLineArguments, ' ');
+    public Arguments ParseArguments(string commandLineArguments)
+    {
+        var arguments = QuotedStringHelpers.SplitUnquoted(commandLineArguments, ' ');
 
-            return ParseArguments(arguments);
-        }
+        return ParseArguments(arguments);
+    }
 
-        public Arguments ParseArguments(string[] commandLineArguments)
+    public Arguments ParseArguments(string[] commandLineArguments)
+    {
+        if (commandLineArguments.Length == 0)
         {
-            if (commandLineArguments.Length == 0)
+            var args = new Arguments
             {
-                var args = new Arguments
-                {
-                    TargetPath = System.Environment.CurrentDirectory,
-                };
+                TargetPath = System.Environment.CurrentDirectory,
+            };
 
-                args.Output.Add(OutputType.Json);
+            args.Output.Add(OutputType.Json);
 
-                AddAuthentication(args);
+            AddAuthentication(args);
 
-                args.NoFetch = this.buildAgent != null && this.buildAgent.PreventFetch();
+            args.NoFetch = this.buildAgent != null && this.buildAgent.PreventFetch();
 
-                return args;
-            }
+            return args;
+        }
 
-            var firstArgument = commandLineArguments.First();
+        var firstArgument = commandLineArguments.First();
 
-            if (firstArgument.IsInit())
+        if (firstArgument.IsInit())
+        {
+            return new Arguments
             {
-                return new Arguments
-                {
-                    TargetPath = System.Environment.CurrentDirectory,
-                    Init = true,
-                };
-            }
+                TargetPath = System.Environment.CurrentDirectory,
+                Init = true,
+            };
+        }
 
-            if (firstArgument.IsHelp())
+        if (firstArgument.IsHelp())
+        {
+            return new Arguments
             {
-                return new Arguments
-                {
-                    IsHelp = true,
-                };
-            }
+                IsHelp = true,
+            };
+        }
 
-            if (firstArgument.IsSwitch("version"))
+        if (firstArgument.IsSwitch("version"))
+        {
+            return new Arguments
             {
-                return new Arguments
-                {
-                    IsVersion = true,
-                };
-            }
+                IsVersion = true,
+            };
+        }
 
-            var arguments = new Arguments();
+        var arguments = new Arguments();
 
-            AddAuthentication(arguments);
+        AddAuthentication(arguments);
 
-            var switchesAndValues = CollectSwitchesAndValuesFromArguments(commandLineArguments, out var firstArgumentIsSwitch);
+        var switchesAndValues = CollectSwitchesAndValuesFromArguments(commandLineArguments, out var firstArgumentIsSwitch);
 
-            for (var i = 0; i < switchesAndValues.AllKeys.Length; i++)
-            {
-                ParseSwitchArguments(arguments, switchesAndValues, i);
-            }
+        for (var i = 0; i < switchesAndValues.AllKeys.Length; i++)
+        {
+            ParseSwitchArguments(arguments, switchesAndValues, i);
+        }
 
-            if (arguments.Output.Count == 0)
-            {
-                arguments.Output.Add(OutputType.Json);
-            }
+        if (arguments.Output.Count == 0)
+        {
+            arguments.Output.Add(OutputType.Json);
+        }
 
-            if (arguments.Output.Contains(OutputType.File) && arguments.OutputFile == null)
-            {
-                arguments.OutputFile = defaultOutputFileName;
-            }
+        if (arguments.Output.Contains(OutputType.File) && arguments.OutputFile == null)
+        {
+            arguments.OutputFile = defaultOutputFileName;
+        }
 
-            // If the first argument is a switch, it should already have been consumed in the above loop,
-            // or else a WarningException should have been thrown and we wouldn't end up here.
-            arguments.TargetPath ??= firstArgumentIsSwitch
-                ? System.Environment.CurrentDirectory
-                : firstArgument;
+        // If the first argument is a switch, it should already have been consumed in the above loop,
+        // or else a WarningException should have been thrown and we wouldn't end up here.
+        arguments.TargetPath ??= firstArgumentIsSwitch
+            ? System.Environment.CurrentDirectory
+            : firstArgument;
 
-            arguments.TargetPath = arguments.TargetPath.TrimEnd('/', '\\');
+        arguments.TargetPath = arguments.TargetPath.TrimEnd('/', '\\');
 
-            if (!arguments.EnsureAssemblyInfo) arguments.UpdateAssemblyInfoFileName = ResolveFiles(arguments.TargetPath, arguments.UpdateAssemblyInfoFileName).ToHashSet();
-            arguments.NoFetch = arguments.NoFetch || this.buildAgent != null && this.buildAgent.PreventFetch();
+        if (!arguments.EnsureAssemblyInfo) arguments.UpdateAssemblyInfoFileName = ResolveFiles(arguments.TargetPath, arguments.UpdateAssemblyInfoFileName).ToHashSet();
+        arguments.NoFetch = arguments.NoFetch || this.buildAgent != null && this.buildAgent.PreventFetch();
 
-            return arguments;
-        }
+        return arguments;
+    }
 
-        private void ParseSwitchArguments(Arguments arguments, NameValueCollection switchesAndValues, int i)
-        {
-            var name = switchesAndValues.AllKeys[i];
-            var values = switchesAndValues.GetValues(name);
-            var value = values?.FirstOrDefault();
+    private void ParseSwitchArguments(Arguments arguments, NameValueCollection switchesAndValues, int i)
+    {
+        var name = switchesAndValues.AllKeys[i];
+        var values = switchesAndValues.GetValues(name);
+        var value = values?.FirstOrDefault();
 
-            if (ParseSwitches(arguments, name, values, value)) return;
+        if (ParseSwitches(arguments, name, values, value)) return;
 
-            ParseTargetPath(arguments, name, values, value, i == 0);
-        }
+        ParseTargetPath(arguments, name, values, value, i == 0);
+    }
 
-        private void AddAuthentication(Arguments arguments)
+    private void AddAuthentication(Arguments arguments)
+    {
+        var username = this.environment.GetEnvironmentVariable("GITVERSION_REMOTE_USERNAME");
+        if (!username.IsNullOrWhiteSpace())
         {
-            var username = this.environment.GetEnvironmentVariable("GITVERSION_REMOTE_USERNAME");
-            if (!username.IsNullOrWhiteSpace())
-            {
-                arguments.Authentication.Username = username;
-            }
+            arguments.Authentication.Username = username;
+        }
 
-            var password = this.environment.GetEnvironmentVariable("GITVERSION_REMOTE_PASSWORD");
-            if (!password.IsNullOrWhiteSpace())
-            {
-                arguments.Authentication.Password = password;
-            }
+        var password = this.environment.GetEnvironmentVariable("GITVERSION_REMOTE_PASSWORD");
+        if (!password.IsNullOrWhiteSpace())
+        {
+            arguments.Authentication.Password = password;
         }
+    }
+
+    private IEnumerable<string> ResolveFiles(string workingDirectory, ISet<string> assemblyInfoFiles)
+    {
+        if (assemblyInfoFiles == null) yield break;
 
-        private IEnumerable<string> ResolveFiles(string workingDirectory, ISet<string> assemblyInfoFiles)
+        foreach (var file in assemblyInfoFiles)
         {
-            if (assemblyInfoFiles == null) yield break;
+            var paths = this.globbingResolver.Resolve(workingDirectory, file);
 
-            foreach (var file in assemblyInfoFiles)
+            foreach (var path in paths)
             {
-                var paths = this.globbingResolver.Resolve(workingDirectory, file);
-
-                foreach (var path in paths)
-                {
-                    yield return Path.GetFullPath(Path.Combine(workingDirectory, path));
-                }
+                yield return Path.GetFullPath(Path.Combine(workingDirectory, path));
             }
         }
+    }
 
-        private void ParseTargetPath(Arguments arguments, string name, string[] values, string value, bool parseEnded)
+    private void ParseTargetPath(Arguments arguments, string name, string[] values, string value, bool parseEnded)
+    {
+        if (name.IsSwitch("targetpath"))
         {
-            if (name.IsSwitch("targetpath"))
+            EnsureArgumentValueCount(values);
+            arguments.TargetPath = value;
+            if (!Directory.Exists(value))
             {
-                EnsureArgumentValueCount(values);
-                arguments.TargetPath = value;
-                if (!Directory.Exists(value))
-                {
-                    this.console.WriteLine($"The working directory '{value}' does not exist.");
-                }
-
-                return;
+                this.console.WriteLine($"The working directory '{value}' does not exist.");
             }
 
-            var couldNotParseMessage = $"Could not parse command line parameter '{name}'.";
+            return;
+        }
+
+        var couldNotParseMessage = $"Could not parse command line parameter '{name}'.";
 
-            // If we've reached through all argument switches without a match, we can relatively safely assume that the first argument isn't a switch, but the target path.
-            if (parseEnded)
+        // If we've reached through all argument switches without a match, we can relatively safely assume that the first argument isn't a switch, but the target path.
+        if (parseEnded)
+        {
+            if (name.StartsWith("/"))
             {
-                if (name.StartsWith("/"))
-                {
-                    if (Path.DirectorySeparatorChar == '/' && name.IsValidPath())
-                    {
-                        arguments.TargetPath = name;
-                        return;
-                    }
-                }
-                else if (!name.IsSwitchArgument())
+                if (Path.DirectorySeparatorChar == '/' && name.IsValidPath())
                 {
                     arguments.TargetPath = name;
                     return;
                 }
-
-                couldNotParseMessage += " If it is the target path, make sure it exists.";
             }
-
-            throw new WarningException(couldNotParseMessage);
-        }
-
-        private static bool ParseSwitches(Arguments arguments, string name, string[] values, string value)
-        {
-            if (name.IsSwitch("l"))
+            else if (!name.IsSwitchArgument())
             {
-                EnsureArgumentValueCount(values);
-                arguments.LogFilePath = value;
-                return true;
+                arguments.TargetPath = name;
+                return;
             }
 
-            if (ParseConfigArguments(arguments, name, values, value)) return true;
+            couldNotParseMessage += " If it is the target path, make sure it exists.";
+        }
 
-            if (ParseRemoteArguments(arguments, name, values, value)) return true;
+        throw new WarningException(couldNotParseMessage);
+    }
 
-            if (name.IsSwitch("diag"))
-            {
-                if (value == null || value.IsTrue())
-                {
-                    arguments.Diag = true;
-                }
+    private static bool ParseSwitches(Arguments arguments, string name, string[] values, string value)
+    {
+        if (name.IsSwitch("l"))
+        {
+            EnsureArgumentValueCount(values);
+            arguments.LogFilePath = value;
+            return true;
+        }
 
-                return true;
-            }
+        if (ParseConfigArguments(arguments, name, values, value)) return true;
 
-            if (name.IsSwitch("updateprojectfiles"))
-            {
-                ParseUpdateProjectInfo(arguments, value, values);
-                return true;
-            }
+        if (ParseRemoteArguments(arguments, name, values, value)) return true;
 
-            if (name.IsSwitch("updateAssemblyInfo"))
+        if (name.IsSwitch("diag"))
+        {
+            if (value == null || value.IsTrue())
             {
-                ParseUpdateAssemblyInfo(arguments, value, values);
-                return true;
+                arguments.Diag = true;
             }
 
-            if (name.IsSwitch("ensureassemblyinfo"))
-            {
-                ParseEnsureAssemblyInfo(arguments, value);
-                return true;
-            }
+            return true;
+        }
 
-            if (name.IsSwitch("v") || name.IsSwitch("showvariable"))
-            {
-                ParseShowVariable(arguments, value, name);
-                return true;
-            }
+        if (name.IsSwitch("updateprojectfiles"))
+        {
+            ParseUpdateProjectInfo(arguments, value, values);
+            return true;
+        }
 
-            if (name.IsSwitch("output"))
-            {
-                ParseOutput(arguments, values);
-                return true;
-            }
+        if (name.IsSwitch("updateAssemblyInfo"))
+        {
+            ParseUpdateAssemblyInfo(arguments, value, values);
+            return true;
+        }
 
-            if (name.IsSwitch("outputfile"))
-            {
-                EnsureArgumentValueCount(values);
-                arguments.OutputFile = value;
-                return true;
-            }
+        if (name.IsSwitch("ensureassemblyinfo"))
+        {
+            ParseEnsureAssemblyInfo(arguments, value);
+            return true;
+        }
 
-            if (name.IsSwitch("nofetch"))
-            {
-                arguments.NoFetch = true;
-                return true;
-            }
+        if (name.IsSwitch("v") || name.IsSwitch("showvariable"))
+        {
+            ParseShowVariable(arguments, value, name);
+            return true;
+        }
 
-            if (name.IsSwitch("nonormalize"))
-            {
-                arguments.NoNormalize = true;
-                return true;
-            }
+        if (name.IsSwitch("output"))
+        {
+            ParseOutput(arguments, values);
+            return true;
+        }
 
-            if (name.IsSwitch("nocache"))
-            {
-                arguments.NoCache = true;
-                return true;
-            }
+        if (name.IsSwitch("outputfile"))
+        {
+            EnsureArgumentValueCount(values);
+            arguments.OutputFile = value;
+            return true;
+        }
 
-            if (name.IsSwitch("verbosity"))
-            {
-                ParseVerbosity(arguments, value);
-                return true;
-            }
+        if (name.IsSwitch("nofetch"))
+        {
+            arguments.NoFetch = true;
+            return true;
+        }
 
-            if (name.IsSwitch("updatewixversionfile"))
-            {
-                arguments.UpdateWixVersionFile = true;
-                return true;
-            }
+        if (name.IsSwitch("nonormalize"))
+        {
+            arguments.NoNormalize = true;
+            return true;
+        }
 
-            return false;
+        if (name.IsSwitch("nocache"))
+        {
+            arguments.NoCache = true;
+            return true;
         }
 
-        private static bool ParseConfigArguments(Arguments arguments, string name, string[] values, string value)
+        if (name.IsSwitch("verbosity"))
         {
-            if (name.IsSwitch("config"))
-            {
-                EnsureArgumentValueCount(values);
-                arguments.ConfigFile = value;
-                return true;
-            }
+            ParseVerbosity(arguments, value);
+            return true;
+        }
 
-            if (name.IsSwitch("overrideconfig"))
-            {
-                ParseOverrideConfig(arguments, values);
-                return true;
-            }
+        if (name.IsSwitch("updatewixversionfile"))
+        {
+            arguments.UpdateWixVersionFile = true;
+            return true;
+        }
 
-            if (name.IsSwitch("showConfig"))
-            {
-                arguments.ShowConfig = value.IsTrue() || !value.IsFalse();
-                return true;
-            }
+        return false;
+    }
 
-            return false;
+    private static bool ParseConfigArguments(Arguments arguments, string name, string[] values, string value)
+    {
+        if (name.IsSwitch("config"))
+        {
+            EnsureArgumentValueCount(values);
+            arguments.ConfigFile = value;
+            return true;
         }
 
-        private static bool ParseRemoteArguments(Arguments arguments, string name, string[] values, string value)
+        if (name.IsSwitch("overrideconfig"))
         {
-            if (name.IsSwitch("dynamicRepoLocation"))
-            {
-                EnsureArgumentValueCount(values);
-                arguments.DynamicRepositoryClonePath = value;
-                return true;
-            }
+            ParseOverrideConfig(arguments, values);
+            return true;
+        }
 
-            if (name.IsSwitch("url"))
-            {
-                EnsureArgumentValueCount(values);
-                arguments.TargetUrl = value;
-                return true;
-            }
+        if (name.IsSwitch("showConfig"))
+        {
+            arguments.ShowConfig = value.IsTrue() || !value.IsFalse();
+            return true;
+        }
 
-            if (name.IsSwitch("u"))
-            {
-                EnsureArgumentValueCount(values);
-                arguments.Authentication.Username = value;
-                return true;
-            }
+        return false;
+    }
 
-            if (name.IsSwitch("p"))
-            {
-                EnsureArgumentValueCount(values);
-                arguments.Authentication.Password = value;
-                return true;
-            }
+    private static bool ParseRemoteArguments(Arguments arguments, string name, string[] values, string value)
+    {
+        if (name.IsSwitch("dynamicRepoLocation"))
+        {
+            EnsureArgumentValueCount(values);
+            arguments.DynamicRepositoryClonePath = value;
+            return true;
+        }
 
-            if (name.IsSwitch("c"))
-            {
-                EnsureArgumentValueCount(values);
-                arguments.CommitId = value;
-                return true;
-            }
+        if (name.IsSwitch("url"))
+        {
+            EnsureArgumentValueCount(values);
+            arguments.TargetUrl = value;
+            return true;
+        }
 
-            if (name.IsSwitch("b"))
-            {
-                EnsureArgumentValueCount(values);
-                arguments.TargetBranch = value;
-                return true;
-            }
+        if (name.IsSwitch("u"))
+        {
+            EnsureArgumentValueCount(values);
+            arguments.Authentication.Username = value;
+            return true;
+        }
 
-            return false;
+        if (name.IsSwitch("p"))
+        {
+            EnsureArgumentValueCount(values);
+            arguments.Authentication.Password = value;
+            return true;
         }
 
-        private static void ParseShowVariable(Arguments arguments, string value, string name)
+        if (name.IsSwitch("c"))
         {
-            string versionVariable = null;
+            EnsureArgumentValueCount(values);
+            arguments.CommitId = value;
+            return true;
+        }
 
-            if (!value.IsNullOrWhiteSpace())
-            {
-                versionVariable = VersionVariables.AvailableVariables.SingleOrDefault(av => av.Equals(value.Replace("'", ""), StringComparison.CurrentCultureIgnoreCase));
-            }
+        if (name.IsSwitch("b"))
+        {
+            EnsureArgumentValueCount(values);
+            arguments.TargetBranch = value;
+            return true;
+        }
 
-            if (versionVariable == null)
-            {
-                var message = $"{name} requires a valid version variable. Available variables are:{System.Environment.NewLine}" +
-                              string.Join(", ", VersionVariables.AvailableVariables.Select(x => string.Concat("'", x, "'")));
-                throw new WarningException(message);
-            }
+        return false;
+    }
 
-            arguments.ShowVariable = versionVariable;
+    private static void ParseShowVariable(Arguments arguments, string value, string name)
+    {
+        string versionVariable = null;
+
+        if (!value.IsNullOrWhiteSpace())
+        {
+            versionVariable = VersionVariables.AvailableVariables.SingleOrDefault(av => av.Equals(value.Replace("'", ""), StringComparison.CurrentCultureIgnoreCase));
         }
 
-        private static void ParseEnsureAssemblyInfo(Arguments arguments, string value)
+        if (versionVariable == null)
         {
-            arguments.EnsureAssemblyInfo = true;
-            if (value.IsFalse())
-            {
-                arguments.EnsureAssemblyInfo = false;
-            }
+            var message = $"{name} requires a valid version variable. Available variables are:{System.Environment.NewLine}" +
+                          string.Join(", ", VersionVariables.AvailableVariables.Select(x => string.Concat("'", x, "'")));
+            throw new WarningException(message);
+        }
 
-            if (arguments.UpdateProjectFiles)
-            {
-                throw new WarningException("Cannot specify -ensureassemblyinfo with updateprojectfiles: please ensure your project file exists before attempting to update it");
-            }
+        arguments.ShowVariable = versionVariable;
+    }
 
-            if (arguments.UpdateAssemblyInfoFileName.Count > 1 && arguments.EnsureAssemblyInfo)
-            {
-                throw new WarningException("Can't specify multiple assembly info files when using /ensureassemblyinfo switch, either use a single assembly info file or do not specify /ensureassemblyinfo and create assembly info files manually");
-            }
+    private static void ParseEnsureAssemblyInfo(Arguments arguments, string value)
+    {
+        arguments.EnsureAssemblyInfo = true;
+        if (value.IsFalse())
+        {
+            arguments.EnsureAssemblyInfo = false;
         }
 
-        private static void ParseOutput(Arguments arguments, string[] values)
+        if (arguments.UpdateProjectFiles)
         {
-            foreach (var v in values)
-            {
-                if (!Enum.TryParse(v, true, out OutputType outputType))
-                {
-                    throw new WarningException($"Value '{v}' cannot be parsed as output type, please use 'json', 'file' or 'buildserver'");
-                }
+            throw new WarningException("Cannot specify -ensureassemblyinfo with updateprojectfiles: please ensure your project file exists before attempting to update it");
+        }
 
-                arguments.Output.Add(outputType);
-            }
+        if (arguments.UpdateAssemblyInfoFileName.Count > 1 && arguments.EnsureAssemblyInfo)
+        {
+            throw new WarningException("Can't specify multiple assembly info files when using /ensureassemblyinfo switch, either use a single assembly info file or do not specify /ensureassemblyinfo and create assembly info files manually");
         }
+    }
 
-        private static void ParseVerbosity(Arguments arguments, string value)
+    private static void ParseOutput(Arguments arguments, string[] values)
+    {
+        foreach (var v in values)
         {
-            // first try the old version, this check will be removed in version 6.0.0, making it a breaking change
-            if (Enum.TryParse(value, true, out LogLevel logLevel))
+            if (!Enum.TryParse(v, true, out OutputType outputType))
             {
-                arguments.Verbosity = LogExtensions.GetVerbosityForLevel(logLevel);
-            }
-            else if (!Enum.TryParse(value, true, out arguments.Verbosity))
-            {
-                throw new WarningException($"Could not parse Verbosity value '{value}'");
+                throw new WarningException($"Value '{v}' cannot be parsed as output type, please use 'json', 'file' or 'buildserver'");
             }
+
+            arguments.Output.Add(outputType);
         }
+    }
 
-        private static void ParseOverrideConfig(Arguments arguments, string[] values)
+    private static void ParseVerbosity(Arguments arguments, string value)
+    {
+        // first try the old version, this check will be removed in version 6.0.0, making it a breaking change
+        if (Enum.TryParse(value, true, out LogLevel logLevel))
         {
-            if (values == null || values.Length == 0)
-                return;
-
-            var parser = new OverrideConfigOptionParser();
+            arguments.Verbosity = LogExtensions.GetVerbosityForLevel(logLevel);
+        }
+        else if (!Enum.TryParse(value, true, out arguments.Verbosity))
+        {
+            throw new WarningException($"Could not parse Verbosity value '{value}'");
+        }
+    }
 
-            // key=value
-            foreach (var keyValueOption in values)
-            {
-                var keyAndValue = QuotedStringHelpers.SplitUnquoted(keyValueOption, '=');
-                if (keyAndValue.Length != 2)
-                {
-                    throw new WarningException($"Could not parse /overrideconfig option: {keyValueOption}. Ensure it is in format 'key=value'.");
-                }
+    private static void ParseOverrideConfig(Arguments arguments, string[] values)
+    {
+        if (values == null || values.Length == 0)
+            return;
 
-                var optionKey = keyAndValue[0].ToLowerInvariant();
-                if (!OverrideConfigOptionParser.SupportedProperties.Contains(optionKey))
-                {
-                    throw new WarningException($"Could not parse /overrideconfig option: {keyValueOption}. Unsuported 'key'.");
-                }
-                else
-                {
-                    parser.SetValue(optionKey, keyAndValue[1]);
-                }
-            }
-            arguments.OverrideConfig = parser.GetConfig();
-        }
+        var parser = new OverrideConfigOptionParser();
 
-        private static void ParseUpdateAssemblyInfo(Arguments arguments, string value, string[] values)
+        // key=value
+        foreach (var keyValueOption in values)
         {
-            if (value.IsTrue())
-            {
-                arguments.UpdateAssemblyInfo = true;
-            }
-            else if (value.IsFalse())
-            {
-                arguments.UpdateAssemblyInfo = false;
-            }
-            else if (values != null && values.Length > 1)
+            var keyAndValue = QuotedStringHelpers.SplitUnquoted(keyValueOption, '=');
+            if (keyAndValue.Length != 2)
             {
-                arguments.UpdateAssemblyInfo = true;
-                foreach (var v in values)
-                {
-                    arguments.UpdateAssemblyInfoFileName.Add(v);
-                }
+                throw new WarningException($"Could not parse /overrideconfig option: {keyValueOption}. Ensure it is in format 'key=value'.");
             }
-            else if (!value.IsSwitchArgument())
+
+            var optionKey = keyAndValue[0].ToLowerInvariant();
+            if (!OverrideConfigOptionParser.SupportedProperties.Contains(optionKey))
             {
-                arguments.UpdateAssemblyInfo = true;
-                if (value != null)
-                {
-                    arguments.UpdateAssemblyInfoFileName.Add(value);
-                }
+                throw new WarningException($"Could not parse /overrideconfig option: {keyValueOption}. Unsuported 'key'.");
             }
             else
             {
-                arguments.UpdateAssemblyInfo = true;
+                parser.SetValue(optionKey, keyAndValue[1]);
             }
+        }
+        arguments.OverrideConfig = parser.GetConfig();
+    }
 
-            if (arguments.UpdateProjectFiles)
+    private static void ParseUpdateAssemblyInfo(Arguments arguments, string value, string[] values)
+    {
+        if (value.IsTrue())
+        {
+            arguments.UpdateAssemblyInfo = true;
+        }
+        else if (value.IsFalse())
+        {
+            arguments.UpdateAssemblyInfo = false;
+        }
+        else if (values != null && values.Length > 1)
+        {
+            arguments.UpdateAssemblyInfo = true;
+            foreach (var v in values)
             {
-                throw new WarningException("Cannot specify both updateprojectfiles and updateassemblyinfo in the same run. Please rerun GitVersion with only one parameter");
+                arguments.UpdateAssemblyInfoFileName.Add(v);
             }
-            if (arguments.UpdateAssemblyInfoFileName.Count > 1 && arguments.EnsureAssemblyInfo)
+        }
+        else if (!value.IsSwitchArgument())
+        {
+            arguments.UpdateAssemblyInfo = true;
+            if (value != null)
             {
-                throw new WarningException("Can't specify multiple assembly info files when using -ensureassemblyinfo switch, either use a single assembly info file or do not specify -ensureassemblyinfo and create assembly info files manually");
+                arguments.UpdateAssemblyInfoFileName.Add(value);
             }
         }
+        else
+        {
+            arguments.UpdateAssemblyInfo = true;
+        }
 
-        private static void ParseUpdateProjectInfo(Arguments arguments, string value, string[] values)
+        if (arguments.UpdateProjectFiles)
         {
-            if (value.IsTrue())
-            {
-                arguments.UpdateProjectFiles = true;
-            }
-            else if (value.IsFalse())
-            {
-                arguments.UpdateProjectFiles = false;
-            }
-            else if (values != null && values.Length > 1)
-            {
-                arguments.UpdateProjectFiles = true;
-                foreach (var v in values)
-                {
-                    arguments.UpdateAssemblyInfoFileName.Add(v);
-                }
-            }
-            else if (!value.IsSwitchArgument())
-            {
-                arguments.UpdateProjectFiles = true;
-                if (value != null)
-                {
-                    arguments.UpdateAssemblyInfoFileName.Add(value);
-                }
-            }
-            else
-            {
-                arguments.UpdateProjectFiles = true;
-            }
+            throw new WarningException("Cannot specify both updateprojectfiles and updateassemblyinfo in the same run. Please rerun GitVersion with only one parameter");
+        }
+        if (arguments.UpdateAssemblyInfoFileName.Count > 1 && arguments.EnsureAssemblyInfo)
+        {
+            throw new WarningException("Can't specify multiple assembly info files when using -ensureassemblyinfo switch, either use a single assembly info file or do not specify -ensureassemblyinfo and create assembly info files manually");
+        }
+    }
 
-            if (arguments.UpdateAssemblyInfo)
+    private static void ParseUpdateProjectInfo(Arguments arguments, string value, string[] values)
+    {
+        if (value.IsTrue())
+        {
+            arguments.UpdateProjectFiles = true;
+        }
+        else if (value.IsFalse())
+        {
+            arguments.UpdateProjectFiles = false;
+        }
+        else if (values != null && values.Length > 1)
+        {
+            arguments.UpdateProjectFiles = true;
+            foreach (var v in values)
             {
-                throw new WarningException("Cannot specify both updateassemblyinfo and updateprojectfiles in the same run. Please rerun GitVersion with only one parameter");
+                arguments.UpdateAssemblyInfoFileName.Add(v);
             }
-            if (arguments.EnsureAssemblyInfo)
+        }
+        else if (!value.IsSwitchArgument())
+        {
+            arguments.UpdateProjectFiles = true;
+            if (value != null)
             {
-                throw new WarningException("Cannot specify -ensureassemblyinfo with updateprojectfiles: please ensure your project file exists before attempting to update it");
+                arguments.UpdateAssemblyInfoFileName.Add(value);
             }
         }
+        else
+        {
+            arguments.UpdateProjectFiles = true;
+        }
 
-        private static void EnsureArgumentValueCount(IReadOnlyList<string> values)
+        if (arguments.UpdateAssemblyInfo)
         {
-            if (values != null && values.Count > 1)
-            {
-                throw new WarningException($"Could not parse command line parameter '{values[1]}'.");
-            }
+            throw new WarningException("Cannot specify both updateassemblyinfo and updateprojectfiles in the same run. Please rerun GitVersion with only one parameter");
         }
+        if (arguments.EnsureAssemblyInfo)
+        {
+            throw new WarningException("Cannot specify -ensureassemblyinfo with updateprojectfiles: please ensure your project file exists before attempting to update it");
+        }
+    }
 
-        private static NameValueCollection CollectSwitchesAndValuesFromArguments(IList<string> namedArguments, out bool firstArgumentIsSwitch)
+    private static void EnsureArgumentValueCount(IReadOnlyList<string> values)
+    {
+        if (values != null && values.Count > 1)
         {
-            firstArgumentIsSwitch = true;
-            var switchesAndValues = new NameValueCollection();
-            string currentKey = null;
-            var argumentRequiresValue = false;
+            throw new WarningException($"Could not parse command line parameter '{values[1]}'.");
+        }
+    }
 
-            for (var i = 0; i < namedArguments.Count; i += 1)
-            {
-                var arg = namedArguments[i];
+    private static NameValueCollection CollectSwitchesAndValuesFromArguments(IList<string> namedArguments, out bool firstArgumentIsSwitch)
+    {
+        firstArgumentIsSwitch = true;
+        var switchesAndValues = new NameValueCollection();
+        string currentKey = null;
+        var argumentRequiresValue = false;
 
-                // If the current (previous) argument doesn't require a value parameter and this is a switch, create new name/value entry for it, with a null value.
-                if (!argumentRequiresValue && arg.IsSwitchArgument())
-                {
-                    currentKey = arg;
-                    argumentRequiresValue = arg.ArgumentRequiresValue(i);
-                    switchesAndValues.Add(currentKey, null);
-                }
-                // If this is a value (not a switch)
-                else if (currentKey != null)
+        for (var i = 0; i < namedArguments.Count; i += 1)
+        {
+            var arg = namedArguments[i];
+
+            // If the current (previous) argument doesn't require a value parameter and this is a switch, create new name/value entry for it, with a null value.
+            if (!argumentRequiresValue && arg.IsSwitchArgument())
+            {
+                currentKey = arg;
+                argumentRequiresValue = arg.ArgumentRequiresValue(i);
+                switchesAndValues.Add(currentKey, null);
+            }
+            // If this is a value (not a switch)
+            else if (currentKey != null)
+            {
+                // And if the current switch does not have a value yet and the value is not itself a switch, set its value to this argument.
+                if (switchesAndValues[currentKey].IsNullOrEmpty())
                 {
-                    // And if the current switch does not have a value yet and the value is not itself a switch, set its value to this argument.
-                    if (switchesAndValues[currentKey].IsNullOrEmpty())
-                    {
-                        switchesAndValues[currentKey] = arg;
-                    }
-                    // Otherwise add the value under the same switch.
-                    else
-                    {
-                        switchesAndValues.Add(currentKey, arg);
-                    }
-
-                    // Reset the boolean argument flag so the next argument won't be ignored.
-                    argumentRequiresValue = false;
+                    switchesAndValues[currentKey] = arg;
                 }
-                else if (i == 0)
+                // Otherwise add the value under the same switch.
+                else
                 {
-                    firstArgumentIsSwitch = false;
+                    switchesAndValues.Add(currentKey, arg);
                 }
-            }
 
-            return switchesAndValues;
+                // Reset the boolean argument flag so the next argument won't be ignored.
+                argumentRequiresValue = false;
+            }
+            else if (i == 0)
+            {
+                firstArgumentIsSwitch = false;
+            }
         }
+
+        return switchesAndValues;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/Arguments.cs b/src/GitVersion.App/Arguments.cs
index 117e24ed8f..22c17e0889 100644
--- a/src/GitVersion.App/Arguments.cs
+++ b/src/GitVersion.App/Arguments.cs
@@ -3,106 +3,105 @@
 using GitVersion.Model;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class Arguments
 {
-    public class Arguments
-    {
-        public AuthenticationInfo Authentication = new();
+    public AuthenticationInfo Authentication = new();
 
-        public string ConfigFile;
-        public Config OverrideConfig;
-        public bool ShowConfig;
+    public string ConfigFile;
+    public Config OverrideConfig;
+    public bool ShowConfig;
 
-        public string TargetPath;
+    public string TargetPath;
 
-        public bool UpdateWixVersionFile;
+    public bool UpdateWixVersionFile;
 
-        public string TargetUrl;
-        public string TargetBranch;
-        public string CommitId;
-        public string DynamicRepositoryClonePath;
+    public string TargetUrl;
+    public string TargetBranch;
+    public string CommitId;
+    public string DynamicRepositoryClonePath;
 
-        public bool Init;
-        public bool Diag;
-        public bool IsVersion;
-        public bool IsHelp;
+    public bool Init;
+    public bool Diag;
+    public bool IsVersion;
+    public bool IsHelp;
 
-        public bool NoFetch;
-        public bool NoCache;
-        public bool NoNormalize;
+    public bool NoFetch;
+    public bool NoCache;
+    public bool NoNormalize;
 
-        public string LogFilePath;
-        public string ShowVariable;
-        public string OutputFile;
-        public ISet<OutputType> Output = new HashSet<OutputType>();
-        public Verbosity Verbosity = Verbosity.Normal;
+    public string LogFilePath;
+    public string ShowVariable;
+    public string OutputFile;
+    public ISet<OutputType> Output = new HashSet<OutputType>();
+    public Verbosity Verbosity = Verbosity.Normal;
 
-        public bool UpdateProjectFiles;
-        public bool UpdateAssemblyInfo;
-        public bool EnsureAssemblyInfo;
-        public ISet<string> UpdateAssemblyInfoFileName = new HashSet<string>();
+    public bool UpdateProjectFiles;
+    public bool UpdateAssemblyInfo;
+    public bool EnsureAssemblyInfo;
+    public ISet<string> UpdateAssemblyInfoFileName = new HashSet<string>();
+
+    public GitVersionOptions ToOptions()
+    {
+        var workingDirectory = this.TargetPath?.TrimEnd('/', '\\');
 
-        public GitVersionOptions ToOptions()
+        return new GitVersionOptions
         {
-            var workingDirectory = this.TargetPath?.TrimEnd('/', '\\');
+            WorkingDirectory = workingDirectory,
+
+            AssemblyInfo =
+            {
+                UpdateProjectFiles = UpdateProjectFiles,
+                UpdateAssemblyInfo = UpdateAssemblyInfo,
+                EnsureAssemblyInfo = EnsureAssemblyInfo,
+                Files = UpdateAssemblyInfoFileName
+            },
+
+            Authentication =
+            {
+                Username = this.Authentication.Username,
+                Password = this.Authentication.Password,
+                Token = this.Authentication.Token,
+            },
+
+            ConfigInfo =
+            {
+                ConfigFile = ConfigFile,
+                OverrideConfig = OverrideConfig,
+                ShowConfig = ShowConfig,
+            },
+
+            RepositoryInfo =
+            {
+                TargetUrl = TargetUrl,
+                TargetBranch = TargetBranch,
+                CommitId = CommitId,
+                DynamicRepositoryClonePath = DynamicRepositoryClonePath,
+            },
+
+            Settings =
+            {
+                NoFetch = NoFetch,
+                NoCache = NoCache,
+                NoNormalize = NoNormalize,
+            },
 
-            return new GitVersionOptions
+            WixInfo =
             {
-                WorkingDirectory = workingDirectory,
-
-                AssemblyInfo =
-                {
-                    UpdateProjectFiles = UpdateProjectFiles,
-                    UpdateAssemblyInfo = UpdateAssemblyInfo,
-                    EnsureAssemblyInfo = EnsureAssemblyInfo,
-                    Files = UpdateAssemblyInfoFileName
-                },
-
-                Authentication =
-                {
-                    Username = this.Authentication.Username,
-                    Password = this.Authentication.Password,
-                    Token = this.Authentication.Token,
-                },
-
-                ConfigInfo =
-                {
-                    ConfigFile = ConfigFile,
-                    OverrideConfig = OverrideConfig,
-                    ShowConfig = ShowConfig,
-                },
-
-                RepositoryInfo =
-                {
-                    TargetUrl = TargetUrl,
-                    TargetBranch = TargetBranch,
-                    CommitId = CommitId,
-                    DynamicRepositoryClonePath = DynamicRepositoryClonePath,
-                },
-
-                Settings =
-                {
-                    NoFetch = NoFetch,
-                    NoCache = NoCache,
-                    NoNormalize = NoNormalize,
-                },
-
-                WixInfo =
-                {
-                    ShouldUpdate = UpdateWixVersionFile,
-                },
-
-                Init = Init,
-                Diag = Diag,
-                IsVersion = IsVersion,
-                IsHelp = IsHelp,
-
-                LogFilePath = LogFilePath,
-                ShowVariable = ShowVariable,
-                Verbosity = Verbosity,
-                Output = Output,
-                OutputFile = OutputFile
-            };
-        }
+                ShouldUpdate = UpdateWixVersionFile,
+            },
+
+            Init = Init,
+            Diag = Diag,
+            IsVersion = IsVersion,
+            IsHelp = IsHelp,
+
+            LogFilePath = LogFilePath,
+            ShowVariable = ShowVariable,
+            Verbosity = Verbosity,
+            Output = Output,
+            OutputFile = OutputFile
+        };
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/GitVersionApp.cs b/src/GitVersion.App/GitVersionApp.cs
index 53060f5046..6c6f0f09f7 100644
--- a/src/GitVersion.App/GitVersionApp.cs
+++ b/src/GitVersion.App/GitVersionApp.cs
@@ -5,40 +5,39 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal class GitVersionApp : IHostedService
 {
-    internal class GitVersionApp : IHostedService
-    {
-        private readonly IHostApplicationLifetime applicationLifetime;
-        private readonly IGitVersionExecutor gitVersionExecutor;
-        private readonly ILog log;
-        private readonly IOptions<GitVersionOptions> options;
+    private readonly IHostApplicationLifetime applicationLifetime;
+    private readonly IGitVersionExecutor gitVersionExecutor;
+    private readonly ILog log;
+    private readonly IOptions<GitVersionOptions> options;
 
-        public GitVersionApp(IHostApplicationLifetime applicationLifetime, IGitVersionExecutor gitVersionExecutor, ILog log, IOptions<GitVersionOptions> options)
+    public GitVersionApp(IHostApplicationLifetime applicationLifetime, IGitVersionExecutor gitVersionExecutor, ILog log, IOptions<GitVersionOptions> options)
+    {
+        this.options = options ?? throw new ArgumentNullException(nameof(options));
+        this.applicationLifetime = applicationLifetime ?? throw new ArgumentNullException(nameof(applicationLifetime));
+        this.gitVersionExecutor = gitVersionExecutor ?? throw new ArgumentNullException(nameof(gitVersionExecutor));
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
+    }
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        try
         {
-            this.options = options ?? throw new ArgumentNullException(nameof(options));
-            this.applicationLifetime = applicationLifetime ?? throw new ArgumentNullException(nameof(applicationLifetime));
-            this.gitVersionExecutor = gitVersionExecutor ?? throw new ArgumentNullException(nameof(gitVersionExecutor));
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
+            var gitVersionOptions = this.options.Value;
+            this.log.Verbosity = gitVersionOptions.Verbosity;
+            System.Environment.ExitCode = this.gitVersionExecutor.Execute(gitVersionOptions);
         }
-        public Task StartAsync(CancellationToken cancellationToken)
+        catch (Exception exception)
         {
-            try
-            {
-                var gitVersionOptions = this.options.Value;
-                this.log.Verbosity = gitVersionOptions.Verbosity;
-                System.Environment.ExitCode = this.gitVersionExecutor.Execute(gitVersionOptions);
-            }
-            catch (Exception exception)
-            {
-                Console.Error.WriteLine(exception.Message);
-                System.Environment.ExitCode = 1;
-            }
-
-            this.applicationLifetime.StopApplication();
-            return Task.CompletedTask;
+            Console.Error.WriteLine(exception.Message);
+            System.Environment.ExitCode = 1;
         }
 
-        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+        this.applicationLifetime.StopApplication();
+        return Task.CompletedTask;
     }
-}
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/GitVersionAppModule.cs b/src/GitVersion.App/GitVersionAppModule.cs
index 86bfb1c6c2..b91af84912 100644
--- a/src/GitVersion.App/GitVersionAppModule.cs
+++ b/src/GitVersion.App/GitVersionAppModule.cs
@@ -1,17 +1,16 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class GitVersionAppModule : IGitVersionModule
 {
-    public class GitVersionAppModule : IGitVersionModule
+    public void RegisterTypes(IServiceCollection services)
     {
-        public void RegisterTypes(IServiceCollection services)
-        {
-            services.AddSingleton<IArgumentParser, ArgumentParser>();
-            services.AddSingleton<IGlobbingResolver, GlobbingResolver>();
+        services.AddSingleton<IArgumentParser, ArgumentParser>();
+        services.AddSingleton<IGlobbingResolver, GlobbingResolver>();
 
-            services.AddSingleton<IHelpWriter, HelpWriter>();
-            services.AddSingleton<IVersionWriter, VersionWriter>();
-            services.AddSingleton<IGitVersionExecutor, GitVersionExecutor>();
-        }
+        services.AddSingleton<IHelpWriter, HelpWriter>();
+        services.AddSingleton<IVersionWriter, VersionWriter>();
+        services.AddSingleton<IGitVersionExecutor, GitVersionExecutor>();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/GitVersionExecutor.cs b/src/GitVersion.App/GitVersionExecutor.cs
index d9e5071a81..7e1bcf9ff9 100644
--- a/src/GitVersion.App/GitVersionExecutor.cs
+++ b/src/GitVersion.App/GitVersionExecutor.cs
@@ -7,189 +7,188 @@
 using GitVersion.Logging;
 using GitVersion.Model;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class GitVersionExecutor : IGitVersionExecutor
 {
-    public class GitVersionExecutor : IGitVersionExecutor
+    private readonly ILog log;
+    private readonly IConsole console;
+    private readonly IConfigFileLocator configFileLocator;
+    private readonly IHelpWriter helpWriter;
+    private readonly IGitRepositoryInfo repositoryInfo;
+    private readonly IConfigProvider configProvider;
+    private readonly IGitVersionCalculateTool gitVersionCalculateTool;
+    private readonly IGitVersionOutputTool gitVersionOutputTool;
+    private readonly IVersionWriter versionWriter;
+
+    public GitVersionExecutor(ILog log, IConsole console,
+        IConfigFileLocator configFileLocator, IConfigProvider configProvider,
+        IGitVersionCalculateTool gitVersionCalculateTool, IGitVersionOutputTool gitVersionOutputTool,
+        IVersionWriter versionWriter, IHelpWriter helpWriter, IGitRepositoryInfo repositoryInfo)
     {
-        private readonly ILog log;
-        private readonly IConsole console;
-        private readonly IConfigFileLocator configFileLocator;
-        private readonly IHelpWriter helpWriter;
-        private readonly IGitRepositoryInfo repositoryInfo;
-        private readonly IConfigProvider configProvider;
-        private readonly IGitVersionCalculateTool gitVersionCalculateTool;
-        private readonly IGitVersionOutputTool gitVersionOutputTool;
-        private readonly IVersionWriter versionWriter;
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
+        this.console = console ?? throw new ArgumentNullException(nameof(console));
+        this.configFileLocator = configFileLocator ?? throw new ArgumentNullException(nameof(configFileLocator));
+        this.configProvider = configProvider ?? throw new ArgumentNullException(nameof(configProvider));
 
-        public GitVersionExecutor(ILog log, IConsole console,
-            IConfigFileLocator configFileLocator, IConfigProvider configProvider,
-            IGitVersionCalculateTool gitVersionCalculateTool, IGitVersionOutputTool gitVersionOutputTool,
-            IVersionWriter versionWriter, IHelpWriter helpWriter, IGitRepositoryInfo repositoryInfo)
-        {
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.console = console ?? throw new ArgumentNullException(nameof(console));
-            this.configFileLocator = configFileLocator ?? throw new ArgumentNullException(nameof(configFileLocator));
-            this.configProvider = configProvider ?? throw new ArgumentNullException(nameof(configProvider));
+        this.gitVersionCalculateTool = gitVersionCalculateTool ?? throw new ArgumentNullException(nameof(gitVersionCalculateTool));
+        this.gitVersionOutputTool = gitVersionOutputTool ?? throw new ArgumentNullException(nameof(gitVersionOutputTool));
 
-            this.gitVersionCalculateTool = gitVersionCalculateTool ?? throw new ArgumentNullException(nameof(gitVersionCalculateTool));
-            this.gitVersionOutputTool = gitVersionOutputTool ?? throw new ArgumentNullException(nameof(gitVersionOutputTool));
+        this.versionWriter = versionWriter ?? throw new ArgumentNullException(nameof(versionWriter));
+        this.helpWriter = helpWriter ?? throw new ArgumentNullException(nameof(helpWriter));
+        this.repositoryInfo = repositoryInfo ?? throw new ArgumentNullException(nameof(repositoryInfo));
+    }
 
-            this.versionWriter = versionWriter ?? throw new ArgumentNullException(nameof(versionWriter));
-            this.helpWriter = helpWriter ?? throw new ArgumentNullException(nameof(helpWriter));
-            this.repositoryInfo = repositoryInfo ?? throw new ArgumentNullException(nameof(repositoryInfo));
+    public int Execute(GitVersionOptions gitVersionOptions)
+    {
+        if (!HandleNonMainCommand(gitVersionOptions, out var exitCode))
+        {
+            exitCode = RunGitVersionTool(gitVersionOptions);
         }
 
-        public int Execute(GitVersionOptions gitVersionOptions)
+        if (exitCode != 0)
         {
-            if (!HandleNonMainCommand(gitVersionOptions, out var exitCode))
-            {
-                exitCode = RunGitVersionTool(gitVersionOptions);
-            }
+            // Dump log to console if we fail to complete successfully
+            this.console.Write(this.log.ToString());
+        }
+
+        return exitCode;
+    }
 
-            if (exitCode != 0)
+    private int RunGitVersionTool(GitVersionOptions gitVersionOptions)
+    {
+        var mutexName = this.repositoryInfo.DotGitDirectory.Replace(Path.DirectorySeparatorChar.ToString(), "");
+        using var mutex = new Mutex(true, $@"Global\gitversion{mutexName}", out var acquired);
+
+        try
+        {
+            if (!acquired)
             {
-                // Dump log to console if we fail to complete successfully
-                this.console.Write(this.log.ToString());
+                mutex.WaitOne();
             }
 
-            return exitCode;
-        }
+            var variables = this.gitVersionCalculateTool.CalculateVersionVariables();
 
-        private int RunGitVersionTool(GitVersionOptions gitVersionOptions)
-        {
-            var mutexName = this.repositoryInfo.DotGitDirectory.Replace(Path.DirectorySeparatorChar.ToString(), "");
-            using var mutex = new Mutex(true, $@"Global\gitversion{mutexName}", out var acquired);
+            var configuration = this.configProvider.Provide(overrideConfig: gitVersionOptions.ConfigInfo.OverrideConfig);
 
-            try
-            {
-                if (!acquired)
-                {
-                    mutex.WaitOne();
-                }
+            this.gitVersionOutputTool.OutputVariables(variables, configuration.UpdateBuildNumber ?? true);
+            this.gitVersionOutputTool.UpdateAssemblyInfo(variables);
+            this.gitVersionOutputTool.UpdateWixVersionFile(variables);
+        }
+        catch (WarningException exception)
+        {
+            var error = $"An error occurred:{System.Environment.NewLine}{exception.Message}";
+            this.log.Warning(error);
+            return 1;
+        }
+        catch (Exception exception)
+        {
+            var error = $"An unexpected error occurred:{System.Environment.NewLine}{exception}";
+            this.log.Error(error);
 
-                var variables = this.gitVersionCalculateTool.CalculateVersionVariables();
+            if (gitVersionOptions == null) return 1;
 
-                var configuration = this.configProvider.Provide(overrideConfig: gitVersionOptions.ConfigInfo.OverrideConfig);
+            this.log.Info("Attempting to show the current git graph (please include in issue): ");
+            this.log.Info("Showing max of 100 commits");
 
-                this.gitVersionOutputTool.OutputVariables(variables, configuration.UpdateBuildNumber ?? true);
-                this.gitVersionOutputTool.UpdateAssemblyInfo(variables);
-                this.gitVersionOutputTool.UpdateWixVersionFile(variables);
-            }
-            catch (WarningException exception)
-            {
-                var error = $"An error occurred:{System.Environment.NewLine}{exception.Message}";
-                this.log.Warning(error);
-                return 1;
-            }
-            catch (Exception exception)
+            try
             {
-                var error = $"An unexpected error occurred:{System.Environment.NewLine}{exception}";
-                this.log.Error(error);
-
-                if (gitVersionOptions == null) return 1;
-
-                this.log.Info("Attempting to show the current git graph (please include in issue): ");
-                this.log.Info("Showing max of 100 commits");
-
-                try
-                {
-                    GitExtensions.DumpGraph(gitVersionOptions.WorkingDirectory, mess => this.log.Info(mess), 100);
-                }
-                catch (Exception dumpGraphException)
-                {
-                    this.log.Error("Couldn't dump the git graph due to the following error: " + dumpGraphException);
-                }
-                return 1;
+                GitExtensions.DumpGraph(gitVersionOptions.WorkingDirectory, mess => this.log.Info(mess), 100);
             }
-            finally
+            catch (Exception dumpGraphException)
             {
-                mutex.ReleaseMutex();
+                this.log.Error("Couldn't dump the git graph due to the following error: " + dumpGraphException);
             }
-
-            return 0;
+            return 1;
         }
-
-        private bool HandleNonMainCommand(GitVersionOptions gitVersionOptions, out int exitCode)
+        finally
         {
-            if (gitVersionOptions == null)
-            {
-                this.helpWriter.Write();
-                exitCode = 1;
-                return true;
-            }
+            mutex.ReleaseMutex();
+        }
 
+        return 0;
+    }
 
-            if (gitVersionOptions.IsVersion)
-            {
-                var assembly = Assembly.GetExecutingAssembly();
-                this.versionWriter.Write(assembly);
-                exitCode = 0;
-                return true;
-            }
+    private bool HandleNonMainCommand(GitVersionOptions gitVersionOptions, out int exitCode)
+    {
+        if (gitVersionOptions == null)
+        {
+            this.helpWriter.Write();
+            exitCode = 1;
+            return true;
+        }
 
-            if (gitVersionOptions.IsHelp)
-            {
-                this.helpWriter.Write();
-                exitCode = 0;
-                return true;
-            }
 
-            if (gitVersionOptions.Diag)
-            {
-                gitVersionOptions.Settings.NoCache = true;
-                gitVersionOptions.Output.Add(OutputType.BuildServer);
-            }
+        if (gitVersionOptions.IsVersion)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            this.versionWriter.Write(assembly);
+            exitCode = 0;
+            return true;
+        }
 
-            ConfigureLogging(gitVersionOptions, this.log);
+        if (gitVersionOptions.IsHelp)
+        {
+            this.helpWriter.Write();
+            exitCode = 0;
+            return true;
+        }
 
-            var workingDirectory = gitVersionOptions.WorkingDirectory;
-            if (gitVersionOptions.Diag)
-            {
-                this.log.Info("Dumping commit graph: ");
-                GitExtensions.DumpGraph(workingDirectory, mess => this.log.Info(mess), 100);
-            }
+        if (gitVersionOptions.Diag)
+        {
+            gitVersionOptions.Settings.NoCache = true;
+            gitVersionOptions.Output.Add(OutputType.BuildServer);
+        }
 
-            if (!Directory.Exists(workingDirectory))
-            {
-                this.log.Warning($"The working directory '{workingDirectory}' does not exist.");
-            }
-            else
-            {
-                this.log.Info("Working directory: " + workingDirectory);
-            }
+        ConfigureLogging(gitVersionOptions, this.log);
 
-            this.configFileLocator.Verify(gitVersionOptions, this.repositoryInfo);
+        var workingDirectory = gitVersionOptions.WorkingDirectory;
+        if (gitVersionOptions.Diag)
+        {
+            this.log.Info("Dumping commit graph: ");
+            GitExtensions.DumpGraph(workingDirectory, mess => this.log.Info(mess), 100);
+        }
 
-            if (gitVersionOptions.Init)
-            {
-                this.configProvider.Init(workingDirectory);
-                exitCode = 0;
-                return true;
-            }
+        if (!Directory.Exists(workingDirectory))
+        {
+            this.log.Warning($"The working directory '{workingDirectory}' does not exist.");
+        }
+        else
+        {
+            this.log.Info("Working directory: " + workingDirectory);
+        }
 
-            if (gitVersionOptions.ConfigInfo.ShowConfig)
-            {
-                var config = this.configProvider.Provide(workingDirectory);
-                this.console.WriteLine(config.ToString());
-                exitCode = 0;
-                return true;
-            }
+        this.configFileLocator.Verify(gitVersionOptions, this.repositoryInfo);
 
+        if (gitVersionOptions.Init)
+        {
+            this.configProvider.Init(workingDirectory);
             exitCode = 0;
-            return false;
+            return true;
         }
 
-        private static void ConfigureLogging(GitVersionOptions gitVersionOptions, ILog log)
+        if (gitVersionOptions.ConfigInfo.ShowConfig)
         {
-            if (gitVersionOptions.Output.Contains(OutputType.BuildServer) || gitVersionOptions.LogFilePath == "console" || gitVersionOptions.Init)
-            {
-                log.AddLogAppender(new ConsoleAppender());
-            }
+            var config = this.configProvider.Provide(workingDirectory);
+            this.console.WriteLine(config.ToString());
+            exitCode = 0;
+            return true;
+        }
 
-            if (gitVersionOptions.LogFilePath != null && gitVersionOptions.LogFilePath != "console")
-            {
-                log.AddLogAppender(new FileAppender(gitVersionOptions.LogFilePath));
-            }
+        exitCode = 0;
+        return false;
+    }
+
+    private static void ConfigureLogging(GitVersionOptions gitVersionOptions, ILog log)
+    {
+        if (gitVersionOptions.Output.Contains(OutputType.BuildServer) || gitVersionOptions.LogFilePath == "console" || gitVersionOptions.Init)
+        {
+            log.AddLogAppender(new ConsoleAppender());
+        }
+
+        if (gitVersionOptions.LogFilePath != null && gitVersionOptions.LogFilePath != "console")
+        {
+            log.AddLogAppender(new FileAppender(gitVersionOptions.LogFilePath));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/GlobbingResolver.cs b/src/GitVersion.App/GlobbingResolver.cs
index 2f8f81efe9..ef50ca0213 100644
--- a/src/GitVersion.App/GlobbingResolver.cs
+++ b/src/GitVersion.App/GlobbingResolver.cs
@@ -5,18 +5,17 @@
 using Microsoft.Extensions.FileSystemGlobbing;
 using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
 
-namespace GitVersion
-{
-    public class GlobbingResolver : IGlobbingResolver
-    {
-        private readonly Matcher matcher = new(StringComparison.OrdinalIgnoreCase);
+namespace GitVersion;
 
-        public IEnumerable<string> Resolve(string workingDirectory, string pattern)
-        {
-            this.matcher.AddInclude(pattern);
-            return this.matcher.Execute(GetDirectoryInfoWrapper(workingDirectory)).Files.Select(file => file.Path);
-        }
+public class GlobbingResolver : IGlobbingResolver
+{
+    private readonly Matcher matcher = new(StringComparison.OrdinalIgnoreCase);
 
-        protected virtual DirectoryInfoBase GetDirectoryInfoWrapper(string workingDirectory) => new DirectoryInfoWrapper(new DirectoryInfo(workingDirectory));
+    public IEnumerable<string> Resolve(string workingDirectory, string pattern)
+    {
+        this.matcher.AddInclude(pattern);
+        return this.matcher.Execute(GetDirectoryInfoWrapper(workingDirectory)).Files.Select(file => file.Path);
     }
-}
+
+    protected virtual DirectoryInfoBase GetDirectoryInfoWrapper(string workingDirectory) => new DirectoryInfoWrapper(new DirectoryInfo(workingDirectory));
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/HelpWriter.cs b/src/GitVersion.App/HelpWriter.cs
index 686829b5ae..644e35030d 100644
--- a/src/GitVersion.App/HelpWriter.cs
+++ b/src/GitVersion.App/HelpWriter.cs
@@ -3,42 +3,41 @@
 using System.Reflection;
 using GitVersion.Logging;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class HelpWriter : IHelpWriter
 {
-    public class HelpWriter : IHelpWriter
+    private readonly IVersionWriter versionWriter;
+    private readonly IConsole console;
+
+    public HelpWriter(IVersionWriter versionWriter, IConsole console)
+    {
+        this.versionWriter = versionWriter ?? throw new ArgumentNullException(nameof(versionWriter));
+        this.console = console ?? throw new ArgumentNullException(nameof(console));
+    }
+
+    public void Write() => WriteTo(this.console.WriteLine);
+
+    public void WriteTo(Action<string> writeAction)
+    {
+        var version = string.Empty;
+        var assembly = Assembly.GetExecutingAssembly();
+        this.versionWriter.WriteTo(assembly, v => version = v);
+
+        var args = ArgumentList();
+        var nl = System.Environment.NewLine;
+        var message = "GitVersion " + version + nl + nl + args;
+
+        writeAction(message);
+    }
+
+    private string ArgumentList()
     {
-        private readonly IVersionWriter versionWriter;
-        private readonly IConsole console;
-
-        public HelpWriter(IVersionWriter versionWriter, IConsole console)
-        {
-            this.versionWriter = versionWriter ?? throw new ArgumentNullException(nameof(versionWriter));
-            this.console = console ?? throw new ArgumentNullException(nameof(console));
-        }
-
-        public void Write() => WriteTo(this.console.WriteLine);
-
-        public void WriteTo(Action<string> writeAction)
-        {
-            var version = string.Empty;
-            var assembly = Assembly.GetExecutingAssembly();
-            this.versionWriter.WriteTo(assembly, v => version = v);
-
-            var args = ArgumentList();
-            var nl = System.Environment.NewLine;
-            var message = "GitVersion " + version + nl + nl + args;
-
-            writeAction(message);
-        }
-
-        private string ArgumentList()
-        {
-            using var argumentsMarkdownStream = GetType().Assembly.GetManifestResourceStream("GitVersion.arguments.md");
-            using var sr = new StreamReader(argumentsMarkdownStream);
-            var argsMarkdown = sr.ReadToEnd();
-            var codeBlockStart = argsMarkdown.IndexOf("```") + 3;
-            var codeBlockEnd = argsMarkdown.LastIndexOf("```") - codeBlockStart;
-            return argsMarkdown.Substring(codeBlockStart, codeBlockEnd).Trim();
-        }
+        using var argumentsMarkdownStream = GetType().Assembly.GetManifestResourceStream("GitVersion.arguments.md");
+        using var sr = new StreamReader(argumentsMarkdownStream);
+        var argsMarkdown = sr.ReadToEnd();
+        var codeBlockStart = argsMarkdown.IndexOf("```") + 3;
+        var codeBlockEnd = argsMarkdown.LastIndexOf("```") - codeBlockStart;
+        return argsMarkdown.Substring(codeBlockStart, codeBlockEnd).Trim();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/IArgumentParser.cs b/src/GitVersion.App/IArgumentParser.cs
index d557a9b3e0..f7ea7e3f72 100644
--- a/src/GitVersion.App/IArgumentParser.cs
+++ b/src/GitVersion.App/IArgumentParser.cs
@@ -1,8 +1,7 @@
-namespace GitVersion
+namespace GitVersion;
+
+public interface IArgumentParser
 {
-    public interface IArgumentParser
-    {
-        Arguments ParseArguments(string commandLineArguments);
-        Arguments ParseArguments(string[] commandLineArguments);
-    }
-}
+    Arguments ParseArguments(string commandLineArguments);
+    Arguments ParseArguments(string[] commandLineArguments);
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/IGitVersionExecutor.cs b/src/GitVersion.App/IGitVersionExecutor.cs
index e30a7e0b4a..514c982861 100644
--- a/src/GitVersion.App/IGitVersionExecutor.cs
+++ b/src/GitVersion.App/IGitVersionExecutor.cs
@@ -1,7 +1,6 @@
-namespace GitVersion
+namespace GitVersion;
+
+public interface IGitVersionExecutor
 {
-    public interface IGitVersionExecutor
-    {
-        int Execute(GitVersionOptions gitVersionOptions);
-    }
-}
+    int Execute(GitVersionOptions gitVersionOptions);
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/IGlobbingResolver.cs b/src/GitVersion.App/IGlobbingResolver.cs
index 879c646d53..2ed40da4cb 100644
--- a/src/GitVersion.App/IGlobbingResolver.cs
+++ b/src/GitVersion.App/IGlobbingResolver.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IGlobbingResolver
 {
-    public interface IGlobbingResolver
-    {
-        public IEnumerable<string> Resolve(string workingDirectory, string pattern);
-    }
-}
+    public IEnumerable<string> Resolve(string workingDirectory, string pattern);
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/IHelpWriter.cs b/src/GitVersion.App/IHelpWriter.cs
index cea916e73e..5c850a56bf 100644
--- a/src/GitVersion.App/IHelpWriter.cs
+++ b/src/GitVersion.App/IHelpWriter.cs
@@ -1,10 +1,9 @@
 using System;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IHelpWriter
 {
-    public interface IHelpWriter
-    {
-        void Write();
-        void WriteTo(Action<string> writeAction);
-    }
-}
+    void Write();
+    void WriteTo(Action<string> writeAction);
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/IVersionWriter.cs b/src/GitVersion.App/IVersionWriter.cs
index 7c6ee50ef1..2932586ad6 100644
--- a/src/GitVersion.App/IVersionWriter.cs
+++ b/src/GitVersion.App/IVersionWriter.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Reflection;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IVersionWriter
 {
-    public interface IVersionWriter
-    {
-        void Write(Assembly assembly);
-        void WriteTo(Assembly assembly, Action<string> writeAction);
-    }
-}
+    void Write(Assembly assembly);
+    void WriteTo(Assembly assembly, Action<string> writeAction);
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/OverrideConfigOptionParser.cs b/src/GitVersion.App/OverrideConfigOptionParser.cs
index b9c9ebdb87..4a27b7e6d6 100644
--- a/src/GitVersion.App/OverrideConfigOptionParser.cs
+++ b/src/GitVersion.App/OverrideConfigOptionParser.cs
@@ -3,106 +3,105 @@
 using System.Reflection;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal class OverrideConfigOptionParser
 {
-    internal class OverrideConfigOptionParser
-    {
-        private static readonly Lazy<ILookup<string, PropertyInfo>> _lazySupportedProperties =
-            new(GetSupportedProperties, true);
+    private static readonly Lazy<ILookup<string, PropertyInfo>> _lazySupportedProperties =
+        new(GetSupportedProperties, true);
 
-        private readonly Lazy<Config> lazyConfig = new();
+    private readonly Lazy<Config> lazyConfig = new();
 
-        internal static ILookup<string, PropertyInfo> SupportedProperties => _lazySupportedProperties.Value;
+    internal static ILookup<string, PropertyInfo> SupportedProperties => _lazySupportedProperties.Value;
 
-        /// <summary>
-        /// Dynamically creates <see cref="System.Linq.ILookup{TKey, TElement}"/> of
-        /// <see cref="Config"/> properties supported as a part of command line '/overrideconfig' option.
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// Lookup keys are created from <see cref="YamlDotNet.Serialization.YamlMemberAttribute"/> to match 'GitVersion.yml'
-        /// options as close as possible.
-        /// </remarks>
-        private static ILookup<string, PropertyInfo> GetSupportedProperties() => typeof(Config).GetProperties(BindingFlags.Public | BindingFlags.Instance)
-                .Where(
-                    pi => IsSupportedPropertyType(pi.PropertyType)
-                        && pi.CanWrite
-                        && pi.GetCustomAttributes(typeof(YamlDotNet.Serialization.YamlMemberAttribute), false).Length > 0
-                )
-                .ToLookup(
-                    pi => (pi.GetCustomAttributes(typeof(YamlDotNet.Serialization.YamlMemberAttribute), false)[0] as YamlDotNet.Serialization.YamlMemberAttribute).Alias,
-                    pi => pi
-                );
+    /// <summary>
+    /// Dynamically creates <see cref="System.Linq.ILookup{TKey, TElement}"/> of
+    /// <see cref="Config"/> properties supported as a part of command line '/overrideconfig' option.
+    /// </summary>
+    /// <returns></returns>
+    /// <remarks>
+    /// Lookup keys are created from <see cref="YamlDotNet.Serialization.YamlMemberAttribute"/> to match 'GitVersion.yml'
+    /// options as close as possible.
+    /// </remarks>
+    private static ILookup<string, PropertyInfo> GetSupportedProperties() => typeof(Config).GetProperties(BindingFlags.Public | BindingFlags.Instance)
+        .Where(
+            pi => IsSupportedPropertyType(pi.PropertyType)
+                  && pi.CanWrite
+                  && pi.GetCustomAttributes(typeof(YamlDotNet.Serialization.YamlMemberAttribute), false).Length > 0
+        )
+        .ToLookup(
+            pi => (pi.GetCustomAttributes(typeof(YamlDotNet.Serialization.YamlMemberAttribute), false)[0] as YamlDotNet.Serialization.YamlMemberAttribute).Alias,
+            pi => pi
+        );
 
-        /// <summary>
-        /// Checks if property <see cref="Type"/> of <see cref="Config"/>
-        /// is supported as a part of command line '/overrideconfig' option.
-        /// </summary>
-        /// <param name="propertyType">Type we want to check.</param>
-        /// <returns>True, if type is supported.</returns>
-        /// <remarks>Only simple types are supported</remarks>
-        private static bool IsSupportedPropertyType(Type propertyType)
-        {
-            Type unwrappedType = Nullable.GetUnderlyingType(propertyType);
-            if (unwrappedType == null)
-                unwrappedType = propertyType;
+    /// <summary>
+    /// Checks if property <see cref="Type"/> of <see cref="Config"/>
+    /// is supported as a part of command line '/overrideconfig' option.
+    /// </summary>
+    /// <param name="propertyType">Type we want to check.</param>
+    /// <returns>True, if type is supported.</returns>
+    /// <remarks>Only simple types are supported</remarks>
+    private static bool IsSupportedPropertyType(Type propertyType)
+    {
+        Type unwrappedType = Nullable.GetUnderlyingType(propertyType);
+        if (unwrappedType == null)
+            unwrappedType = propertyType;
 
-            return unwrappedType == typeof(string)
-                || unwrappedType.IsEnum
-                || unwrappedType == typeof(int)
-                || unwrappedType == typeof(bool);
-        }
+        return unwrappedType == typeof(string)
+               || unwrappedType.IsEnum
+               || unwrappedType == typeof(int)
+               || unwrappedType == typeof(bool);
+    }
 
-        internal void SetValue(string key, string value)
+    internal void SetValue(string key, string value)
+    {
+        if (!SupportedProperties.Contains(key))
+            return;
+
+        var unwrappedText = QuotedStringHelpers.UnquoteText(value);
+        foreach (var pi in SupportedProperties[key])
         {
-            if (!SupportedProperties.Contains(key))
-                return;
+            Type unwrapped = Nullable.GetUnderlyingType(pi.PropertyType);
+            if (unwrapped == null)
+                unwrapped = pi.PropertyType;
 
-            var unwrappedText = QuotedStringHelpers.UnquoteText(value);
-            foreach (var pi in SupportedProperties[key])
+            if (unwrapped == typeof(string))
+                pi.SetValue(this.lazyConfig.Value, unwrappedText);
+            else if (unwrapped.IsEnum)
             {
-                Type unwrapped = Nullable.GetUnderlyingType(pi.PropertyType);
-                if (unwrapped == null)
-                    unwrapped = pi.PropertyType;
-
-                if (unwrapped == typeof(string))
-                    pi.SetValue(this.lazyConfig.Value, unwrappedText);
-                else if (unwrapped.IsEnum)
+                try
                 {
-                    try
-                    {
-                        var parsedEnum = Enum.Parse(unwrapped, unwrappedText);
-                        pi.SetValue(this.lazyConfig.Value, parsedEnum);
-                    }
-                    catch (ArgumentException)
-                    {
-                        var sb = new System.Text.StringBuilder();
-
-                        sb.Append($"Could not parse /overrideconfig option: {key}={value}.");
-                        sb.AppendLine(" Ensure that 'value' is valid for specified 'key' enumeration: ");
-                        foreach (var name in Enum.GetNames(unwrapped))
-                            sb.AppendLine(name);
-
-                        throw new WarningException(sb.ToString());
-                    }
+                    var parsedEnum = Enum.Parse(unwrapped, unwrappedText);
+                    pi.SetValue(this.lazyConfig.Value, parsedEnum);
                 }
-                else if (unwrapped == typeof(int))
+                catch (ArgumentException)
                 {
-                    if (int.TryParse(unwrappedText, out int parsedInt))
-                        pi.SetValue(this.lazyConfig.Value, parsedInt);
-                    else
-                        throw new WarningException($"Could not parse /overrideconfig option: {key}={value}. Ensure that 'value' is valid integer number.");
-                }
-                else if (unwrapped == typeof(bool))
-                {
-                    if (bool.TryParse(unwrappedText, out bool parsedBool))
-                        pi.SetValue(this.lazyConfig.Value, parsedBool);
-                    else
-                        throw new WarningException($"Could not parse /overrideconfig option: {key}={value}. Ensure that 'value' is 'true' or 'false'.");
+                    var sb = new System.Text.StringBuilder();
+
+                    sb.Append($"Could not parse /overrideconfig option: {key}={value}.");
+                    sb.AppendLine(" Ensure that 'value' is valid for specified 'key' enumeration: ");
+                    foreach (var name in Enum.GetNames(unwrapped))
+                        sb.AppendLine(name);
+
+                    throw new WarningException(sb.ToString());
                 }
             }
+            else if (unwrapped == typeof(int))
+            {
+                if (int.TryParse(unwrappedText, out int parsedInt))
+                    pi.SetValue(this.lazyConfig.Value, parsedInt);
+                else
+                    throw new WarningException($"Could not parse /overrideconfig option: {key}={value}. Ensure that 'value' is valid integer number.");
+            }
+            else if (unwrapped == typeof(bool))
+            {
+                if (bool.TryParse(unwrappedText, out bool parsedBool))
+                    pi.SetValue(this.lazyConfig.Value, parsedBool);
+                else
+                    throw new WarningException($"Could not parse /overrideconfig option: {key}={value}. Ensure that 'value' is 'true' or 'false'.");
+            }
         }
-
-        internal Config GetConfig() => this.lazyConfig.IsValueCreated ? this.lazyConfig.Value : null;
     }
-}
+
+    internal Config GetConfig() => this.lazyConfig.IsValueCreated ? this.lazyConfig.Value : null;
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/Program.cs b/src/GitVersion.App/Program.cs
index 305a344386..13e49f5a7a 100644
--- a/src/GitVersion.App/Program.cs
+++ b/src/GitVersion.App/Program.cs
@@ -6,37 +6,36 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal class Program
 {
-    internal class Program
-    {
-        private readonly Action<IServiceCollection> overrides;
+    private readonly Action<IServiceCollection> overrides;
+
+    internal Program(Action<IServiceCollection> overrides = null) => this.overrides = overrides;
 
-        internal Program(Action<IServiceCollection> overrides = null) => this.overrides = overrides;
+    private static async Task Main(string[] args) => await new Program().RunAsync(args);
 
-        private static async Task Main(string[] args) => await new Program().RunAsync(args);
+    internal Task RunAsync(string[] args) => CreateHostBuilder(args).Build().RunAsync();
 
-        internal Task RunAsync(string[] args) => CreateHostBuilder(args).Build().RunAsync();
+    private IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureAppConfiguration((_, configApp) => configApp.AddCommandLine(args))
+            .ConfigureServices((_, services) =>
+            {
+                services.AddModule(new GitVersionCoreModule());
+                services.AddModule(new GitVersionLibGit2SharpModule());
+                services.AddModule(new GitVersionAppModule());
 
-        private IHostBuilder CreateHostBuilder(string[] args) =>
-            new HostBuilder()
-                .ConfigureAppConfiguration((_, configApp) => configApp.AddCommandLine(args))
-                .ConfigureServices((_, services) =>
+                services.AddSingleton(sp =>
                 {
-                    services.AddModule(new GitVersionCoreModule());
-                    services.AddModule(new GitVersionLibGit2SharpModule());
-                    services.AddModule(new GitVersionAppModule());
-
-                    services.AddSingleton(sp =>
-                    {
-                        var arguments = sp.GetService<IArgumentParser>()?.ParseArguments(args);
-                        var gitVersionOptions = arguments?.ToOptions();
-                        return Options.Create(gitVersionOptions);
-                    });
-
-                    this.overrides?.Invoke(services);
-                    services.AddHostedService<GitVersionApp>();
-                })
-                .UseConsoleLifetime();
-    }
-}
+                    var arguments = sp.GetService<IArgumentParser>()?.ParseArguments(args);
+                    var gitVersionOptions = arguments?.ToOptions();
+                    return Options.Create(gitVersionOptions);
+                });
+
+                this.overrides?.Invoke(services);
+                services.AddHostedService<GitVersionApp>();
+            })
+            .UseConsoleLifetime();
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/QuotedStringHelpers.cs b/src/GitVersion.App/QuotedStringHelpers.cs
index 0a8fb420f6..fac3ed1979 100644
--- a/src/GitVersion.App/QuotedStringHelpers.cs
+++ b/src/GitVersion.App/QuotedStringHelpers.cs
@@ -3,83 +3,82 @@
 using System.Text;
 using GitVersion.Extensions;
 
-namespace GitVersion
+namespace GitVersion;
+
+public static class QuotedStringHelpers
 {
-    public static class QuotedStringHelpers
+    /// <summary>
+    /// Splits input string based on split-character, ignoring split-character in
+    /// quoted part of the string.
+    /// </summary>
+    /// <param name="input">String we want to split.</param>
+    /// <param name="splitChar">Character used for splitting.</param>
+    /// <returns>Array of splitted string parts</returns>
+    /// <remarks>
+    /// If there is opening quotes character without closing quotes,
+    /// closing quotes are implicitly assumed at the end of the input string.
+    /// </remarks>
+    /// <example>
+    /// "one two three" -> {"one", "two",  "three"}
+    /// "one \"two three\"" -> {"one", "\"two three\""}
+    /// "one \"two three" -> {"one", "\"two three"} // implicit closing quote.
+    /// </example>
+    public static string[] SplitUnquoted(string input, char splitChar)
     {
-        /// <summary>
-        /// Splits input string based on split-character, ignoring split-character in
-        /// quoted part of the string.
-        /// </summary>
-        /// <param name="input">String we want to split.</param>
-        /// <param name="splitChar">Character used for splitting.</param>
-        /// <returns>Array of splitted string parts</returns>
-        /// <remarks>
-        /// If there is opening quotes character without closing quotes,
-        /// closing quotes are implicitly assumed at the end of the input string.
-        /// </remarks>
-        /// <example>
-        /// "one two three" -> {"one", "two",  "three"}
-        /// "one \"two three\"" -> {"one", "\"two three\""}
-        /// "one \"two three" -> {"one", "\"two three"} // implicit closing quote.
-        /// </example>
-        public static string[] SplitUnquoted(string input, char splitChar)
-        {
-            if (input == null)
-                return System.Array.Empty<string>();
+        if (input == null)
+            return System.Array.Empty<string>();
 
-            var splitted = new List<string>();
-            bool isPreviousCharBackslash = false;
-            bool isInsideQuotes = false;
+        var splitted = new List<string>();
+        bool isPreviousCharBackslash = false;
+        bool isInsideQuotes = false;
 
-            int startIndex = 0;
-            for (int i = 0; i < input.Length; i++)
+        int startIndex = 0;
+        for (int i = 0; i < input.Length; i++)
+        {
+            char current = input[i];
+            switch (current)
             {
-                char current = input[i];
-                switch (current)
-                {
-                    case '"':
-                        if (!isPreviousCharBackslash)
-                            isInsideQuotes = !isInsideQuotes;
-                        break;
-                    default:
-                        if (current == splitChar && !isInsideQuotes)
-                        {
-                            splitted.Add(input.Substring(startIndex, i - startIndex));
-                            startIndex = i + 1;
-                        }
-                        break;
-                }
-                isPreviousCharBackslash = current == '\\';
+                case '"':
+                    if (!isPreviousCharBackslash)
+                        isInsideQuotes = !isInsideQuotes;
+                    break;
+                default:
+                    if (current == splitChar && !isInsideQuotes)
+                    {
+                        splitted.Add(input.Substring(startIndex, i - startIndex));
+                        startIndex = i + 1;
+                    }
+                    break;
             }
+            isPreviousCharBackslash = current == '\\';
+        }
 
-            splitted.Add(input.Substring(startIndex, input.Length - startIndex));
+        splitted.Add(input.Substring(startIndex, input.Length - startIndex));
 
-            return splitted.Where(argument => !argument.IsNullOrEmpty()).ToArray();
-        }
+        return splitted.Where(argument => !argument.IsNullOrEmpty()).ToArray();
+    }
 
-        /// <summary>
-        /// Removes enclosing quotes around input string and unescapes quote characters
-        /// inside of string.
-        /// </summary>
-        /// <param name="input">Input string to unescape.</param>
-        /// <returns>Unescaped string.</returns>
-        /// <example>
-        /// "\"one \\\"two\\\"\"" -> "one \"two\""
-        /// </example>
-        public static string UnquoteText(string input)
-        {
-            var sb = new StringBuilder(input);
+    /// <summary>
+    /// Removes enclosing quotes around input string and unescapes quote characters
+    /// inside of string.
+    /// </summary>
+    /// <param name="input">Input string to unescape.</param>
+    /// <returns>Unescaped string.</returns>
+    /// <example>
+    /// "\"one \\\"two\\\"\"" -> "one \"two\""
+    /// </example>
+    public static string UnquoteText(string input)
+    {
+        var sb = new StringBuilder(input);
 
-            if (sb[0] == '"')
-                sb.Remove(0, 1);
+        if (sb[0] == '"')
+            sb.Remove(0, 1);
 
-            if (sb[sb.Length - 1] == '"' && sb[sb.Length - 2] != '\\')
-                sb.Remove(sb.Length - 1, 1);
+        if (sb[sb.Length - 1] == '"' && sb[sb.Length - 2] != '\\')
+            sb.Remove(sb.Length - 1, 1);
 
-            sb.Replace("\\\"", "\""); // unescape quotes.
+        sb.Replace("\\\"", "\""); // unescape quotes.
 
-            return sb.ToString();
-        }
+        return sb.ToString();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.App/VersionWriter.cs b/src/GitVersion.App/VersionWriter.cs
index 910d961c7f..183d227cc9 100644
--- a/src/GitVersion.App/VersionWriter.cs
+++ b/src/GitVersion.App/VersionWriter.cs
@@ -3,31 +3,30 @@
 using System.Reflection;
 using GitVersion.Logging;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class VersionWriter : IVersionWriter
 {
-    public class VersionWriter : IVersionWriter
-    {
-        private readonly IConsole console;
+    private readonly IConsole console;
 
-        public VersionWriter(IConsole console) => this.console = console ?? throw new ArgumentNullException(nameof(console));
-        public void Write(Assembly assembly) => WriteTo(assembly, this.console.WriteLine);
+    public VersionWriter(IConsole console) => this.console = console ?? throw new ArgumentNullException(nameof(console));
+    public void Write(Assembly assembly) => WriteTo(assembly, this.console.WriteLine);
 
-        public void WriteTo(Assembly assembly, Action<string> writeAction)
-        {
-            var version = GetAssemblyVersion(assembly);
-            writeAction(version);
-        }
+    public void WriteTo(Assembly assembly, Action<string> writeAction)
+    {
+        var version = GetAssemblyVersion(assembly);
+        writeAction(version);
+    }
 
-        private static string GetAssemblyVersion(Assembly assembly)
+    private static string GetAssemblyVersion(Assembly assembly)
+    {
+        if (assembly
+            .GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false)
+            .FirstOrDefault() is AssemblyInformationalVersionAttribute attribute)
         {
-            if (assembly
-                .GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false)
-                .FirstOrDefault() is AssemblyInformationalVersionAttribute attribute)
-            {
-                return attribute.InformationalVersion;
-            }
-
-            return assembly.GetName().Version.ToString();
+            return attribute.InformationalVersion;
         }
+
+        return assembly.GetName().Version.ToString();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/BuildAgents/AzurePipelinesTests.cs b/src/GitVersion.Core.Tests/BuildAgents/AzurePipelinesTests.cs
index e7fd590853..facf9afc04 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/AzurePipelinesTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/AzurePipelinesTests.cs
@@ -4,81 +4,80 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.BuildAgents
+namespace GitVersion.Core.Tests.BuildAgents;
+
+[TestFixture]
+public class AzurePipelinesTests : TestBase
 {
-    [TestFixture]
-    public class AzurePipelinesTests : TestBase
-    {
-        private const string key = "BUILD_BUILDNUMBER";
-        private const string logPrefix = "##vso[build.updatebuildnumber]";
+    private const string key = "BUILD_BUILDNUMBER";
+    private const string logPrefix = "##vso[build.updatebuildnumber]";
 
-        private IEnvironment environment;
-        private AzurePipelines buildServer;
+    private IEnvironment environment;
+    private AzurePipelines buildServer;
 
-        [SetUp]
-        public void SetEnvironmentVariableForTest()
-        {
-            var sp = ConfigureServices(services => services.AddSingleton<AzurePipelines>());
-            this.environment = sp.GetService<IEnvironment>();
-            this.buildServer = sp.GetService<AzurePipelines>();
+    [SetUp]
+    public void SetEnvironmentVariableForTest()
+    {
+        var sp = ConfigureServices(services => services.AddSingleton<AzurePipelines>());
+        this.environment = sp.GetService<IEnvironment>();
+        this.buildServer = sp.GetService<AzurePipelines>();
 
-            this.environment.SetEnvironmentVariable(key, "Some Build_Value $(GitVersion_FullSemVer) 20151310.3 $(UnknownVar) Release");
-        }
+        this.environment.SetEnvironmentVariable(key, "Some Build_Value $(GitVersion_FullSemVer) 20151310.3 $(UnknownVar) Release");
+    }
 
-        [TearDown]
-        public void ClearEnvironmentVariableForTest() => this.environment.SetEnvironmentVariable(key, null);
+    [TearDown]
+    public void ClearEnvironmentVariableForTest() => this.environment.SetEnvironmentVariable(key, null);
 
-        [Test]
-        public void DevelopBranch()
-        {
-            var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Unstable4");
-            var vsVersion = this.buildServer.GenerateSetVersionMessage(vars);
+    [Test]
+    public void DevelopBranch()
+    {
+        var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Unstable4");
+        var vsVersion = this.buildServer.GenerateSetVersionMessage(vars);
 
-            vsVersion.ShouldBe("##vso[build.updatebuildnumber]Some Build_Value 0.0.0-Unstable4 20151310.3 $(UnknownVar) Release");
-        }
+        vsVersion.ShouldBe("##vso[build.updatebuildnumber]Some Build_Value 0.0.0-Unstable4 20151310.3 $(UnknownVar) Release");
+    }
 
-        [Test]
-        public void EscapeValues()
-        {
-            var vsVersion = this.buildServer.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
+    [Test]
+    public void EscapeValues()
+    {
+        var vsVersion = this.buildServer.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
 
-            vsVersion.ShouldContain("##vso[task.setvariable variable=GitVersion.Foo]0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
-            vsVersion.ShouldContain("##vso[task.setvariable variable=GitVersion.Foo;isOutput=true]0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
-        }
+        vsVersion.ShouldContain("##vso[task.setvariable variable=GitVersion.Foo]0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
+        vsVersion.ShouldContain("##vso[task.setvariable variable=GitVersion.Foo;isOutput=true]0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
+    }
 
-        [Test]
-        public void MissingEnvShouldNotBlowUp()
-        {
-            this.environment.SetEnvironmentVariable(key, null);
+    [Test]
+    public void MissingEnvShouldNotBlowUp()
+    {
+        this.environment.SetEnvironmentVariable(key, null);
 
-            var semver = "0.0.0-Unstable4";
-            var vars = new TestableVersionVariables(fullSemVer: semver);
-            var vsVersion = this.buildServer.GenerateSetVersionMessage(vars);
-            vsVersion.ShouldBe(semver);
-        }
+        var semver = "0.0.0-Unstable4";
+        var vars = new TestableVersionVariables(fullSemVer: semver);
+        var vsVersion = this.buildServer.GenerateSetVersionMessage(vars);
+        vsVersion.ShouldBe(semver);
+    }
 
-        [TestCase("$(GitVersion.FullSemVer)", "1.0.0", "1.0.0")]
-        [TestCase("$(GITVERSION_FULLSEMVER)", "1.0.0", "1.0.0")]
-        [TestCase("$(GitVersion.FullSemVer)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
-        [TestCase("$(GITVERSION_FULLSEMVER)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
-        public void AzurePipelinesBuildNumberWithFullSemVer(string buildNumberFormat, string myFullSemVer, string expectedBuildNumber)
-        {
-            this.environment.SetEnvironmentVariable(key, buildNumberFormat);
-            var vars = new TestableVersionVariables(fullSemVer: myFullSemVer);
-            var logMessage = this.buildServer.GenerateSetVersionMessage(vars);
-            logMessage.ShouldBe(logPrefix + expectedBuildNumber);
-        }
+    [TestCase("$(GitVersion.FullSemVer)", "1.0.0", "1.0.0")]
+    [TestCase("$(GITVERSION_FULLSEMVER)", "1.0.0", "1.0.0")]
+    [TestCase("$(GitVersion.FullSemVer)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
+    [TestCase("$(GITVERSION_FULLSEMVER)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
+    public void AzurePipelinesBuildNumberWithFullSemVer(string buildNumberFormat, string myFullSemVer, string expectedBuildNumber)
+    {
+        this.environment.SetEnvironmentVariable(key, buildNumberFormat);
+        var vars = new TestableVersionVariables(fullSemVer: myFullSemVer);
+        var logMessage = this.buildServer.GenerateSetVersionMessage(vars);
+        logMessage.ShouldBe(logPrefix + expectedBuildNumber);
+    }
 
-        [TestCase("$(GitVersion.SemVer)", "1.0.0", "1.0.0")]
-        [TestCase("$(GITVERSION_SEMVER)", "1.0.0", "1.0.0")]
-        [TestCase("$(GitVersion.SemVer)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
-        [TestCase("$(GITVERSION_SEMVER)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
-        public void AzurePipelinesBuildNumberWithSemVer(string buildNumberFormat, string mySemVer, string expectedBuildNumber)
-        {
-            this.environment.SetEnvironmentVariable(key, buildNumberFormat);
-            var vars = new TestableVersionVariables(semVer: mySemVer);
-            var logMessage = this.buildServer.GenerateSetVersionMessage(vars);
-            logMessage.ShouldBe(logPrefix + expectedBuildNumber);
-        }
+    [TestCase("$(GitVersion.SemVer)", "1.0.0", "1.0.0")]
+    [TestCase("$(GITVERSION_SEMVER)", "1.0.0", "1.0.0")]
+    [TestCase("$(GitVersion.SemVer)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
+    [TestCase("$(GITVERSION_SEMVER)-Build.1234", "1.0.0", "1.0.0-Build.1234")]
+    public void AzurePipelinesBuildNumberWithSemVer(string buildNumberFormat, string mySemVer, string expectedBuildNumber)
+    {
+        this.environment.SetEnvironmentVariable(key, buildNumberFormat);
+        var vars = new TestableVersionVariables(semVer: mySemVer);
+        var logMessage = this.buildServer.GenerateSetVersionMessage(vars);
+        logMessage.ShouldBe(logPrefix + expectedBuildNumber);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/BuildAgents/BuildServerBaseTests.cs b/src/GitVersion.Core.Tests/BuildAgents/BuildServerBaseTests.cs
index ee6db63c07..7be26b13df 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/BuildServerBaseTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/BuildServerBaseTests.cs
@@ -9,63 +9,62 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.BuildAgents
+namespace GitVersion.Core.Tests.BuildAgents;
+
+[TestFixture]
+public class BuildServerBaseTests : TestBase
 {
-    [TestFixture]
-    public class BuildServerBaseTests : TestBase
+    private IVariableProvider buildServer;
+    private IServiceProvider sp;
+
+    [SetUp]
+    public void SetUp()
     {
-        private IVariableProvider buildServer;
-        private IServiceProvider sp;
+        this.sp = ConfigureServices(services => services.AddSingleton<BuildAgent>());
+        this.buildServer = this.sp.GetService<IVariableProvider>();
+    }
 
-        [SetUp]
-        public void SetUp()
+    [Test]
+    public void BuildNumberIsFullSemVer()
+    {
+        var writes = new List<string>();
+        var semanticVersion = new SemanticVersion
         {
-            this.sp = ConfigureServices(services => services.AddSingleton<BuildAgent>());
-            this.buildServer = this.sp.GetService<IVariableProvider>();
-        }
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = "beta1",
+            BuildMetaData = "5"
+        };
 
-        [Test]
-        public void BuildNumberIsFullSemVer()
-        {
-            var writes = new List<string>();
-            var semanticVersion = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = "beta1",
-                BuildMetaData = "5"
-            };
+        semanticVersion.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
+        semanticVersion.BuildMetaData.Sha = "commitSha";
 
-            semanticVersion.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
-            semanticVersion.BuildMetaData.Sha = "commitSha";
+        var config = new TestEffectiveConfiguration();
 
-            var config = new TestEffectiveConfiguration();
+        var variables = this.buildServer.GetVariablesFor(semanticVersion, config, false);
+        var buildServer = this.sp.GetService<BuildAgent>();
+        buildServer.WriteIntegration(writes.Add, variables);
 
-            var variables = this.buildServer.GetVariablesFor(semanticVersion, config, false);
-            var buildServer = this.sp.GetService<BuildAgent>();
-            buildServer.WriteIntegration(writes.Add, variables);
+        writes[1].ShouldBe("1.2.3-beta.1+5");
 
-            writes[1].ShouldBe("1.2.3-beta.1+5");
+        writes = new List<string>();
+        buildServer.WriteIntegration(writes.Add, variables, false);
+        writes.ShouldNotContain(x => x.StartsWith("Executing GenerateSetVersionMessage for "));
+    }
 
-            writes = new List<string>();
-            buildServer.WriteIntegration(writes.Add, variables, false);
-            writes.ShouldNotContain(x => x.StartsWith("Executing GenerateSetVersionMessage for "));
-        }
+    private class BuildAgent : BuildAgentBase
+    {
+        protected override string EnvironmentVariable { get; }
 
-        private class BuildAgent : BuildAgentBase
+        public BuildAgent(IEnvironment environment, ILog log) : base(environment, log)
         {
-            protected override string EnvironmentVariable { get; }
-
-            public BuildAgent(IEnvironment environment, ILog log) : base(environment, log)
-            {
-            }
+        }
 
-            public override bool CanApplyToCurrentContext() => throw new NotImplementedException();
+        public override bool CanApplyToCurrentContext() => throw new NotImplementedException();
 
-            public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
+        public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
 
-            public override string[] GenerateSetParameterMessage(string name, string value) => Array.Empty<string>();
-        }
+        public override string[] GenerateSetParameterMessage(string name, string value) => Array.Empty<string>();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/BuildAgents/CodeBuildTests.cs b/src/GitVersion.Core.Tests/BuildAgents/CodeBuildTests.cs
index 690663083f..0a96918ab7 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/CodeBuildTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/CodeBuildTests.cs
@@ -9,100 +9,99 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.BuildAgents
+namespace GitVersion.Core.Tests.BuildAgents;
+
+[TestFixture]
+public sealed class CodeBuildTests : TestBase
 {
-    [TestFixture]
-    public sealed class CodeBuildTests : TestBase
+    private IEnvironment environment;
+    private IServiceProvider sp;
+    private CodeBuild buildServer;
+
+    [SetUp]
+    public void SetUp()
     {
-        private IEnvironment environment;
-        private IServiceProvider sp;
-        private CodeBuild buildServer;
+        this.sp = ConfigureServices(services => services.AddSingleton<CodeBuild>());
+        this.environment = this.sp.GetService<IEnvironment>();
+        this.buildServer = this.sp.GetService<CodeBuild>();
+    }
 
-        [SetUp]
-        public void SetUp()
-        {
-            this.sp = ConfigureServices(services => services.AddSingleton<CodeBuild>());
-            this.environment = this.sp.GetService<IEnvironment>();
-            this.buildServer = this.sp.GetService<CodeBuild>();
-        }
+    [Test]
+    public void CorrectlyIdentifiesCodeBuildPresenceFromSourceVersion()
+    {
+        this.environment.SetEnvironmentVariable(CodeBuild.SourceVersionEnvironmentVariableName, "a value");
+        this.buildServer.CanApplyToCurrentContext().ShouldBe(true);
+    }
 
-        [Test]
-        public void CorrectlyIdentifiesCodeBuildPresenceFromSourceVersion()
-        {
-            this.environment.SetEnvironmentVariable(CodeBuild.SourceVersionEnvironmentVariableName, "a value");
-            this.buildServer.CanApplyToCurrentContext().ShouldBe(true);
-        }
+    [Test]
+    public void PicksUpBranchNameFromEnvironmentFromSourceVersion()
+    {
+        this.environment.SetEnvironmentVariable(CodeBuild.SourceVersionEnvironmentVariableName, $"refs/heads/{MainBranch}");
+        this.buildServer.GetCurrentBranch(false).ShouldBe($"refs/heads/{MainBranch}");
+    }
 
-        [Test]
-        public void PicksUpBranchNameFromEnvironmentFromSourceVersion()
-        {
-            this.environment.SetEnvironmentVariable(CodeBuild.SourceVersionEnvironmentVariableName, $"refs/heads/{MainBranch}");
-            this.buildServer.GetCurrentBranch(false).ShouldBe($"refs/heads/{MainBranch}");
-        }
+    [Test]
+    public void CorrectlyIdentifiesCodeBuildPresenceFromWebHook()
+    {
+        this.environment.SetEnvironmentVariable(CodeBuild.WebHookEnvironmentVariableName, "a value");
+        this.buildServer.CanApplyToCurrentContext().ShouldBe(true);
+    }
 
-        [Test]
-        public void CorrectlyIdentifiesCodeBuildPresenceFromWebHook()
-        {
-            this.environment.SetEnvironmentVariable(CodeBuild.WebHookEnvironmentVariableName, "a value");
-            this.buildServer.CanApplyToCurrentContext().ShouldBe(true);
-        }
+    [Test]
+    public void PicksUpBranchNameFromEnvironmentFromWebHook()
+    {
+        this.environment.SetEnvironmentVariable(CodeBuild.WebHookEnvironmentVariableName, $"refs/heads/{MainBranch}");
+        this.buildServer.GetCurrentBranch(false).ShouldBe($"refs/heads/{MainBranch}");
+    }
 
-        [Test]
-        public void PicksUpBranchNameFromEnvironmentFromWebHook()
+    [Test]
+    public void WriteAllVariablesToTheTextWriter()
+    {
+        var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+        var f = Path.Combine(assemblyLocation, "codebuild_this_file_should_be_deleted.properties");
+
+        try
         {
-            this.environment.SetEnvironmentVariable(CodeBuild.WebHookEnvironmentVariableName, $"refs/heads/{MainBranch}");
-            this.buildServer.GetCurrentBranch(false).ShouldBe($"refs/heads/{MainBranch}");
+            AssertVariablesAreWrittenToFile(f);
         }
-
-        [Test]
-        public void WriteAllVariablesToTheTextWriter()
+        finally
         {
-            var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            var f = Path.Combine(assemblyLocation, "codebuild_this_file_should_be_deleted.properties");
-
-            try
-            {
-                AssertVariablesAreWrittenToFile(f);
-            }
-            finally
-            {
-                File.Delete(f);
-            }
+            File.Delete(f);
         }
+    }
 
-        private void AssertVariablesAreWrittenToFile(string file)
+    private void AssertVariablesAreWrittenToFile(string file)
+    {
+        var writes = new List<string>();
+        var semanticVersion = new SemanticVersion
         {
-            var writes = new List<string>();
-            var semanticVersion = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = "beta1",
-                BuildMetaData = "5"
-            };
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = "beta1",
+            BuildMetaData = "5"
+        };
 
-            semanticVersion.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
-            semanticVersion.BuildMetaData.Sha = "commitSha";
+        semanticVersion.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
+        semanticVersion.BuildMetaData.Sha = "commitSha";
 
-            var config = new TestEffectiveConfiguration();
+        var config = new TestEffectiveConfiguration();
 
-            var variableProvider = this.sp.GetService<IVariableProvider>();
+        var variableProvider = this.sp.GetService<IVariableProvider>();
 
-            var variables = variableProvider.GetVariablesFor(semanticVersion, config, false);
+        var variables = variableProvider.GetVariablesFor(semanticVersion, config, false);
 
-            this.buildServer.WithPropertyFile(file);
+        this.buildServer.WithPropertyFile(file);
 
-            this.buildServer.WriteIntegration(writes.Add, variables);
+        this.buildServer.WriteIntegration(writes.Add, variables);
 
-            writes[1].ShouldBe("1.2.3-beta.1+5");
+        writes[1].ShouldBe("1.2.3-beta.1+5");
 
-            File.Exists(file).ShouldBe(true);
+        File.Exists(file).ShouldBe(true);
 
-            var props = File.ReadAllText(file);
+        var props = File.ReadAllText(file);
 
-            props.ShouldContain("GitVersion_Major=1");
-            props.ShouldContain("GitVersion_Minor=2");
-        }
+        props.ShouldContain("GitVersion_Major=1");
+        props.ShouldContain("GitVersion_Minor=2");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/BuildAgents/ContinuaCiTests.cs b/src/GitVersion.Core.Tests/BuildAgents/ContinuaCiTests.cs
index 53a26a0c97..b606b3d08a 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/ContinuaCiTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/ContinuaCiTests.cs
@@ -4,23 +4,22 @@
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.BuildAgents
+namespace GitVersion.Core.Tests.BuildAgents;
+
+[TestFixture]
+public class ContinuaCiTests : TestBase
 {
-    [TestFixture]
-    public class ContinuaCiTests : TestBase
-    {
-        private IServiceProvider sp;
+    private IServiceProvider sp;
 
-        [SetUp]
-        public void SetUp() => this.sp = ConfigureServices(services => services.AddSingleton<ContinuaCi>());
+    [SetUp]
+    public void SetUp() => this.sp = ConfigureServices(services => services.AddSingleton<ContinuaCi>());
 
-        [Test]
-        public void GenerateBuildVersion()
-        {
-            var buildServer = this.sp.GetService<ContinuaCi>();
-            var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Beta4.7");
-            var continuaCiVersion = buildServer.GenerateSetVersionMessage(vars);
-            Assert.AreEqual("@@continua[setBuildVersion value='0.0.0-Beta4.7']", continuaCiVersion);
-        }
+    [Test]
+    public void GenerateBuildVersion()
+    {
+        var buildServer = this.sp.GetService<ContinuaCi>();
+        var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Beta4.7");
+        var continuaCiVersion = buildServer.GenerateSetVersionMessage(vars);
+        Assert.AreEqual("@@continua[setBuildVersion value='0.0.0-Beta4.7']", continuaCiVersion);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/BuildAgents/DroneTests.cs b/src/GitVersion.Core.Tests/BuildAgents/DroneTests.cs
index b71bfef4a0..f0468f7fd4 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/DroneTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/DroneTests.cs
@@ -5,139 +5,138 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.BuildAgents
+namespace GitVersion.Core.Tests.BuildAgents;
+
+[TestFixture]
+public class DroneTests : TestBase
 {
-    [TestFixture]
-    public class DroneTests : TestBase
+    private IEnvironment environment;
+    private IServiceProvider sp;
+    private Drone buildServer;
+
+    [SetUp]
+    public void SetUp()
+    {
+        this.sp = ConfigureServices(services => services.AddSingleton<Drone>());
+        this.environment = this.sp.GetService<IEnvironment>();
+        this.buildServer = this.sp.GetService<Drone>();
+        this.environment.SetEnvironmentVariable("DRONE", "true");
+    }
+
+    [TearDown]
+    public void TearDown() => this.environment.SetEnvironmentVariable("DRONE", null);
+
+    [Test]
+    public void CanApplyToCurrentContextShouldBeTrueWhenEnvironmentVariableIsSet()
+    {
+        // Act
+        var result = this.buildServer.CanApplyToCurrentContext();
+
+        // Assert
+        result.ShouldBeTrue();
+    }
+
+    [Test]
+    public void CanApplyToCurrentContextShouldBeFalseWhenEnvironmentVariableIsNotSet()
+    {
+        // Arrange
+        this.environment.SetEnvironmentVariable("DRONE", "");
+
+        // Act
+        var result = this.buildServer.CanApplyToCurrentContext();
+
+        // Assert
+        result.ShouldBeFalse();
+    }
+
+    [Test]
+    public void GetCurrentBranchShouldDroneBranchInCaseOfPush()
     {
-        private IEnvironment environment;
-        private IServiceProvider sp;
-        private Drone buildServer;
-
-        [SetUp]
-        public void SetUp()
-        {
-            this.sp = ConfigureServices(services => services.AddSingleton<Drone>());
-            this.environment = this.sp.GetService<IEnvironment>();
-            this.buildServer = this.sp.GetService<Drone>();
-            this.environment.SetEnvironmentVariable("DRONE", "true");
-        }
-
-        [TearDown]
-        public void TearDown() => this.environment.SetEnvironmentVariable("DRONE", null);
-
-        [Test]
-        public void CanApplyToCurrentContextShouldBeTrueWhenEnvironmentVariableIsSet()
-        {
-            // Act
-            var result = this.buildServer.CanApplyToCurrentContext();
-
-            // Assert
-            result.ShouldBeTrue();
-        }
-
-        [Test]
-        public void CanApplyToCurrentContextShouldBeFalseWhenEnvironmentVariableIsNotSet()
-        {
-            // Arrange
-            this.environment.SetEnvironmentVariable("DRONE", "");
-
-            // Act
-            var result = this.buildServer.CanApplyToCurrentContext();
-
-            // Assert
-            result.ShouldBeFalse();
-        }
-
-        [Test]
-        public void GetCurrentBranchShouldDroneBranchInCaseOfPush()
-        {
-            // Arrange
-            const string droneBranch = "droneBranch";
-
-            this.environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "");
-            this.environment.SetEnvironmentVariable("DRONE_BRANCH", droneBranch);
-
-            // Act
-            var result = this.buildServer.GetCurrentBranch(false);
-
-            // Assert
-            result.ShouldBe(droneBranch);
-        }
-
-        [Test]
-        public void GetCurrentBranchShouldUseDroneSourceBranchInCaseOfPullRequestAndNonEmptyDroneSourceBranch()
-        {
-            // Arrange
-            const string droneSourceBranch = "droneSourceBranch";
-            this.environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
-            this.environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", droneSourceBranch);
-
-            // Act
-            var result = this.buildServer.GetCurrentBranch(false);
-
-            // Assert
-            result.ShouldBe(droneSourceBranch);
-        }
-
-        [Test]
-        public void GetCurrentBranchShouldUseSourceBranchFromCiCommitRefSpecInCaseOfPullRequestAndEmptyDroneSourceBranch()
-        {
-            // Arrange
-            const string droneSourceBranch = "droneSourceBranch";
-            const string droneDestinationBranch = "droneDestinationBranch";
-
-            var ciCommitRefSpec = $"{droneSourceBranch}:{droneDestinationBranch}";
-
-            this.environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
-            this.environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");
-            this.environment.SetEnvironmentVariable("CI_COMMIT_REFSPEC", ciCommitRefSpec);
-
-            // Act
-            var result = this.buildServer.GetCurrentBranch(false);
-
-            // Assert
-            result.ShouldBe(droneSourceBranch);
-        }
-
-        [Test]
-        public void GetCurrentBranchShouldUseDroneBranchInCaseOfPullRequestAndEmptyDroneSourceBranchAndCiCommitRefSpec()
-        {
-            // Arrange
-            const string droneBranch = "droneBranch";
-
-            this.environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
-            this.environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");
-            this.environment.SetEnvironmentVariable("CI_COMMIT_REFSPEC", "");
-            this.environment.SetEnvironmentVariable("DRONE_BRANCH", droneBranch);
-
-            // Act
-            var result = this.buildServer.GetCurrentBranch(false);
-
-            // Assert
-            result.ShouldBe(droneBranch);
-        }
-
-        [Test]
-        public void GetCurrentBranchShouldUseDroneBranchInCaseOfPullRequestAndEmptyDroneSourceBranchAndInvalidFormatOfCiCommitRefSpec()
-        {
-            // Arrange
-            const string droneBranch = "droneBranch";
-            const string droneSourceBranch = "droneSourceBranch";
-            const string droneDestinationBranch = "droneDestinationBranch";
-
-            var ciCommitRefSpec = $"{droneSourceBranch};{droneDestinationBranch}";
-
-            this.environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
-            this.environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");
-            this.environment.SetEnvironmentVariable("CI_COMMIT_REFSPEC", ciCommitRefSpec);
-            this.environment.SetEnvironmentVariable("DRONE_BRANCH", droneBranch);
-
-            // Act
-            var result = this.buildServer.GetCurrentBranch(false);
-
-            // Assert
-            result.ShouldBe(droneBranch);
-        }
+        // Arrange
+        const string droneBranch = "droneBranch";
+
+        this.environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "");
+        this.environment.SetEnvironmentVariable("DRONE_BRANCH", droneBranch);
+
+        // Act
+        var result = this.buildServer.GetCurrentBranch(false);
+
+        // Assert
+        result.ShouldBe(droneBranch);
+    }
+
+    [Test]
+    public void GetCurrentBranchShouldUseDroneSourceBranchInCaseOfPullRequestAndNonEmptyDroneSourceBranch()
+    {
+        // Arrange
+        const string droneSourceBranch = "droneSourceBranch";
+        this.environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
+        this.environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", droneSourceBranch);
+
+        // Act
+        var result = this.buildServer.GetCurrentBranch(false);
+
+        // Assert
+        result.ShouldBe(droneSourceBranch);
+    }
+
+    [Test]
+    public void GetCurrentBranchShouldUseSourceBranchFromCiCommitRefSpecInCaseOfPullRequestAndEmptyDroneSourceBranch()
+    {
+        // Arrange
+        const string droneSourceBranch = "droneSourceBranch";
+        const string droneDestinationBranch = "droneDestinationBranch";
+
+        var ciCommitRefSpec = $"{droneSourceBranch}:{droneDestinationBranch}";
+
+        this.environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
+        this.environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");
+        this.environment.SetEnvironmentVariable("CI_COMMIT_REFSPEC", ciCommitRefSpec);
+
+        // Act
+        var result = this.buildServer.GetCurrentBranch(false);
+
+        // Assert
+        result.ShouldBe(droneSourceBranch);
+    }
+
+    [Test]
+    public void GetCurrentBranchShouldUseDroneBranchInCaseOfPullRequestAndEmptyDroneSourceBranchAndCiCommitRefSpec()
+    {
+        // Arrange
+        const string droneBranch = "droneBranch";
+
+        this.environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
+        this.environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");
+        this.environment.SetEnvironmentVariable("CI_COMMIT_REFSPEC", "");
+        this.environment.SetEnvironmentVariable("DRONE_BRANCH", droneBranch);
+
+        // Act
+        var result = this.buildServer.GetCurrentBranch(false);
+
+        // Assert
+        result.ShouldBe(droneBranch);
+    }
+
+    [Test]
+    public void GetCurrentBranchShouldUseDroneBranchInCaseOfPullRequestAndEmptyDroneSourceBranchAndInvalidFormatOfCiCommitRefSpec()
+    {
+        // Arrange
+        const string droneBranch = "droneBranch";
+        const string droneSourceBranch = "droneSourceBranch";
+        const string droneDestinationBranch = "droneDestinationBranch";
+
+        var ciCommitRefSpec = $"{droneSourceBranch};{droneDestinationBranch}";
+
+        this.environment.SetEnvironmentVariable("DRONE_PULL_REQUEST", "1");
+        this.environment.SetEnvironmentVariable("DRONE_SOURCE_BRANCH", "");
+        this.environment.SetEnvironmentVariable("CI_COMMIT_REFSPEC", ciCommitRefSpec);
+        this.environment.SetEnvironmentVariable("DRONE_BRANCH", droneBranch);
+
+        // Act
+        var result = this.buildServer.GetCurrentBranch(false);
+
+        // Assert
+        result.ShouldBe(droneBranch);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/BuildAgents/EnvRunTests.cs b/src/GitVersion.Core.Tests/BuildAgents/EnvRunTests.cs
index 8aed5357b9..9453c828fc 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/EnvRunTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/EnvRunTests.cs
@@ -5,67 +5,66 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.BuildAgents
+namespace GitVersion.Core.Tests.BuildAgents;
+
+[TestFixture]
+public class EnvRunTests : TestBase
 {
-    [TestFixture]
-    public class EnvRunTests : TestBase
-    {
-        private const string EnvVarName = "ENVRUN_DATABASE";
-        private string mFilePath;
-        private IEnvironment environment;
-        private EnvRun buildServer;
+    private const string EnvVarName = "ENVRUN_DATABASE";
+    private string mFilePath;
+    private IEnvironment environment;
+    private EnvRun buildServer;
 
-        [SetUp]
-        public void SetEnvironmentVariableForTest()
-        {
-            var sp = ConfigureServices(services => services.AddSingleton<EnvRun>());
-            this.environment = sp.GetService<IEnvironment>();
-            this.buildServer = sp.GetService<EnvRun>();
+    [SetUp]
+    public void SetEnvironmentVariableForTest()
+    {
+        var sp = ConfigureServices(services => services.AddSingleton<EnvRun>());
+        this.environment = sp.GetService<IEnvironment>();
+        this.buildServer = sp.GetService<EnvRun>();
 
-            // set environment variable and create an empty envrun file to indicate that EnvRun is running...
-            this.mFilePath = Path.Combine(Path.GetTempPath(), "envrun.db");
-            this.environment.SetEnvironmentVariable(EnvVarName, this.mFilePath);
-            File.OpenWrite(this.mFilePath).Dispose();
-        }
+        // set environment variable and create an empty envrun file to indicate that EnvRun is running...
+        this.mFilePath = Path.Combine(Path.GetTempPath(), "envrun.db");
+        this.environment.SetEnvironmentVariable(EnvVarName, this.mFilePath);
+        File.OpenWrite(this.mFilePath).Dispose();
+    }
 
-        [TearDown]
-        public void ClearEnvironmentVariableForTest()
-        {
-            this.environment.SetEnvironmentVariable(EnvVarName, null);
-            File.Delete(this.mFilePath);
-        }
+    [TearDown]
+    public void ClearEnvironmentVariableForTest()
+    {
+        this.environment.SetEnvironmentVariable(EnvVarName, null);
+        File.Delete(this.mFilePath);
+    }
 
-        [Test]
-        public void CanApplyToCurrentContext()
-        {
-            var applys = this.buildServer.CanApplyToCurrentContext();
-            applys.ShouldBeTrue();
-        }
+    [Test]
+    public void CanApplyToCurrentContext()
+    {
+        var applys = this.buildServer.CanApplyToCurrentContext();
+        applys.ShouldBeTrue();
+    }
 
-        [Test]
-        public void CanApplyToCurrentContextEnvironmentVariableNotSet()
-        {
-            this.environment.SetEnvironmentVariable(EnvVarName, null);
-            var applys = this.buildServer.CanApplyToCurrentContext();
-            applys.ShouldBeFalse();
-        }
+    [Test]
+    public void CanApplyToCurrentContextEnvironmentVariableNotSet()
+    {
+        this.environment.SetEnvironmentVariable(EnvVarName, null);
+        var applys = this.buildServer.CanApplyToCurrentContext();
+        applys.ShouldBeFalse();
+    }
 
-        [TestCase("1.2.3")]
-        [TestCase("1.2.3-rc4")]
-        public void GenerateSetVersionMessage(string fullSemVer)
-        {
-            var vars = new TestableVersionVariables(fullSemVer: fullSemVer);
-            var version = this.buildServer.GenerateSetVersionMessage(vars);
-            version.ShouldBe(fullSemVer);
-        }
+    [TestCase("1.2.3")]
+    [TestCase("1.2.3-rc4")]
+    public void GenerateSetVersionMessage(string fullSemVer)
+    {
+        var vars = new TestableVersionVariables(fullSemVer: fullSemVer);
+        var version = this.buildServer.GenerateSetVersionMessage(vars);
+        version.ShouldBe(fullSemVer);
+    }
 
-        [TestCase("Version", "1.2.3", "@@envrun[set name='GitVersion_Version' value='1.2.3']")]
-        [TestCase("Version", "1.2.3-rc4", "@@envrun[set name='GitVersion_Version' value='1.2.3-rc4']")]
-        public void GenerateSetParameterMessage(string name, string value, string expected)
-        {
-            var output = this.buildServer.GenerateSetParameterMessage(name, value);
-            output.ShouldHaveSingleItem();
-            output[0].ShouldBe(expected);
-        }
+    [TestCase("Version", "1.2.3", "@@envrun[set name='GitVersion_Version' value='1.2.3']")]
+    [TestCase("Version", "1.2.3-rc4", "@@envrun[set name='GitVersion_Version' value='1.2.3-rc4']")]
+    public void GenerateSetParameterMessage(string name, string value, string expected)
+    {
+        var output = this.buildServer.GenerateSetParameterMessage(name, value);
+        output.ShouldHaveSingleItem();
+        output[0].ShouldBe(expected);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/BuildAgents/GitHubActionsTests.cs b/src/GitVersion.Core.Tests/BuildAgents/GitHubActionsTests.cs
index 29ce765971..bbdf21d962 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/GitHubActionsTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/GitHubActionsTests.cs
@@ -6,189 +6,187 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.BuildAgents
+namespace GitVersion.Core.Tests.BuildAgents;
+
+[TestFixture]
+public class GitHubActionsTests : TestBase
 {
+    private IEnvironment environment;
+    private GitHubActions buildServer;
+    private string githubSetEnvironmentTempFilePath;
 
-    [TestFixture]
-    public class GitHubActionsTests : TestBase
+    [SetUp]
+    public void SetUp()
     {
-        private IEnvironment environment;
-        private GitHubActions buildServer;
-        private string githubSetEnvironmentTempFilePath;
-
-        [SetUp]
-        public void SetUp()
-        {
-            var sp = ConfigureServices(services => services.AddSingleton<GitHubActions>());
-            this.environment = sp.GetService<IEnvironment>();
-            this.buildServer = sp.GetService<GitHubActions>();
-            this.environment.SetEnvironmentVariable(GitHubActions.EnvironmentVariableName, "true");
+        var sp = ConfigureServices(services => services.AddSingleton<GitHubActions>());
+        this.environment = sp.GetService<IEnvironment>();
+        this.buildServer = sp.GetService<GitHubActions>();
+        this.environment.SetEnvironmentVariable(GitHubActions.EnvironmentVariableName, "true");
 
-            this.githubSetEnvironmentTempFilePath = Path.GetTempFileName();
-            this.environment.SetEnvironmentVariable(GitHubActions.GitHubSetEnvTempFileEnvironmentVariableName, this.githubSetEnvironmentTempFilePath);
-        }
+        this.githubSetEnvironmentTempFilePath = Path.GetTempFileName();
+        this.environment.SetEnvironmentVariable(GitHubActions.GitHubSetEnvTempFileEnvironmentVariableName, this.githubSetEnvironmentTempFilePath);
+    }
 
-        [TearDown]
-        public void TearDown()
+    [TearDown]
+    public void TearDown()
+    {
+        this.environment.SetEnvironmentVariable(GitHubActions.EnvironmentVariableName, null);
+        this.environment.SetEnvironmentVariable(GitHubActions.GitHubSetEnvTempFileEnvironmentVariableName, null);
+        if (this.githubSetEnvironmentTempFilePath != null && File.Exists(this.githubSetEnvironmentTempFilePath))
         {
-            this.environment.SetEnvironmentVariable(GitHubActions.EnvironmentVariableName, null);
-            this.environment.SetEnvironmentVariable(GitHubActions.GitHubSetEnvTempFileEnvironmentVariableName, null);
-            if (this.githubSetEnvironmentTempFilePath != null && File.Exists(this.githubSetEnvironmentTempFilePath))
-            {
-                File.Delete(this.githubSetEnvironmentTempFilePath);
-                this.githubSetEnvironmentTempFilePath = null;
-            }
+            File.Delete(this.githubSetEnvironmentTempFilePath);
+            this.githubSetEnvironmentTempFilePath = null;
         }
+    }
 
-        [Test]
-        public void CanApplyToCurrentContextShouldBeTrueWhenEnvironmentVariableIsSet()
-        {
-            // Act
-            var result = this.buildServer.CanApplyToCurrentContext();
+    [Test]
+    public void CanApplyToCurrentContextShouldBeTrueWhenEnvironmentVariableIsSet()
+    {
+        // Act
+        var result = this.buildServer.CanApplyToCurrentContext();
 
-            // Assert
-            result.ShouldBeTrue();
-        }
+        // Assert
+        result.ShouldBeTrue();
+    }
 
-        [Test]
-        public void CanApplyToCurrentContextShouldBeFalseWhenEnvironmentVariableIsNotSet()
-        {
-            // Arrange
-            this.environment.SetEnvironmentVariable(GitHubActions.EnvironmentVariableName, "");
+    [Test]
+    public void CanApplyToCurrentContextShouldBeFalseWhenEnvironmentVariableIsNotSet()
+    {
+        // Arrange
+        this.environment.SetEnvironmentVariable(GitHubActions.EnvironmentVariableName, "");
 
-            // Act
-            var result = this.buildServer.CanApplyToCurrentContext();
+        // Act
+        var result = this.buildServer.CanApplyToCurrentContext();
 
-            // Assert
-            result.ShouldBeFalse();
-        }
+        // Assert
+        result.ShouldBeFalse();
+    }
 
-        [Test]
-        public void GetCurrentBranchShouldHandleBranches()
-        {
-            // Arrange
-            this.environment.SetEnvironmentVariable("GITHUB_REF", $"refs/heads/{MainBranch}");
+    [Test]
+    public void GetCurrentBranchShouldHandleBranches()
+    {
+        // Arrange
+        this.environment.SetEnvironmentVariable("GITHUB_REF", $"refs/heads/{MainBranch}");
 
-            // Act
-            var result = this.buildServer.GetCurrentBranch(false);
+        // Act
+        var result = this.buildServer.GetCurrentBranch(false);
 
-            // Assert
-            result.ShouldBe($"refs/heads/{MainBranch}");
-        }
+        // Assert
+        result.ShouldBe($"refs/heads/{MainBranch}");
+    }
 
-        [Test]
-        public void GetCurrentBranchShouldHandleTags()
-        {
-            // Arrange
-            this.environment.SetEnvironmentVariable("GITHUB_REF", "refs/tags/1.0.0");
+    [Test]
+    public void GetCurrentBranchShouldHandleTags()
+    {
+        // Arrange
+        this.environment.SetEnvironmentVariable("GITHUB_REF", "refs/tags/1.0.0");
 
-            // Act
-            var result = this.buildServer.GetCurrentBranch(false);
+        // Act
+        var result = this.buildServer.GetCurrentBranch(false);
 
-            // Assert
-            result.ShouldBe("refs/tags/1.0.0");
-        }
+        // Assert
+        result.ShouldBe("refs/tags/1.0.0");
+    }
 
-        [Test]
-        public void GetCurrentBranchShouldHandlePullRequests()
-        {
-            // Arrange
-            this.environment.SetEnvironmentVariable("GITHUB_REF", "refs/pull/1/merge");
+    [Test]
+    public void GetCurrentBranchShouldHandlePullRequests()
+    {
+        // Arrange
+        this.environment.SetEnvironmentVariable("GITHUB_REF", "refs/pull/1/merge");
 
-            // Act
-            var result = this.buildServer.GetCurrentBranch(false);
+        // Act
+        var result = this.buildServer.GetCurrentBranch(false);
 
-            // Assert
-            result.ShouldBe("refs/pull/1/merge");
-        }
+        // Assert
+        result.ShouldBe("refs/pull/1/merge");
+    }
 
-        [Test]
-        public void GetSetParameterMessage()
-        {
-            // Assert
-            this.environment.GetEnvironmentVariable("GitVersion_Something").ShouldBeNullOrWhiteSpace();
+    [Test]
+    public void GetSetParameterMessage()
+    {
+        // Assert
+        this.environment.GetEnvironmentVariable("GitVersion_Something").ShouldBeNullOrWhiteSpace();
 
-            // Act
-            var result = this.buildServer.GenerateSetParameterMessage("GitVersion_Something", "1.0.0");
+        // Act
+        var result = this.buildServer.GenerateSetParameterMessage("GitVersion_Something", "1.0.0");
 
-            // Assert
-            result.ShouldContain(s => true, 0);
-        }
+        // Assert
+        result.ShouldContain(s => true, 0);
+    }
 
-        [Test]
-        public void SkipEmptySetParameterMessage()
-        {
-            // Act
-            var result = this.buildServer.GenerateSetParameterMessage("Hello", string.Empty);
+    [Test]
+    public void SkipEmptySetParameterMessage()
+    {
+        // Act
+        var result = this.buildServer.GenerateSetParameterMessage("Hello", string.Empty);
 
-            // Assert
-            result.ShouldBeEquivalentTo(System.Array.Empty<string>());
-        }
+        // Assert
+        result.ShouldBeEquivalentTo(System.Array.Empty<string>());
+    }
 
-        [Test]
-        public void ShouldWriteIntegration()
-        {
-            // Arrange
-            var vars = new TestableVersionVariables("1.0.0");
+    [Test]
+    public void ShouldWriteIntegration()
+    {
+        // Arrange
+        var vars = new TestableVersionVariables("1.0.0");
 
-            var list = new List<string>();
+        var list = new List<string>();
 
-            // Assert
-            this.environment.GetEnvironmentVariable("GitVersion_Major").ShouldBeNullOrWhiteSpace();
+        // Assert
+        this.environment.GetEnvironmentVariable("GitVersion_Major").ShouldBeNullOrWhiteSpace();
 
-            // Act
-            this.buildServer.WriteIntegration(s => list.Add(s), vars);
+        // Act
+        this.buildServer.WriteIntegration(s => list.Add(s), vars);
 
-            // Assert
-            var expected = new List<string>
-            {
-                "Executing GenerateSetVersionMessage for 'GitHubActions'.",
-                "",
-                "Executing GenerateBuildLogOutput for 'GitHubActions'.",
-                "Writing version variables to $GITHUB_ENV file for 'GitHubActions'."
-            };
+        // Assert
+        var expected = new List<string>
+        {
+            "Executing GenerateSetVersionMessage for 'GitHubActions'.",
+            "",
+            "Executing GenerateBuildLogOutput for 'GitHubActions'.",
+            "Writing version variables to $GITHUB_ENV file for 'GitHubActions'."
+        };
 
-            string.Join(System.Environment.NewLine, list)
-                .ShouldBe(string.Join(System.Environment.NewLine, expected));
+        string.Join(System.Environment.NewLine, list)
+            .ShouldBe(string.Join(System.Environment.NewLine, expected));
 
-            var expectedFileContents = new List<string>
-            {
-                "GitVersion_Major=1.0.0"
-            };
+        var expectedFileContents = new List<string>
+        {
+            "GitVersion_Major=1.0.0"
+        };
 
-            var actualFileContents = File.ReadAllLines(this.githubSetEnvironmentTempFilePath);
+        var actualFileContents = File.ReadAllLines(this.githubSetEnvironmentTempFilePath);
 
-            actualFileContents.ShouldBe(expectedFileContents);
-        }
+        actualFileContents.ShouldBe(expectedFileContents);
+    }
 
-        [Test]
-        public void ShouldNotWriteIntegration()
-        {
-            // Arrange
-            var vars = new TestableVersionVariables("1.0.0");
+    [Test]
+    public void ShouldNotWriteIntegration()
+    {
+        // Arrange
+        var vars = new TestableVersionVariables("1.0.0");
 
-            var list = new List<string>();
+        var list = new List<string>();
 
-            // Assert
-            this.environment.GetEnvironmentVariable("GitVersion_Major").ShouldBeNullOrWhiteSpace();
+        // Assert
+        this.environment.GetEnvironmentVariable("GitVersion_Major").ShouldBeNullOrWhiteSpace();
 
-            // Act
-            this.buildServer.WriteIntegration(s => list.Add(s), vars, false);
+        // Act
+        this.buildServer.WriteIntegration(s => list.Add(s), vars, false);
 
-            list.ShouldNotContain(x => x.StartsWith("Executing GenerateSetVersionMessage for "));
-        }
+        list.ShouldNotContain(x => x.StartsWith("Executing GenerateSetVersionMessage for "));
+    }
 
-        [Test]
-        public void GetEmptyGenerateSetVersionMessage()
-        {
-            // Arrange
-            var vars = new TestableVersionVariables("1.0.0");
+    [Test]
+    public void GetEmptyGenerateSetVersionMessage()
+    {
+        // Arrange
+        var vars = new TestableVersionVariables("1.0.0");
 
-            // Act
-            var message = this.buildServer.GenerateSetVersionMessage(vars);
+        // Act
+        var message = this.buildServer.GenerateSetVersionMessage(vars);
 
-            // Assert
-            message.ShouldBeEmpty();
-        }
+        // Assert
+        message.ShouldBeEmpty();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/BuildAgents/GitLabCiTests.cs b/src/GitVersion.Core.Tests/BuildAgents/GitLabCiTests.cs
index 7f79d4e92c..f2d8766495 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/GitLabCiTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/GitLabCiTests.cs
@@ -9,84 +9,83 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.BuildAgents
+namespace GitVersion.Core.Tests.BuildAgents;
+
+[TestFixture]
+public class GitLabCiTests : TestBase
 {
-    [TestFixture]
-    public class GitLabCiTests : TestBase
+    private GitLabCi buildServer;
+    private IServiceProvider sp;
+
+    [SetUp]
+    public void SetUp()
     {
-        private GitLabCi buildServer;
-        private IServiceProvider sp;
+        this.sp = ConfigureServices(services => services.AddSingleton<GitLabCi>());
+        this.buildServer = this.sp.GetService<GitLabCi>();
+    }
 
-        [SetUp]
-        public void SetUp()
-        {
-            this.sp = ConfigureServices(services => services.AddSingleton<GitLabCi>());
-            this.buildServer = this.sp.GetService<GitLabCi>();
-        }
+    [Test]
+    public void GenerateSetVersionMessageReturnsVersionAsIsAlthoughThisIsNotUsedByJenkins()
+    {
+        var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Beta4.7");
+        this.buildServer.GenerateSetVersionMessage(vars).ShouldBe("0.0.0-Beta4.7");
+    }
 
-        [Test]
-        public void GenerateSetVersionMessageReturnsVersionAsIsAlthoughThisIsNotUsedByJenkins()
-        {
-            var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Beta4.7");
-            this.buildServer.GenerateSetVersionMessage(vars).ShouldBe("0.0.0-Beta4.7");
-        }
+    [Test]
+    public void GenerateMessageTest()
+    {
+        var generatedParameterMessages = this.buildServer.GenerateSetParameterMessage("name", "value");
+        generatedParameterMessages.Length.ShouldBe(1);
+        generatedParameterMessages[0].ShouldBe("GitVersion_name=value");
+    }
+
+    [Test]
+    public void WriteAllVariablesToTheTextWriter()
+    {
+        var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+        var f = Path.Combine(assemblyLocation, "jenkins_this_file_should_be_deleted.properties");
 
-        [Test]
-        public void GenerateMessageTest()
+        try
         {
-            var generatedParameterMessages = this.buildServer.GenerateSetParameterMessage("name", "value");
-            generatedParameterMessages.Length.ShouldBe(1);
-            generatedParameterMessages[0].ShouldBe("GitVersion_name=value");
+            AssertVariablesAreWrittenToFile(f);
         }
-
-        [Test]
-        public void WriteAllVariablesToTheTextWriter()
+        finally
         {
-            var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            var f = Path.Combine(assemblyLocation, "jenkins_this_file_should_be_deleted.properties");
-
-            try
-            {
-                AssertVariablesAreWrittenToFile(f);
-            }
-            finally
-            {
-                File.Delete(f);
-            }
+            File.Delete(f);
         }
+    }
 
-        private void AssertVariablesAreWrittenToFile(string file)
+    private void AssertVariablesAreWrittenToFile(string file)
+    {
+        var writes = new List<string>();
+        var semanticVersion = new SemanticVersion
         {
-            var writes = new List<string>();
-            var semanticVersion = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = "beta1",
-                BuildMetaData = "5"
-            };
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = "beta1",
+            BuildMetaData = "5"
+        };
 
-            semanticVersion.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
-            semanticVersion.BuildMetaData.Sha = "commitSha";
+        semanticVersion.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
+        semanticVersion.BuildMetaData.Sha = "commitSha";
 
-            var config = new TestEffectiveConfiguration();
-            var variableProvider = this.sp.GetService<IVariableProvider>();
+        var config = new TestEffectiveConfiguration();
+        var variableProvider = this.sp.GetService<IVariableProvider>();
 
-            var variables = variableProvider.GetVariablesFor(semanticVersion, config, false);
+        var variables = variableProvider.GetVariablesFor(semanticVersion, config, false);
 
-            this.buildServer.WithPropertyFile(file);
+        this.buildServer.WithPropertyFile(file);
 
-            this.buildServer.WriteIntegration(writes.Add, variables);
+        this.buildServer.WriteIntegration(writes.Add, variables);
 
-            writes[1].ShouldBe("1.2.3-beta.1+5");
+        writes[1].ShouldBe("1.2.3-beta.1+5");
 
-            File.Exists(file).ShouldBe(true);
+        File.Exists(file).ShouldBe(true);
 
-            var props = File.ReadAllText(file);
+        var props = File.ReadAllText(file);
 
-            props.ShouldContain("GitVersion_Major=1");
-            props.ShouldContain("GitVersion_Minor=2");
-        }
+        props.ShouldContain("GitVersion_Major=1");
+        props.ShouldContain("GitVersion_Minor=2");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/BuildAgents/JenkinsTests.cs b/src/GitVersion.Core.Tests/BuildAgents/JenkinsTests.cs
index 127ece3db8..950f523322 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/JenkinsTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/JenkinsTests.cs
@@ -9,156 +9,155 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.BuildAgents
+namespace GitVersion.Core.Tests.BuildAgents;
+
+[TestFixture]
+public class JenkinsTests : TestBase
 {
-    [TestFixture]
-    public class JenkinsTests : TestBase
+    private const string key = "JENKINS_URL";
+    private const string branch = "GIT_BRANCH";
+    private const string localBranch = "GIT_LOCAL_BRANCH";
+    private const string pipelineBranch = "BRANCH_NAME";
+    private IEnvironment environment;
+    private IServiceProvider sp;
+    private Jenkins buildServer;
+
+    [SetUp]
+    public void SetUp()
     {
-        private const string key = "JENKINS_URL";
-        private const string branch = "GIT_BRANCH";
-        private const string localBranch = "GIT_LOCAL_BRANCH";
-        private const string pipelineBranch = "BRANCH_NAME";
-        private IEnvironment environment;
-        private IServiceProvider sp;
-        private Jenkins buildServer;
-
-        [SetUp]
-        public void SetUp()
-        {
-            this.sp = ConfigureServices(services => services.AddSingleton<Jenkins>());
-            this.environment = this.sp.GetService<IEnvironment>();
-            this.buildServer = this.sp.GetService<Jenkins>();
-        }
+        this.sp = ConfigureServices(services => services.AddSingleton<Jenkins>());
+        this.environment = this.sp.GetService<IEnvironment>();
+        this.buildServer = this.sp.GetService<Jenkins>();
+    }
 
-        private void SetEnvironmentVariableForDetection() => this.environment.SetEnvironmentVariable(key, "a value");
+    private void SetEnvironmentVariableForDetection() => this.environment.SetEnvironmentVariable(key, "a value");
 
-        private void ClearenvironmentVariableForDetection() => this.environment.SetEnvironmentVariable(key, null);
+    private void ClearenvironmentVariableForDetection() => this.environment.SetEnvironmentVariable(key, null);
 
-        [Test]
-        public void CanApplyCurrentContextWhenenvironmentVariableIsSet()
-        {
-            SetEnvironmentVariableForDetection();
-            this.buildServer.CanApplyToCurrentContext().ShouldBe(true);
-        }
+    [Test]
+    public void CanApplyCurrentContextWhenenvironmentVariableIsSet()
+    {
+        SetEnvironmentVariableForDetection();
+        this.buildServer.CanApplyToCurrentContext().ShouldBe(true);
+    }
 
-        [Test]
-        public void CanNotApplyCurrentContextWhenenvironmentVariableIsNotSet()
-        {
-            ClearenvironmentVariableForDetection();
-            this.buildServer.CanApplyToCurrentContext().ShouldBe(false);
-        }
+    [Test]
+    public void CanNotApplyCurrentContextWhenenvironmentVariableIsNotSet()
+    {
+        ClearenvironmentVariableForDetection();
+        this.buildServer.CanApplyToCurrentContext().ShouldBe(false);
+    }
 
-        [Test]
-        public void JenkinsTakesLocalBranchNameNotRemoteName()
-        {
-            // Save original values so they can be restored
-            var branchOrig = this.environment.GetEnvironmentVariable(branch);
-            var localBranchOrig = this.environment.GetEnvironmentVariable(localBranch);
+    [Test]
+    public void JenkinsTakesLocalBranchNameNotRemoteName()
+    {
+        // Save original values so they can be restored
+        var branchOrig = this.environment.GetEnvironmentVariable(branch);
+        var localBranchOrig = this.environment.GetEnvironmentVariable(localBranch);
 
-            // Set GIT_BRANCH for testing
-            this.environment.SetEnvironmentVariable(branch, $"origin/{MainBranch}");
+        // Set GIT_BRANCH for testing
+        this.environment.SetEnvironmentVariable(branch, $"origin/{MainBranch}");
 
-            // Test Jenkins that GetCurrentBranch falls back to GIT_BRANCH if GIT_LOCAL_BRANCH undefined
-            this.buildServer.GetCurrentBranch(true).ShouldBe($"origin/{MainBranch}");
+        // Test Jenkins that GetCurrentBranch falls back to GIT_BRANCH if GIT_LOCAL_BRANCH undefined
+        this.buildServer.GetCurrentBranch(true).ShouldBe($"origin/{MainBranch}");
 
-            // Set GIT_LOCAL_BRANCH
-            this.environment.SetEnvironmentVariable(localBranch, MainBranch);
+        // Set GIT_LOCAL_BRANCH
+        this.environment.SetEnvironmentVariable(localBranch, MainBranch);
 
-            // Test Jenkins GetCurrentBranch method now returns GIT_LOCAL_BRANCH
-            this.buildServer.GetCurrentBranch(true).ShouldBe(MainBranch);
+        // Test Jenkins GetCurrentBranch method now returns GIT_LOCAL_BRANCH
+        this.buildServer.GetCurrentBranch(true).ShouldBe(MainBranch);
 
-            // Restore environment variables
-            this.environment.SetEnvironmentVariable(branch, branchOrig);
-            this.environment.SetEnvironmentVariable(localBranch, localBranchOrig);
-        }
+        // Restore environment variables
+        this.environment.SetEnvironmentVariable(branch, branchOrig);
+        this.environment.SetEnvironmentVariable(localBranch, localBranchOrig);
+    }
 
-        [Test]
-        public void JenkinsTakesBranchNameInPipelineAsCode()
-        {
-            // Save original values so they can be restored
-            var branchOrig = this.environment.GetEnvironmentVariable(branch);
-            var localBranchOrig = this.environment.GetEnvironmentVariable(localBranch);
-            var pipelineBranchOrig = this.environment.GetEnvironmentVariable(pipelineBranch);
-
-            // Set BRANCH_NAME in pipeline mode
-            this.environment.SetEnvironmentVariable(pipelineBranch, MainBranch);
-            // When Jenkins uses a Pipeline, GIT_BRANCH and GIT_LOCAL_BRANCH are not set:
-            this.environment.SetEnvironmentVariable(branch, null);
-            this.environment.SetEnvironmentVariable(localBranch, null);
-
-            // Test Jenkins GetCurrentBranch method now returns BRANCH_NAME
-            this.buildServer.GetCurrentBranch(true).ShouldBe(MainBranch);
-
-            // Restore environment variables
-            this.environment.SetEnvironmentVariable(branch, branchOrig);
-            this.environment.SetEnvironmentVariable(localBranch, localBranchOrig);
-            this.environment.SetEnvironmentVariable(pipelineBranch, pipelineBranchOrig);
-        }
+    [Test]
+    public void JenkinsTakesBranchNameInPipelineAsCode()
+    {
+        // Save original values so they can be restored
+        var branchOrig = this.environment.GetEnvironmentVariable(branch);
+        var localBranchOrig = this.environment.GetEnvironmentVariable(localBranch);
+        var pipelineBranchOrig = this.environment.GetEnvironmentVariable(pipelineBranch);
+
+        // Set BRANCH_NAME in pipeline mode
+        this.environment.SetEnvironmentVariable(pipelineBranch, MainBranch);
+        // When Jenkins uses a Pipeline, GIT_BRANCH and GIT_LOCAL_BRANCH are not set:
+        this.environment.SetEnvironmentVariable(branch, null);
+        this.environment.SetEnvironmentVariable(localBranch, null);
+
+        // Test Jenkins GetCurrentBranch method now returns BRANCH_NAME
+        this.buildServer.GetCurrentBranch(true).ShouldBe(MainBranch);
+
+        // Restore environment variables
+        this.environment.SetEnvironmentVariable(branch, branchOrig);
+        this.environment.SetEnvironmentVariable(localBranch, localBranchOrig);
+        this.environment.SetEnvironmentVariable(pipelineBranch, pipelineBranchOrig);
+    }
 
-        [Test]
-        public void GenerateSetVersionMessageReturnsVersionAsIsAlthoughThisIsNotUsedByJenkins()
-        {
-            var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Beta4.7");
-            this.buildServer.GenerateSetVersionMessage(vars).ShouldBe("0.0.0-Beta4.7");
-        }
+    [Test]
+    public void GenerateSetVersionMessageReturnsVersionAsIsAlthoughThisIsNotUsedByJenkins()
+    {
+        var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Beta4.7");
+        this.buildServer.GenerateSetVersionMessage(vars).ShouldBe("0.0.0-Beta4.7");
+    }
+
+    [Test]
+    public void GenerateMessageTest()
+    {
+        var generatedParameterMessages = this.buildServer.GenerateSetParameterMessage("name", "value");
+        generatedParameterMessages.Length.ShouldBe(1);
+        generatedParameterMessages[0].ShouldBe("GitVersion_name=value");
+    }
+
+    [Test]
+    public void WriteAllVariablesToTheTextWriter()
+    {
+        var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+        var f = Path.Combine(assemblyLocation, "gitlab_this_file_should_be_deleted.properties");
 
-        [Test]
-        public void GenerateMessageTest()
+        try
         {
-            var generatedParameterMessages = this.buildServer.GenerateSetParameterMessage("name", "value");
-            generatedParameterMessages.Length.ShouldBe(1);
-            generatedParameterMessages[0].ShouldBe("GitVersion_name=value");
+            AssertVariablesAreWrittenToFile(f);
         }
-
-        [Test]
-        public void WriteAllVariablesToTheTextWriter()
+        finally
         {
-            var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            var f = Path.Combine(assemblyLocation, "gitlab_this_file_should_be_deleted.properties");
-
-            try
-            {
-                AssertVariablesAreWrittenToFile(f);
-            }
-            finally
-            {
-                File.Delete(f);
-            }
+            File.Delete(f);
         }
+    }
 
-        private void AssertVariablesAreWrittenToFile(string file)
+    private void AssertVariablesAreWrittenToFile(string file)
+    {
+        var writes = new List<string>();
+        var semanticVersion = new SemanticVersion
         {
-            var writes = new List<string>();
-            var semanticVersion = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = "beta1",
-                BuildMetaData = "5"
-            };
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = "beta1",
+            BuildMetaData = "5"
+        };
 
-            semanticVersion.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
-            semanticVersion.BuildMetaData.Sha = "commitSha";
+        semanticVersion.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
+        semanticVersion.BuildMetaData.Sha = "commitSha";
 
-            var config = new TestEffectiveConfiguration();
+        var config = new TestEffectiveConfiguration();
 
-            var variableProvider = this.sp.GetService<IVariableProvider>();
+        var variableProvider = this.sp.GetService<IVariableProvider>();
 
-            var variables = variableProvider.GetVariablesFor(semanticVersion, config, false);
+        var variables = variableProvider.GetVariablesFor(semanticVersion, config, false);
 
-            this.buildServer.WithPropertyFile(file);
+        this.buildServer.WithPropertyFile(file);
 
-            this.buildServer.WriteIntegration(writes.Add, variables);
+        this.buildServer.WriteIntegration(writes.Add, variables);
 
-            writes[1].ShouldBe("1.2.3-beta.1+5");
+        writes[1].ShouldBe("1.2.3-beta.1+5");
 
-            File.Exists(file).ShouldBe(true);
+        File.Exists(file).ShouldBe(true);
 
-            var props = File.ReadAllText(file);
+        var props = File.ReadAllText(file);
 
-            props.ShouldContain("GitVersion_Major=1");
-            props.ShouldContain("GitVersion_Minor=2");
-        }
+        props.ShouldContain("GitVersion_Major=1");
+        props.ShouldContain("GitVersion_Minor=2");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/BuildAgents/MyGetTests.cs b/src/GitVersion.Core.Tests/BuildAgents/MyGetTests.cs
index 599ed0c2ca..4a3265ec1e 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/MyGetTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/MyGetTests.cs
@@ -3,40 +3,39 @@
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.BuildAgents
+namespace GitVersion.Core.Tests.BuildAgents;
+
+[TestFixture]
+public class MyGetTests : TestBase
 {
-    [TestFixture]
-    public class MyGetTests : TestBase
-    {
-        private MyGet buildServer;
+    private MyGet buildServer;
 
-        [SetUp]
-        public void SetUp()
-        {
-            var sp = ConfigureServices(services => services.AddSingleton<MyGet>());
-            this.buildServer = sp.GetService<MyGet>();
-        }
+    [SetUp]
+    public void SetUp()
+    {
+        var sp = ConfigureServices(services => services.AddSingleton<MyGet>());
+        this.buildServer = sp.GetService<MyGet>();
+    }
 
-        [Test]
-        public void DevelopBranch()
-        {
-            var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Unstable4");
-            var message = this.buildServer.GenerateSetVersionMessage(vars);
-            Assert.AreEqual(null, message);
-        }
+    [Test]
+    public void DevelopBranch()
+    {
+        var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Unstable4");
+        var message = this.buildServer.GenerateSetVersionMessage(vars);
+        Assert.AreEqual(null, message);
+    }
 
-        [Test]
-        public void EscapeValues()
-        {
-            var message = this.buildServer.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
-            Assert.AreEqual("##myget[setParameter name='GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", message[0]);
-        }
+    [Test]
+    public void EscapeValues()
+    {
+        var message = this.buildServer.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
+        Assert.AreEqual("##myget[setParameter name='GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", message[0]);
+    }
 
-        [Test]
-        public void BuildNumber()
-        {
-            var message = this.buildServer.GenerateSetParameterMessage("LegacySemVerPadded", "0.8.0-unstable568");
-            Assert.AreEqual("##myget[buildNumber '0.8.0-unstable568']", message[1]);
-        }
+    [Test]
+    public void BuildNumber()
+    {
+        var message = this.buildServer.GenerateSetParameterMessage("LegacySemVerPadded", "0.8.0-unstable568");
+        Assert.AreEqual("##myget[buildNumber '0.8.0-unstable568']", message[1]);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/BuildAgents/SpaceAutomationTests.cs b/src/GitVersion.Core.Tests/BuildAgents/SpaceAutomationTests.cs
index 4f041b5627..f313de13a8 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/SpaceAutomationTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/SpaceAutomationTests.cs
@@ -5,99 +5,98 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersionCore.Tests.BuildAgents
+namespace GitVersionCore.Tests.BuildAgents;
+
+[TestFixture]
+public class SpaceAutomationTests : TestBase
 {
-    [TestFixture]
-    public class SpaceAutomationTests : TestBase
+    private IEnvironment environment;
+    private SpaceAutomation buildServer;
+
+    [SetUp]
+    public void SetUp()
+    {
+        var sp = ConfigureServices(services => services.AddSingleton<SpaceAutomation>());
+        this.environment = sp.GetService<IEnvironment>();
+        this.buildServer = sp.GetService<SpaceAutomation>();
+        this.environment.SetEnvironmentVariable(SpaceAutomation.EnvironmentVariableName, "true");
+    }
+
+    [TearDown]
+    public void TearDown() => this.environment.SetEnvironmentVariable(SpaceAutomation.EnvironmentVariableName, null);
+
+    [Test]
+    public void CanApplyToCurrentContextShouldBeTrueWhenEnvironmentVariableIsSet()
+    {
+        // Act
+        var result = this.buildServer.CanApplyToCurrentContext();
+
+        // Assert
+        result.ShouldBeTrue();
+    }
+
+    [Test]
+    public void CanApplyToCurrentContextShouldBeFalseWhenEnvironmentVariableIsNotSet()
+    {
+        // Arrange
+        this.environment.SetEnvironmentVariable(SpaceAutomation.EnvironmentVariableName, "");
+
+        // Act
+        var result = this.buildServer.CanApplyToCurrentContext();
+
+        // Assert
+        result.ShouldBeFalse();
+    }
+
+    [Test]
+    public void GetCurrentBranchShouldHandleBranches()
+    {
+        // Arrange
+        this.environment.SetEnvironmentVariable("JB_SPACE_GIT_BRANCH", "refs/heads/master");
+
+        // Act
+        var result = this.buildServer.GetCurrentBranch(false);
+
+        // Assert
+        result.ShouldBe("refs/heads/master");
+    }
+
+    [Test]
+    public void GetCurrentBranchShouldHandleTags()
+    {
+        // Arrange
+        this.environment.SetEnvironmentVariable("JB_SPACE_GIT_BRANCH", "refs/tags/1.0.0");
+
+        // Act
+        var result = this.buildServer.GetCurrentBranch(false);
+
+        // Assert
+        result.ShouldBe("refs/tags/1.0.0");
+    }
+
+    [Test]
+    public void GetCurrentBranchShouldHandlePullRequests()
+    {
+        // Arrange
+        this.environment.SetEnvironmentVariable("JB_SPACE_GIT_BRANCH", "refs/pull/1/merge");
+
+        // Act
+        var result = this.buildServer.GetCurrentBranch(false);
+
+        // Assert
+        result.ShouldBe("refs/pull/1/merge");
+    }
+
+    [Test]
+    public void GetEmptyGenerateSetVersionMessage()
     {
-        private IEnvironment environment;
-        private SpaceAutomation buildServer;
-
-        [SetUp]
-        public void SetUp()
-        {
-            var sp = ConfigureServices(services => services.AddSingleton<SpaceAutomation>());
-            this.environment = sp.GetService<IEnvironment>();
-            this.buildServer = sp.GetService<SpaceAutomation>();
-            this.environment.SetEnvironmentVariable(SpaceAutomation.EnvironmentVariableName, "true");
-        }
-
-        [TearDown]
-        public void TearDown() => this.environment.SetEnvironmentVariable(SpaceAutomation.EnvironmentVariableName, null);
-
-        [Test]
-        public void CanApplyToCurrentContextShouldBeTrueWhenEnvironmentVariableIsSet()
-        {
-            // Act
-            var result = this.buildServer.CanApplyToCurrentContext();
-
-            // Assert
-            result.ShouldBeTrue();
-        }
-
-        [Test]
-        public void CanApplyToCurrentContextShouldBeFalseWhenEnvironmentVariableIsNotSet()
-        {
-            // Arrange
-            this.environment.SetEnvironmentVariable(SpaceAutomation.EnvironmentVariableName, "");
-
-            // Act
-            var result = this.buildServer.CanApplyToCurrentContext();
-
-            // Assert
-            result.ShouldBeFalse();
-        }
-
-        [Test]
-        public void GetCurrentBranchShouldHandleBranches()
-        {
-            // Arrange
-            this.environment.SetEnvironmentVariable("JB_SPACE_GIT_BRANCH", "refs/heads/master");
-
-            // Act
-            var result = this.buildServer.GetCurrentBranch(false);
-
-            // Assert
-            result.ShouldBe("refs/heads/master");
-        }
-
-        [Test]
-        public void GetCurrentBranchShouldHandleTags()
-        {
-            // Arrange
-            this.environment.SetEnvironmentVariable("JB_SPACE_GIT_BRANCH", "refs/tags/1.0.0");
-
-            // Act
-            var result = this.buildServer.GetCurrentBranch(false);
-
-            // Assert
-            result.ShouldBe("refs/tags/1.0.0");
-        }
-
-        [Test]
-        public void GetCurrentBranchShouldHandlePullRequests()
-        {
-            // Arrange
-            this.environment.SetEnvironmentVariable("JB_SPACE_GIT_BRANCH", "refs/pull/1/merge");
-
-            // Act
-            var result = this.buildServer.GetCurrentBranch(false);
-
-            // Assert
-            result.ShouldBe("refs/pull/1/merge");
-        }
-
-        [Test]
-        public void GetEmptyGenerateSetVersionMessage()
-        {
-            // Arrange
-            var vars = new TestableVersionVariables("1.0.0");
-
-            // Act
-            var message = this.buildServer.GenerateSetVersionMessage(vars);
-
-            // Assert
-            message.ShouldBeEmpty();
-        }
+        // Arrange
+        var vars = new TestableVersionVariables("1.0.0");
+
+        // Act
+        var message = this.buildServer.GenerateSetVersionMessage(vars);
+
+        // Assert
+        message.ShouldBeEmpty();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/BuildAgents/TeamCityTests.cs b/src/GitVersion.Core.Tests/BuildAgents/TeamCityTests.cs
index 42e7fffe83..7342d0ac5d 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/TeamCityTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/TeamCityTests.cs
@@ -3,34 +3,33 @@
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.BuildAgents
+namespace GitVersion.Core.Tests.BuildAgents;
+
+[TestFixture]
+public class TeamCityTests : TestBase
 {
-    [TestFixture]
-    public class TeamCityTests : TestBase
-    {
-        private TeamCity buildServer;
+    private TeamCity buildServer;
 
-        [SetUp]
-        public void SetUp()
-        {
-            var sp = ConfigureServices(services => services.AddSingleton<TeamCity>());
-            this.buildServer = sp.GetService<TeamCity>();
-        }
+    [SetUp]
+    public void SetUp()
+    {
+        var sp = ConfigureServices(services => services.AddSingleton<TeamCity>());
+        this.buildServer = sp.GetService<TeamCity>();
+    }
 
-        [Test]
-        public void DevelopBranch()
-        {
-            var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Unstable4");
-            var tcVersion = this.buildServer.GenerateSetVersionMessage(vars);
-            Assert.AreEqual("##teamcity[buildNumber '0.0.0-Unstable4']", tcVersion);
-        }
+    [Test]
+    public void DevelopBranch()
+    {
+        var vars = new TestableVersionVariables(fullSemVer: "0.0.0-Unstable4");
+        var tcVersion = this.buildServer.GenerateSetVersionMessage(vars);
+        Assert.AreEqual("##teamcity[buildNumber '0.0.0-Unstable4']", tcVersion);
+    }
 
-        [Test]
-        public void EscapeValues()
-        {
-            var tcVersion = this.buildServer.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
-            Assert.AreEqual("##teamcity[setParameter name='GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", tcVersion[0]);
-            Assert.AreEqual("##teamcity[setParameter name='system.GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", tcVersion[1]);
-        }
+    [Test]
+    public void EscapeValues()
+    {
+        var tcVersion = this.buildServer.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
+        Assert.AreEqual("##teamcity[setParameter name='GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", tcVersion[0]);
+        Assert.AreEqual("##teamcity[setParameter name='system.GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", tcVersion[1]);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.cs b/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.cs
index 60d3574a50..bdd0003786 100644
--- a/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.cs
+++ b/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.cs
@@ -16,172 +16,172 @@
 using Shouldly;
 using YamlDotNet.Serialization;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class ConfigProviderTests : TestBase
 {
-    [TestFixture]
-    public class ConfigProviderTests : TestBase
-    {
-        private const string DefaultRepoPath = @"c:\MyGitRepo";
+    private const string DefaultRepoPath = @"c:\MyGitRepo";
 
-        private string repoPath;
-        private IConfigProvider configProvider;
-        private IFileSystem fileSystem;
+    private string repoPath;
+    private IConfigProvider configProvider;
+    private IFileSystem fileSystem;
 
-        [SetUp]
-        public void Setup()
-        {
-            this.repoPath = DefaultRepoPath;
-            var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath });
-            var sp = ConfigureServices(services => services.AddSingleton(options));
-            this.configProvider = sp.GetService<IConfigProvider>();
-            this.fileSystem = sp.GetService<IFileSystem>();
+    [SetUp]
+    public void Setup()
+    {
+        this.repoPath = DefaultRepoPath;
+        var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath });
+        var sp = ConfigureServices(services => services.AddSingleton(options));
+        this.configProvider = sp.GetService<IConfigProvider>();
+        this.fileSystem = sp.GetService<IFileSystem>();
 
-            ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
-        }
+        ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
+    }
 
-        [Test]
-        public void OverwritesDefaultsWithProvidedConfig()
-        {
-            var defaultConfig = this.configProvider.Provide(this.repoPath);
-            const string text = @"
+    [Test]
+    public void OverwritesDefaultsWithProvidedConfig()
+    {
+        var defaultConfig = this.configProvider.Provide(this.repoPath);
+        const string text = @"
 next-version: 2.0.0
 branches:
     develop:
         mode: ContinuousDeployment
         tag: dev";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath);
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.NextVersion.ShouldBe("2.0.0");
-            config.Branches["develop"].Increment.ShouldBe(defaultConfig.Branches["develop"].Increment);
-            config.Branches["develop"].VersioningMode.ShouldBe(defaultConfig.Branches["develop"].VersioningMode);
-            config.Branches["develop"].Tag.ShouldBe("dev");
-        }
+        config.NextVersion.ShouldBe("2.0.0");
+        config.Branches["develop"].Increment.ShouldBe(defaultConfig.Branches["develop"].Increment);
+        config.Branches["develop"].VersioningMode.ShouldBe(defaultConfig.Branches["develop"].VersioningMode);
+        config.Branches["develop"].Tag.ShouldBe("dev");
+    }
 
-        [Test]
-        public void AllBranchesModeWhenUsingMainline()
-        {
-            const string text = @"mode: Mainline";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath);
-            var branches = config.Branches.Select(x => x.Value);
-            branches.All(branch => branch.VersioningMode == VersioningMode.Mainline).ShouldBe(true);
-        }
+    [Test]
+    public void AllBranchesModeWhenUsingMainline()
+    {
+        const string text = @"mode: Mainline";
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath);
+        var branches = config.Branches.Select(x => x.Value);
+        branches.All(branch => branch.VersioningMode == VersioningMode.Mainline).ShouldBe(true);
+    }
 
-        [Test]
-        public void CanRemoveTag()
-        {
-            const string text = @"
+    [Test]
+    public void CanRemoveTag()
+    {
+        const string text = @"
 next-version: 2.0.0
 branches:
     release:
         tag: """"";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath);
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.NextVersion.ShouldBe("2.0.0");
-            config.Branches["release"].Tag.ShouldBe(string.Empty);
-        }
+        config.NextVersion.ShouldBe("2.0.0");
+        config.Branches["release"].Tag.ShouldBe(string.Empty);
+    }
 
-        [Test]
-        public void RegexIsRequired()
-        {
-            const string text = @"
+    [Test]
+    public void RegexIsRequired()
+    {
+        const string text = @"
 next-version: 2.0.0
 branches:
     bug:
         tag: bugfix";
-            SetupConfigFileContent(text);
-            var ex = Should.Throw<ConfigurationException>(() => this.configProvider.Provide(this.repoPath));
-            ex.Message.ShouldBe($"Branch configuration 'bug' is missing required configuration 'regex'{System.Environment.NewLine}" +
-                                "See https://gitversion.net/docs/reference/configuration for more info");
-        }
+        SetupConfigFileContent(text);
+        var ex = Should.Throw<ConfigurationException>(() => this.configProvider.Provide(this.repoPath));
+        ex.Message.ShouldBe($"Branch configuration 'bug' is missing required configuration 'regex'{System.Environment.NewLine}" +
+                            "See https://gitversion.net/docs/reference/configuration for more info");
+    }
 
-        [Test]
-        public void SourceBranchIsRequired()
-        {
-            const string text = @"
+    [Test]
+    public void SourceBranchIsRequired()
+    {
+        const string text = @"
 next-version: 2.0.0
 branches:
     bug:
         regex: 'bug[/-]'
         tag: bugfix";
-            SetupConfigFileContent(text);
-            var ex = Should.Throw<ConfigurationException>(() => this.configProvider.Provide(this.repoPath));
-            ex.Message.ShouldBe($"Branch configuration 'bug' is missing required configuration 'source-branches'{System.Environment.NewLine}" +
-                                "See https://gitversion.net/docs/reference/configuration for more info");
-        }
+        SetupConfigFileContent(text);
+        var ex = Should.Throw<ConfigurationException>(() => this.configProvider.Provide(this.repoPath));
+        ex.Message.ShouldBe($"Branch configuration 'bug' is missing required configuration 'source-branches'{System.Environment.NewLine}" +
+                            "See https://gitversion.net/docs/reference/configuration for more info");
+    }
 
-        [Test(Description = "This test proves the configuration validation will fail early with a helpful message when a branch listed in source-branches has no configuration.")]
-        public void SourceBranchesValidationShouldFailWhenMatchingBranchConfigurationIsMissing()
-        {
-            const string text = @"
+    [Test(Description = "This test proves the configuration validation will fail early with a helpful message when a branch listed in source-branches has no configuration.")]
+    public void SourceBranchesValidationShouldFailWhenMatchingBranchConfigurationIsMissing()
+    {
+        const string text = @"
 branches:
     bug:
         regex: 'bug[/-]'
         tag: bugfix
         source-branches: [notconfigured]";
-            SetupConfigFileContent(text);
-            var ex = Should.Throw<ConfigurationException>(() => this.configProvider.Provide(this.repoPath));
-            ex.Message.ShouldBe($"Branch configuration 'bug' defines these 'source-branches' that are not configured: '[notconfigured]'{System.Environment.NewLine}" +
-                                "See https://gitversion.net/docs/reference/configuration for more info");
-        }
+        SetupConfigFileContent(text);
+        var ex = Should.Throw<ConfigurationException>(() => this.configProvider.Provide(this.repoPath));
+        ex.Message.ShouldBe($"Branch configuration 'bug' defines these 'source-branches' that are not configured: '[notconfigured]'{System.Environment.NewLine}" +
+                            "See https://gitversion.net/docs/reference/configuration for more info");
+    }
 
-        [Test(Description = "Well-known branches may not be present in the configuration file. This test confirms the validation check succeeds when the source-branches configuration contain these well-known branches.")]
-        [TestCase(Config.MainBranchKey)]
-        [TestCase(Config.DevelopBranchKey)]
-        public void SourceBranchesValidationShouldSucceedForWellKnownBranches(string wellKnownBranchKey)
-        {
-            var text = $@"
+    [Test(Description = "Well-known branches may not be present in the configuration file. This test confirms the validation check succeeds when the source-branches configuration contain these well-known branches.")]
+    [TestCase(Config.MainBranchKey)]
+    [TestCase(Config.DevelopBranchKey)]
+    public void SourceBranchesValidationShouldSucceedForWellKnownBranches(string wellKnownBranchKey)
+    {
+        var text = $@"
 branches:
     bug:
         regex: 'bug[/-]'
         tag: bugfix
         source-branches: [{wellKnownBranchKey}]";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath);
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.Branches["bug"].SourceBranches.ShouldBe(new List<string> { wellKnownBranchKey });
-        }
+        config.Branches["bug"].SourceBranches.ShouldBe(new List<string> { wellKnownBranchKey });
+    }
 
-        [Test]
-        public void CanProvideConfigForNewBranch()
-        {
-            const string text = @"
+    [Test]
+    public void CanProvideConfigForNewBranch()
+    {
+        const string text = @"
 next-version: 2.0.0
 branches:
     bug:
         regex: 'bug[/-]'
         tag: bugfix
         source-branches: []";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath);
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.Branches["bug"].Regex.ShouldBe("bug[/-]");
-            config.Branches["bug"].Tag.ShouldBe("bugfix");
-        }
+        config.Branches["bug"].Regex.ShouldBe("bug[/-]");
+        config.Branches["bug"].Tag.ShouldBe("bugfix");
+    }
 
-        [Test]
-        public void MasterConfigReplacedWithMain()
-        {
-            const string text = @"
+    [Test]
+    public void MasterConfigReplacedWithMain()
+    {
+        const string text = @"
 next-version: 2.0.0
 branches:
     master:
         regex: '^master$|^main$'
         tag: beta";
-            SetupConfigFileContent(text);
+        SetupConfigFileContent(text);
 
-            var config = this.configProvider.Provide(this.repoPath);
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.Branches[MainBranch].Regex.ShouldBe("^master$|^main$");
-            config.Branches[MainBranch].Tag.ShouldBe("beta");
-        }
+        config.Branches[MainBranch].Regex.ShouldBe("^master$|^main$");
+        config.Branches[MainBranch].Tag.ShouldBe("beta");
+    }
 
-        [Test]
-        public void MasterConfigReplacedWithMainInSourceBranches()
-        {
-            const string text = @"
+    [Test]
+    public void MasterConfigReplacedWithMainInSourceBranches()
+    {
+        const string text = @"
 next-version: 2.0.0
 branches:
     breaking:
@@ -190,323 +190,322 @@ public void MasterConfigReplacedWithMainInSourceBranches()
         increment: Major
         source-branches: ['master']
         is-release-branch: false";
-            SetupConfigFileContent(text);
+        SetupConfigFileContent(text);
 
-            var config = this.configProvider.Provide(this.repoPath);
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.Branches["breaking"].Regex.ShouldBe("breaking[/]");
-            config.Branches["breaking"].SourceBranches.ShouldHaveSingleItem();
-            config.Branches["breaking"].SourceBranches.ShouldContain(MainBranch);
-        }
+        config.Branches["breaking"].Regex.ShouldBe("breaking[/]");
+        config.Branches["breaking"].SourceBranches.ShouldHaveSingleItem();
+        config.Branches["breaking"].SourceBranches.ShouldContain(MainBranch);
+    }
 
-        [Test]
-        public void NextVersionCanBeInteger()
-        {
-            const string text = "next-version: 2";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath);
+    [Test]
+    public void NextVersionCanBeInteger()
+    {
+        const string text = "next-version: 2";
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.NextVersion.ShouldBe("2.0");
-        }
+        config.NextVersion.ShouldBe("2.0");
+    }
 
-        [Test]
-        public void NextVersionCanHaveEnormousMinorVersion()
-        {
-            const string text = "next-version: 2.118998723";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath);
+    [Test]
+    public void NextVersionCanHaveEnormousMinorVersion()
+    {
+        const string text = "next-version: 2.118998723";
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.NextVersion.ShouldBe("2.118998723");
-        }
+        config.NextVersion.ShouldBe("2.118998723");
+    }
 
-        [Test]
-        public void NextVersionCanHavePatch()
-        {
-            const string text = "next-version: 2.12.654651698";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath);
+    [Test]
+    public void NextVersionCanHavePatch()
+    {
+        const string text = "next-version: 2.12.654651698";
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.NextVersion.ShouldBe("2.12.654651698");
-        }
+        config.NextVersion.ShouldBe("2.12.654651698");
+    }
 
-        [Test]
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void CanWriteOutEffectiveConfiguration()
-        {
-            var config = this.configProvider.Provide(this.repoPath);
+    [Test]
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void CanWriteOutEffectiveConfiguration()
+    {
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.ToString().ShouldMatchApproved();
-        }
+        config.ToString().ShouldMatchApproved();
+    }
 
-        [Test]
-        public void CanUpdateAssemblyInformationalVersioningScheme()
-        {
-            const string text = @"
+    [Test]
+    public void CanUpdateAssemblyInformationalVersioningScheme()
+    {
+        const string text = @"
 assembly-versioning-scheme: MajorMinor
 assembly-file-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{NugetVersion}'";
 
-            SetupConfigFileContent(text);
+        SetupConfigFileContent(text);
 
-            var config = this.configProvider.Provide(this.repoPath);
-            config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinor);
-            config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
-            config.AssemblyInformationalFormat.ShouldBe("{NugetVersion}");
-        }
+        var config = this.configProvider.Provide(this.repoPath);
+        config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinor);
+        config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
+        config.AssemblyInformationalFormat.ShouldBe("{NugetVersion}");
+    }
 
-        [Test]
-        public void CanUpdateAssemblyInformationalVersioningSchemeWithMultipleVariables()
-        {
-            const string text = @"
+    [Test]
+    public void CanUpdateAssemblyInformationalVersioningSchemeWithMultipleVariables()
+    {
+        const string text = @"
 assembly-versioning-scheme: MajorMinor
 assembly-file-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{Major}.{Minor}.{Patch}'";
 
-            SetupConfigFileContent(text);
+        SetupConfigFileContent(text);
 
-            var config = this.configProvider.Provide(this.repoPath);
-            config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinor);
-            config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
-            config.AssemblyInformationalFormat.ShouldBe("{Major}.{Minor}.{Patch}");
-        }
+        var config = this.configProvider.Provide(this.repoPath);
+        config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinor);
+        config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
+        config.AssemblyInformationalFormat.ShouldBe("{Major}.{Minor}.{Patch}");
+    }
 
 
-        [Test]
-        public void CanUpdateAssemblyInformationalVersioningSchemeWithFullSemVer()
-        {
-            const string text = @"assembly-versioning-scheme: MajorMinorPatch
+    [Test]
+    public void CanUpdateAssemblyInformationalVersioningSchemeWithFullSemVer()
+    {
+        const string text = @"assembly-versioning-scheme: MajorMinorPatch
 assembly-file-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{FullSemVer}'
 mode: ContinuousDelivery
 next-version: 5.3.0
 branches: {}";
 
-            SetupConfigFileContent(text);
+        SetupConfigFileContent(text);
 
-            var config = this.configProvider.Provide(this.repoPath);
-            config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
-            config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
-            config.AssemblyInformationalFormat.ShouldBe("{FullSemVer}");
-        }
+        var config = this.configProvider.Provide(this.repoPath);
+        config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
+        config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
+        config.AssemblyInformationalFormat.ShouldBe("{FullSemVer}");
+    }
 
-        [Test]
-        public void CanReadDefaultDocument()
-        {
-            const string text = "";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath);
-            config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
-            config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
-            config.AssemblyInformationalFormat.ShouldBe(null);
-            config.Branches["develop"].Tag.ShouldBe("alpha");
-            config.Branches["release"].Tag.ShouldBe("beta");
-            config.TagPrefix.ShouldBe(Config.DefaultTagPrefix);
-            config.NextVersion.ShouldBe(null);
-        }
+    [Test]
+    public void CanReadDefaultDocument()
+    {
+        const string text = "";
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath);
+        config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
+        config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
+        config.AssemblyInformationalFormat.ShouldBe(null);
+        config.Branches["develop"].Tag.ShouldBe("alpha");
+        config.Branches["release"].Tag.ShouldBe("beta");
+        config.TagPrefix.ShouldBe(Config.DefaultTagPrefix);
+        config.NextVersion.ShouldBe(null);
+    }
 
-        [Test]
-        public void VerifyAliases()
-        {
-            var config = typeof(Config);
-            var propertiesMissingAlias = config.GetProperties()
-                .Where(p => p.GetCustomAttribute<ObsoleteAttribute>() == null)
-                .Where(p => p.GetCustomAttribute(typeof(YamlMemberAttribute)) == null)
-                .Select(p => p.Name);
+    [Test]
+    public void VerifyAliases()
+    {
+        var config = typeof(Config);
+        var propertiesMissingAlias = config.GetProperties()
+            .Where(p => p.GetCustomAttribute<ObsoleteAttribute>() == null)
+            .Where(p => p.GetCustomAttribute(typeof(YamlMemberAttribute)) == null)
+            .Select(p => p.Name);
 
-            propertiesMissingAlias.ShouldBeEmpty();
-        }
+        propertiesMissingAlias.ShouldBeEmpty();
+    }
 
-        [Test]
-        public void NoWarnOnGitVersionYmlFile()
-        {
-            SetupConfigFileContent(string.Empty);
+    [Test]
+    public void NoWarnOnGitVersionYmlFile()
+    {
+        SetupConfigFileContent(string.Empty);
 
-            var stringLogger = string.Empty;
-            void Action(string info) => stringLogger = info;
+        var stringLogger = string.Empty;
+        void Action(string info) => stringLogger = info;
 
-            var logAppender = new TestLogAppender(Action);
-            var log = new Log(logAppender);
+        var logAppender = new TestLogAppender(Action);
+        var log = new Log(logAppender);
 
-            var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath });
-            var sp = ConfigureServices(services =>
-            {
-                services.AddSingleton(options);
-                services.AddSingleton<ILog>(log);
-            });
-            this.configProvider = sp.GetService<IConfigProvider>();
+        var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath });
+        var sp = ConfigureServices(services =>
+        {
+            services.AddSingleton(options);
+            services.AddSingleton<ILog>(log);
+        });
+        this.configProvider = sp.GetService<IConfigProvider>();
 
-            this.configProvider.Provide(this.repoPath);
+        this.configProvider.Provide(this.repoPath);
 
-            stringLogger.Length.ShouldBe(0);
-        }
+        stringLogger.Length.ShouldBe(0);
+    }
 
-        private string SetupConfigFileContent(string text, string fileName = ConfigFileLocator.DefaultFileName) => SetupConfigFileContent(text, fileName, this.repoPath);
+    private string SetupConfigFileContent(string text, string fileName = ConfigFileLocator.DefaultFileName) => SetupConfigFileContent(text, fileName, this.repoPath);
 
-        private string SetupConfigFileContent(string text, string fileName, string path)
-        {
-            var fullPath = Path.Combine(path, fileName);
-            this.fileSystem.WriteAllText(fullPath, text);
+    private string SetupConfigFileContent(string text, string fileName, string path)
+    {
+        var fullPath = Path.Combine(path, fileName);
+        this.fileSystem.WriteAllText(fullPath, text);
 
-            return fullPath;
-        }
+        return fullPath;
+    }
 
-        [Test]
-        public void ShouldUseSpecifiedSourceBranchesForDevelop()
-        {
-            const string text = @"
+    [Test]
+    public void ShouldUseSpecifiedSourceBranchesForDevelop()
+    {
+        const string text = @"
 next-version: 2.0.0
 branches:
     develop:
         mode: ContinuousDeployment
         source-branches: ['develop']
         tag: dev";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath);
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.Branches["develop"].SourceBranches.ShouldBe(new List<string> { "develop" });
-        }
+        config.Branches["develop"].SourceBranches.ShouldBe(new List<string> { "develop" });
+    }
 
-        [Test]
-        public void ShouldUseDefaultSourceBranchesWhenNotSpecifiedForDevelop()
-        {
-            const string text = @"
+    [Test]
+    public void ShouldUseDefaultSourceBranchesWhenNotSpecifiedForDevelop()
+    {
+        const string text = @"
 next-version: 2.0.0
 branches:
     develop:
         mode: ContinuousDeployment
         tag: dev";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath);
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.Branches["develop"].SourceBranches.ShouldBe(new List<string>());
-        }
+        config.Branches["develop"].SourceBranches.ShouldBe(new List<string>());
+    }
 
-        [Test]
-        public void ShouldUseSpecifiedSourceBranchesForFeature()
-        {
-            const string text = @"
+    [Test]
+    public void ShouldUseSpecifiedSourceBranchesForFeature()
+    {
+        const string text = @"
 next-version: 2.0.0
 branches:
     feature:
         mode: ContinuousDeployment
         source-branches: ['develop', 'release']
         tag: dev";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath);
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.Branches["feature"].SourceBranches.ShouldBe(new List<string> { "develop", "release" });
-        }
+        config.Branches["feature"].SourceBranches.ShouldBe(new List<string> { "develop", "release" });
+    }
 
-        [Test]
-        public void ShouldUseDefaultSourceBranchesWhenNotSpecifiedForFeature()
-        {
-            const string text = @"
+    [Test]
+    public void ShouldUseDefaultSourceBranchesWhenNotSpecifiedForFeature()
+    {
+        const string text = @"
 next-version: 2.0.0
 branches:
     feature:
         mode: ContinuousDeployment
         tag: dev";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath);
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.Branches["feature"].SourceBranches.ShouldBe(
-                new List<string> { "develop", MainBranch, "release", "feature", "support", "hotfix" });
-        }
+        config.Branches["feature"].SourceBranches.ShouldBe(
+            new List<string> { "develop", MainBranch, "release", "feature", "support", "hotfix" });
+    }
 
-        [Test]
-        public void ShouldNotOverrideAnythingWhenOverrideConfigIsEmpty()
-        {
-            const string text = @"
+    [Test]
+    public void ShouldNotOverrideAnythingWhenOverrideConfigIsEmpty()
+    {
+        const string text = @"
 next-version: 1.2.3
 tag-prefix: custom-tag-prefix-from-yml";
-            SetupConfigFileContent(text);
-
-            var expectedConfig = this.configProvider.Provide(this.repoPath, overrideConfig: null);
-            var overridenConfig = this.configProvider.Provide(this.repoPath, overrideConfig: new Config());
-
-            overridenConfig.AssemblyVersioningScheme.ShouldBe(expectedConfig.AssemblyVersioningScheme);
-            overridenConfig.AssemblyFileVersioningScheme.ShouldBe(expectedConfig.AssemblyFileVersioningScheme);
-            overridenConfig.AssemblyInformationalFormat.ShouldBe(expectedConfig.AssemblyInformationalFormat);
-            overridenConfig.AssemblyVersioningFormat.ShouldBe(expectedConfig.AssemblyVersioningFormat);
-            overridenConfig.AssemblyFileVersioningFormat.ShouldBe(expectedConfig.AssemblyFileVersioningFormat);
-            overridenConfig.VersioningMode.ShouldBe(expectedConfig.VersioningMode);
-            overridenConfig.TagPrefix.ShouldBe(expectedConfig.TagPrefix);
-            overridenConfig.ContinuousDeploymentFallbackTag.ShouldBe(expectedConfig.ContinuousDeploymentFallbackTag);
-            overridenConfig.NextVersion.ShouldBe(expectedConfig.NextVersion);
-            overridenConfig.MajorVersionBumpMessage.ShouldBe(expectedConfig.MajorVersionBumpMessage);
-            overridenConfig.MinorVersionBumpMessage.ShouldBe(expectedConfig.MinorVersionBumpMessage);
-            overridenConfig.PatchVersionBumpMessage.ShouldBe(expectedConfig.PatchVersionBumpMessage);
-            overridenConfig.NoBumpMessage.ShouldBe(expectedConfig.NoBumpMessage);
-            overridenConfig.LegacySemVerPadding.ShouldBe(expectedConfig.LegacySemVerPadding);
-            overridenConfig.BuildMetaDataPadding.ShouldBe(expectedConfig.BuildMetaDataPadding);
-            overridenConfig.CommitsSinceVersionSourcePadding.ShouldBe(expectedConfig.CommitsSinceVersionSourcePadding);
-            overridenConfig.TagPreReleaseWeight.ShouldBe(expectedConfig.TagPreReleaseWeight);
-            overridenConfig.CommitMessageIncrementing.ShouldBe(expectedConfig.CommitMessageIncrementing);
-            overridenConfig.Increment.ShouldBe(expectedConfig.Increment);
-            overridenConfig.CommitDateFormat.ShouldBe(expectedConfig.CommitDateFormat);
-            overridenConfig.MergeMessageFormats.ShouldBe(expectedConfig.MergeMessageFormats);
-            overridenConfig.UpdateBuildNumber.ShouldBe(expectedConfig.UpdateBuildNumber);
-
-            overridenConfig.Ignore.ShouldBeEquivalentTo(expectedConfig.Ignore);
-
-            overridenConfig.Branches.Keys.ShouldBe(expectedConfig.Branches.Keys);
-
-            foreach (var branch in overridenConfig.Branches.Keys)
-            {
-                overridenConfig.Branches[branch].ShouldBeEquivalentTo(expectedConfig.Branches[branch]);
-            }
+        SetupConfigFileContent(text);
+
+        var expectedConfig = this.configProvider.Provide(this.repoPath, overrideConfig: null);
+        var overridenConfig = this.configProvider.Provide(this.repoPath, overrideConfig: new Config());
+
+        overridenConfig.AssemblyVersioningScheme.ShouldBe(expectedConfig.AssemblyVersioningScheme);
+        overridenConfig.AssemblyFileVersioningScheme.ShouldBe(expectedConfig.AssemblyFileVersioningScheme);
+        overridenConfig.AssemblyInformationalFormat.ShouldBe(expectedConfig.AssemblyInformationalFormat);
+        overridenConfig.AssemblyVersioningFormat.ShouldBe(expectedConfig.AssemblyVersioningFormat);
+        overridenConfig.AssemblyFileVersioningFormat.ShouldBe(expectedConfig.AssemblyFileVersioningFormat);
+        overridenConfig.VersioningMode.ShouldBe(expectedConfig.VersioningMode);
+        overridenConfig.TagPrefix.ShouldBe(expectedConfig.TagPrefix);
+        overridenConfig.ContinuousDeploymentFallbackTag.ShouldBe(expectedConfig.ContinuousDeploymentFallbackTag);
+        overridenConfig.NextVersion.ShouldBe(expectedConfig.NextVersion);
+        overridenConfig.MajorVersionBumpMessage.ShouldBe(expectedConfig.MajorVersionBumpMessage);
+        overridenConfig.MinorVersionBumpMessage.ShouldBe(expectedConfig.MinorVersionBumpMessage);
+        overridenConfig.PatchVersionBumpMessage.ShouldBe(expectedConfig.PatchVersionBumpMessage);
+        overridenConfig.NoBumpMessage.ShouldBe(expectedConfig.NoBumpMessage);
+        overridenConfig.LegacySemVerPadding.ShouldBe(expectedConfig.LegacySemVerPadding);
+        overridenConfig.BuildMetaDataPadding.ShouldBe(expectedConfig.BuildMetaDataPadding);
+        overridenConfig.CommitsSinceVersionSourcePadding.ShouldBe(expectedConfig.CommitsSinceVersionSourcePadding);
+        overridenConfig.TagPreReleaseWeight.ShouldBe(expectedConfig.TagPreReleaseWeight);
+        overridenConfig.CommitMessageIncrementing.ShouldBe(expectedConfig.CommitMessageIncrementing);
+        overridenConfig.Increment.ShouldBe(expectedConfig.Increment);
+        overridenConfig.CommitDateFormat.ShouldBe(expectedConfig.CommitDateFormat);
+        overridenConfig.MergeMessageFormats.ShouldBe(expectedConfig.MergeMessageFormats);
+        overridenConfig.UpdateBuildNumber.ShouldBe(expectedConfig.UpdateBuildNumber);
+
+        overridenConfig.Ignore.ShouldBeEquivalentTo(expectedConfig.Ignore);
+
+        overridenConfig.Branches.Keys.ShouldBe(expectedConfig.Branches.Keys);
+
+        foreach (var branch in overridenConfig.Branches.Keys)
+        {
+            overridenConfig.Branches[branch].ShouldBeEquivalentTo(expectedConfig.Branches[branch]);
         }
+    }
 
-        [Test]
-        public void ShouldUseDefaultTagPrefixWhenNotSetInConfigFile()
-        {
-            const string text = "";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath);
+    [Test]
+    public void ShouldUseDefaultTagPrefixWhenNotSetInConfigFile()
+    {
+        const string text = "";
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.TagPrefix.ShouldBe("[vV]");
-        }
+        config.TagPrefix.ShouldBe("[vV]");
+    }
 
-        [Test]
-        public void ShouldUseTagPrefixFromConfigFileWhenProvided()
-        {
-            const string text = "tag-prefix: custom-tag-prefix-from-yml";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath);
+    [Test]
+    public void ShouldUseTagPrefixFromConfigFileWhenProvided()
+    {
+        const string text = "tag-prefix: custom-tag-prefix-from-yml";
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath);
 
-            config.TagPrefix.ShouldBe("custom-tag-prefix-from-yml");
-        }
+        config.TagPrefix.ShouldBe("custom-tag-prefix-from-yml");
+    }
 
-        [Test]
-        public void ShouldOverrideTagPrefixWithOverrideConfigValue([Values] bool tagPrefixSetAtYmlFile)
-        {
-            var text = tagPrefixSetAtYmlFile ? "tag-prefix: custom-tag-prefix-from-yml" : "";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath, overrideConfig: new Config { TagPrefix = "tag-prefix-from-override-config" });
+    [Test]
+    public void ShouldOverrideTagPrefixWithOverrideConfigValue([Values] bool tagPrefixSetAtYmlFile)
+    {
+        var text = tagPrefixSetAtYmlFile ? "tag-prefix: custom-tag-prefix-from-yml" : "";
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath, overrideConfig: new Config { TagPrefix = "tag-prefix-from-override-config" });
 
-            config.TagPrefix.ShouldBe("tag-prefix-from-override-config");
-        }
+        config.TagPrefix.ShouldBe("tag-prefix-from-override-config");
+    }
 
-        [Test]
-        public void ShouldNotOverrideDefaultTagPrefixWhenNotSetInOverrideConfig()
-        {
-            const string text = "";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath, overrideConfig: new Config { TagPrefix = null });
+    [Test]
+    public void ShouldNotOverrideDefaultTagPrefixWhenNotSetInOverrideConfig()
+    {
+        const string text = "";
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath, overrideConfig: new Config { TagPrefix = null });
 
-            config.TagPrefix.ShouldBe("[vV]");
-        }
+        config.TagPrefix.ShouldBe("[vV]");
+    }
 
-        [Test]
-        public void ShouldNotOverrideTagPrefixFromConfigFileWhenNotSetInOverrideConfig()
-        {
-            const string text = "tag-prefix: custom-tag-prefix-from-yml";
-            SetupConfigFileContent(text);
-            var config = this.configProvider.Provide(this.repoPath, overrideConfig: new Config { TagPrefix = null });
+    [Test]
+    public void ShouldNotOverrideTagPrefixFromConfigFileWhenNotSetInOverrideConfig()
+    {
+        const string text = "tag-prefix: custom-tag-prefix-from-yml";
+        SetupConfigFileContent(text);
+        var config = this.configProvider.Provide(this.repoPath, overrideConfig: new Config { TagPrefix = null });
 
-            config.TagPrefix.ShouldBe("custom-tag-prefix-from-yml");
-        }
+        config.TagPrefix.ShouldBe("custom-tag-prefix-from-yml");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Configuration/DefaultConfigFileLocatorTests.cs b/src/GitVersion.Core.Tests/Configuration/DefaultConfigFileLocatorTests.cs
index 31eb29278a..70f2aa39e0 100644
--- a/src/GitVersion.Core.Tests/Configuration/DefaultConfigFileLocatorTests.cs
+++ b/src/GitVersion.Core.Tests/Configuration/DefaultConfigFileLocatorTests.cs
@@ -9,222 +9,221 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class ConfigFileLocatorTests
 {
-    [TestFixture]
-    public class ConfigFileLocatorTests
+    public class DefaultConfigFileLocatorTests : TestBase
     {
-        public class DefaultConfigFileLocatorTests : TestBase
-        {
-            private const string DefaultRepoPath = @"c:\MyGitRepo";
-            private const string DefaultWorkingPath = @"c:\MyGitRepo\Working";
+        private const string DefaultRepoPath = @"c:\MyGitRepo";
+        private const string DefaultWorkingPath = @"c:\MyGitRepo\Working";
 
-            private string repoPath;
-            private string workingPath;
-            private IFileSystem fileSystem;
-            private IConfigProvider configurationProvider;
-            private IConfigFileLocator configFileLocator;
+        private string repoPath;
+        private string workingPath;
+        private IFileSystem fileSystem;
+        private IConfigProvider configurationProvider;
+        private IConfigFileLocator configFileLocator;
 
-            [SetUp]
-            public void Setup()
-            {
-                this.repoPath = DefaultRepoPath;
-                this.workingPath = DefaultWorkingPath;
-                var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath });
+        [SetUp]
+        public void Setup()
+        {
+            this.repoPath = DefaultRepoPath;
+            this.workingPath = DefaultWorkingPath;
+            var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath });
 
-                var sp = ConfigureServices(services => services.AddSingleton(options));
+            var sp = ConfigureServices(services => services.AddSingleton(options));
 
-                this.fileSystem = sp.GetService<IFileSystem>();
-                this.configurationProvider = sp.GetService<IConfigProvider>();
-                this.configFileLocator = sp.GetService<IConfigFileLocator>();
+            this.fileSystem = sp.GetService<IFileSystem>();
+            this.configurationProvider = sp.GetService<IConfigProvider>();
+            this.configFileLocator = sp.GetService<IConfigFileLocator>();
 
-                ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
-            }
+            ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
+        }
 
-            [TestCase(ConfigFileLocator.DefaultFileName, ConfigFileLocator.DefaultFileName)]
-            public void ThrowsExceptionOnAmbiguousConfigFileLocation(string repoConfigFile, string workingConfigFile)
-            {
-                var repositoryConfigFilePath = SetupConfigFileContent(string.Empty, repoConfigFile, this.repoPath);
-                var workingDirectoryConfigFilePath = SetupConfigFileContent(string.Empty, workingConfigFile, this.workingPath);
+        [TestCase(ConfigFileLocator.DefaultFileName, ConfigFileLocator.DefaultFileName)]
+        public void ThrowsExceptionOnAmbiguousConfigFileLocation(string repoConfigFile, string workingConfigFile)
+        {
+            var repositoryConfigFilePath = SetupConfigFileContent(string.Empty, repoConfigFile, this.repoPath);
+            var workingDirectoryConfigFilePath = SetupConfigFileContent(string.Empty, workingConfigFile, this.workingPath);
 
-                var exception = Should.Throw<WarningException>(() => this.configFileLocator.Verify(this.workingPath, this.repoPath));
+            var exception = Should.Throw<WarningException>(() => this.configFileLocator.Verify(this.workingPath, this.repoPath));
 
-                var expecedMessage = $"Ambiguous config file selection from '{workingDirectoryConfigFilePath}' and '{repositoryConfigFilePath}'";
-                exception.Message.ShouldBe(expecedMessage);
-            }
+            var expecedMessage = $"Ambiguous config file selection from '{workingDirectoryConfigFilePath}' and '{repositoryConfigFilePath}'";
+            exception.Message.ShouldBe(expecedMessage);
+        }
 
-            [Test]
-            public void NoWarnOnGitVersionYmlFile()
-            {
-                SetupConfigFileContent(string.Empty, ConfigFileLocator.DefaultFileName, this.repoPath);
+        [Test]
+        public void NoWarnOnGitVersionYmlFile()
+        {
+            SetupConfigFileContent(string.Empty, ConfigFileLocator.DefaultFileName, this.repoPath);
 
-                Should.NotThrow(() => this.configurationProvider.Provide(this.repoPath));
-            }
+            Should.NotThrow(() => this.configurationProvider.Provide(this.repoPath));
+        }
 
-            [Test]
-            public void NoWarnOnNoGitVersionYmlFile() => Should.NotThrow(() => this.configurationProvider.Provide(this.repoPath));
+        [Test]
+        public void NoWarnOnNoGitVersionYmlFile() => Should.NotThrow(() => this.configurationProvider.Provide(this.repoPath));
 
-            private string SetupConfigFileContent(string text, string fileName, string path)
-            {
-                var fullPath = Path.Combine(path, fileName);
-                this.fileSystem.WriteAllText(fullPath, text);
+        private string SetupConfigFileContent(string text, string fileName, string path)
+        {
+            var fullPath = Path.Combine(path, fileName);
+            this.fileSystem.WriteAllText(fullPath, text);
 
-                return fullPath;
-            }
+            return fullPath;
         }
+    }
 
-        public class NamedConfigFileLocatorTests : TestBase
-        {
-            private const string DefaultRepoPath = @"c:\MyGitRepo";
-            private const string DefaultWorkingPath = @"c:\MyGitRepo\Working";
+    public class NamedConfigFileLocatorTests : TestBase
+    {
+        private const string DefaultRepoPath = @"c:\MyGitRepo";
+        private const string DefaultWorkingPath = @"c:\MyGitRepo\Working";
 
-            private string repoPath;
-            private string workingPath;
-            private IFileSystem fileSystem;
-            private IConfigFileLocator configFileLocator;
-            private GitVersionOptions gitVersionOptions;
+        private string repoPath;
+        private string workingPath;
+        private IFileSystem fileSystem;
+        private IConfigFileLocator configFileLocator;
+        private GitVersionOptions gitVersionOptions;
 
-            [SetUp]
-            public void Setup()
-            {
-                this.gitVersionOptions = new GitVersionOptions { ConfigInfo = { ConfigFile = "my-config.yaml" } };
-                this.repoPath = DefaultRepoPath;
-                this.workingPath = DefaultWorkingPath;
+        [SetUp]
+        public void Setup()
+        {
+            this.gitVersionOptions = new GitVersionOptions { ConfigInfo = { ConfigFile = "my-config.yaml" } };
+            this.repoPath = DefaultRepoPath;
+            this.workingPath = DefaultWorkingPath;
 
-                ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
-            }
+            ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
+        }
 
-            [Test]
-            public void ThrowsExceptionOnAmbiguousConfigFileLocation()
-            {
-                var sp = GetServiceProvider(this.gitVersionOptions);
-                this.configFileLocator = sp.GetService<IConfigFileLocator>();
-                this.fileSystem = sp.GetService<IFileSystem>();
+        [Test]
+        public void ThrowsExceptionOnAmbiguousConfigFileLocation()
+        {
+            var sp = GetServiceProvider(this.gitVersionOptions);
+            this.configFileLocator = sp.GetService<IConfigFileLocator>();
+            this.fileSystem = sp.GetService<IFileSystem>();
+
+            var repositoryConfigFilePath = SetupConfigFileContent(string.Empty, path: this.repoPath);
+            var workingDirectoryConfigFilePath = SetupConfigFileContent(string.Empty, path: this.workingPath);
 
-                var repositoryConfigFilePath = SetupConfigFileContent(string.Empty, path: this.repoPath);
-                var workingDirectoryConfigFilePath = SetupConfigFileContent(string.Empty, path: this.workingPath);
+            var exception = Should.Throw<WarningException>(() => this.configFileLocator.Verify(this.workingPath, this.repoPath));
 
-                var exception = Should.Throw<WarningException>(() => this.configFileLocator.Verify(this.workingPath, this.repoPath));
+            var expectedMessage = $"Ambiguous config file selection from '{workingDirectoryConfigFilePath}' and '{repositoryConfigFilePath}'";
+            exception.Message.ShouldBe(expectedMessage);
+        }
 
-                var expectedMessage = $"Ambiguous config file selection from '{workingDirectoryConfigFilePath}' and '{repositoryConfigFilePath}'";
-                exception.Message.ShouldBe(expectedMessage);
-            }
+        [Test]
+        public void DoNotThrowWhenWorkingAndRepoPathsAreSame()
+        {
+            this.workingPath = DefaultRepoPath;
 
-            [Test]
-            public void DoNotThrowWhenWorkingAndRepoPathsAreSame()
-            {
-                this.workingPath = DefaultRepoPath;
+            var sp = GetServiceProvider(this.gitVersionOptions);
+            this.configFileLocator = sp.GetService<IConfigFileLocator>();
+            this.fileSystem = sp.GetService<IFileSystem>();
 
-                var sp = GetServiceProvider(this.gitVersionOptions);
-                this.configFileLocator = sp.GetService<IConfigFileLocator>();
-                this.fileSystem = sp.GetService<IFileSystem>();
+            SetupConfigFileContent(string.Empty, path: this.workingPath);
 
-                SetupConfigFileContent(string.Empty, path: this.workingPath);
+            Should.NotThrow(() => this.configFileLocator.Verify(this.workingPath, this.repoPath));
+        }
 
-                Should.NotThrow(() => this.configFileLocator.Verify(this.workingPath, this.repoPath));
-            }
+        [Test]
+        public void DoNotThrowWhenWorkingAndRepoPathsAreSame_WithDifferentCasing()
+        {
+            this.workingPath = DefaultRepoPath.ToLower();
 
-            [Test]
-            public void DoNotThrowWhenWorkingAndRepoPathsAreSame_WithDifferentCasing()
-            {
-                this.workingPath = DefaultRepoPath.ToLower();
+            var sp = GetServiceProvider(this.gitVersionOptions);
+            this.configFileLocator = sp.GetService<IConfigFileLocator>();
+            this.fileSystem = sp.GetService<IFileSystem>();
 
-                var sp = GetServiceProvider(this.gitVersionOptions);
-                this.configFileLocator = sp.GetService<IConfigFileLocator>();
-                this.fileSystem = sp.GetService<IFileSystem>();
+            SetupConfigFileContent(string.Empty, path: this.workingPath);
 
-                SetupConfigFileContent(string.Empty, path: this.workingPath);
+            Should.NotThrow(() => this.configFileLocator.Verify(this.workingPath, this.repoPath));
+        }
 
-                Should.NotThrow(() => this.configFileLocator.Verify(this.workingPath, this.repoPath));
-            }
+        [Test]
+        public void DoNotThrowWhenConfigFileIsInSubDirectoryOfRepoPath()
+        {
+            this.workingPath = DefaultRepoPath;
 
-            [Test]
-            public void DoNotThrowWhenConfigFileIsInSubDirectoryOfRepoPath()
-            {
-                this.workingPath = DefaultRepoPath;
+            this.gitVersionOptions = new GitVersionOptions { ConfigInfo = { ConfigFile = "./src/my-config.yaml" } };
+            var sp = GetServiceProvider(this.gitVersionOptions);
+            this.configFileLocator = sp.GetService<IConfigFileLocator>();
+            this.fileSystem = sp.GetService<IFileSystem>();
 
-                this.gitVersionOptions = new GitVersionOptions { ConfigInfo = { ConfigFile = "./src/my-config.yaml" } };
-                var sp = GetServiceProvider(this.gitVersionOptions);
-                this.configFileLocator = sp.GetService<IConfigFileLocator>();
-                this.fileSystem = sp.GetService<IFileSystem>();
+            SetupConfigFileContent(string.Empty, path: this.workingPath);
 
-                SetupConfigFileContent(string.Empty, path: this.workingPath);
+            Should.NotThrow(() => this.configFileLocator.Verify(this.workingPath, this.repoPath));
+        }
 
-                Should.NotThrow(() => this.configFileLocator.Verify(this.workingPath, this.repoPath));
-            }
+        [Test]
+        public void NoWarnOnCustomYmlFile()
+        {
+            var stringLogger = string.Empty;
+            void Action(string info) => stringLogger = info;
 
-            [Test]
-            public void NoWarnOnCustomYmlFile()
-            {
-                var stringLogger = string.Empty;
-                void Action(string info) => stringLogger = info;
+            var logAppender = new TestLogAppender(Action);
+            var log = new Log(logAppender);
 
-                var logAppender = new TestLogAppender(Action);
-                var log = new Log(logAppender);
+            var sp = GetServiceProvider(this.gitVersionOptions, log);
+            this.configFileLocator = sp.GetService<IConfigFileLocator>();
+            this.fileSystem = sp.GetService<IFileSystem>();
 
-                var sp = GetServiceProvider(this.gitVersionOptions, log);
-                this.configFileLocator = sp.GetService<IConfigFileLocator>();
-                this.fileSystem = sp.GetService<IFileSystem>();
+            SetupConfigFileContent(string.Empty);
 
-                SetupConfigFileContent(string.Empty);
+            var configurationProvider = sp.GetService<IConfigProvider>();
 
-                var configurationProvider = sp.GetService<IConfigProvider>();
+            configurationProvider.Provide(this.repoPath);
+            stringLogger.Length.ShouldBe(0);
+        }
 
-                configurationProvider.Provide(this.repoPath);
-                stringLogger.Length.ShouldBe(0);
-            }
+        [Test]
+        public void NoWarnOnCustomYmlFileOutsideRepoPath()
+        {
+            var stringLogger = string.Empty;
+            void Action(string info) => stringLogger = info;
 
-            [Test]
-            public void NoWarnOnCustomYmlFileOutsideRepoPath()
-            {
-                var stringLogger = string.Empty;
-                void Action(string info) => stringLogger = info;
+            var logAppender = new TestLogAppender(Action);
+            var log = new Log(logAppender);
 
-                var logAppender = new TestLogAppender(Action);
-                var log = new Log(logAppender);
+            var sp = GetServiceProvider(this.gitVersionOptions, log);
+            this.configFileLocator = sp.GetService<IConfigFileLocator>();
+            this.fileSystem = sp.GetService<IFileSystem>();
 
-                var sp = GetServiceProvider(this.gitVersionOptions, log);
-                this.configFileLocator = sp.GetService<IConfigFileLocator>();
-                this.fileSystem = sp.GetService<IFileSystem>();
+            SetupConfigFileContent(string.Empty, path: @"c:\\Unrelated\\path");
 
-                SetupConfigFileContent(string.Empty, path: @"c:\\Unrelated\\path");
+            var configurationProvider = sp.GetService<IConfigProvider>();
 
-                var configurationProvider = sp.GetService<IConfigProvider>();
+            configurationProvider.Provide(this.repoPath);
+            stringLogger.Length.ShouldBe(0);
+        }
 
-                configurationProvider.Provide(this.repoPath);
-                stringLogger.Length.ShouldBe(0);
-            }
+        [Test]
+        public void ThrowsExceptionOnCustomYmlFileDoesNotExist()
+        {
+            var sp = GetServiceProvider(this.gitVersionOptions);
+            this.configFileLocator = sp.GetService<IConfigFileLocator>();
 
-            [Test]
-            public void ThrowsExceptionOnCustomYmlFileDoesNotExist()
-            {
-                var sp = GetServiceProvider(this.gitVersionOptions);
-                this.configFileLocator = sp.GetService<IConfigFileLocator>();
+            var exception = Should.Throw<WarningException>(() => this.configFileLocator.Verify(this.workingPath, this.repoPath));
 
-                var exception = Should.Throw<WarningException>(() => this.configFileLocator.Verify(this.workingPath, this.repoPath));
+            var workingPathFileConfig = Path.Combine(this.workingPath, this.gitVersionOptions.ConfigInfo.ConfigFile);
+            var repoPathFileConfig = Path.Combine(this.repoPath, this.gitVersionOptions.ConfigInfo.ConfigFile);
+            var expectedMessage = $"The configuration file was not found at '{workingPathFileConfig}' or '{repoPathFileConfig}'";
+            exception.Message.ShouldBe(expectedMessage);
+        }
 
-                var workingPathFileConfig = Path.Combine(this.workingPath, this.gitVersionOptions.ConfigInfo.ConfigFile);
-                var repoPathFileConfig = Path.Combine(this.repoPath, this.gitVersionOptions.ConfigInfo.ConfigFile);
-                var expectedMessage = $"The configuration file was not found at '{workingPathFileConfig}' or '{repoPathFileConfig}'";
-                exception.Message.ShouldBe(expectedMessage);
-            }
+        private string SetupConfigFileContent(string text, string fileName = null, string path = null)
+        {
+            if (fileName.IsNullOrEmpty()) fileName = this.configFileLocator.FilePath;
+            var filePath = fileName;
+            if (!path.IsNullOrEmpty())
+                filePath = Path.Combine(path, filePath);
+            this.fileSystem.WriteAllText(filePath, text);
+            return filePath;
+        }
 
-            private string SetupConfigFileContent(string text, string fileName = null, string path = null)
+        private static IServiceProvider GetServiceProvider(GitVersionOptions gitVersionOptions, ILog log = null) =>
+            ConfigureServices(services =>
             {
-                if (fileName.IsNullOrEmpty()) fileName = this.configFileLocator.FilePath;
-                var filePath = fileName;
-                if (!path.IsNullOrEmpty())
-                    filePath = Path.Combine(path, filePath);
-                this.fileSystem.WriteAllText(filePath, text);
-                return filePath;
-            }
-
-            private static IServiceProvider GetServiceProvider(GitVersionOptions gitVersionOptions, ILog log = null) =>
-                ConfigureServices(services =>
-                {
-                    if (log != null) services.AddSingleton(log);
-                    services.AddSingleton(Options.Create(gitVersionOptions));
-                });
-        }
+                if (log != null) services.AddSingleton(log);
+                services.AddSingleton(Options.Create(gitVersionOptions));
+            });
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Configuration/IgnoreConfigTests.cs b/src/GitVersion.Core.Tests/Configuration/IgnoreConfigTests.cs
index 88258c9c03..c0c801fe7c 100644
--- a/src/GitVersion.Core.Tests/Configuration/IgnoreConfigTests.cs
+++ b/src/GitVersion.Core.Tests/Configuration/IgnoreConfigTests.cs
@@ -7,81 +7,79 @@
 using Shouldly;
 using YamlDotNet.Core;
 
-namespace GitVersion.Core.Tests.Configuration
-{
+namespace GitVersion.Core.Tests.Configuration;
 
-    [TestFixture]
-    public class IgnoreConfigTests : TestBase
+[TestFixture]
+public class IgnoreConfigTests : TestBase
+{
+    [Test]
+    public void CanDeserialize()
     {
-        [Test]
-        public void CanDeserialize()
-        {
-            var yaml = @"
+        var yaml = @"
 ignore:
     sha: [b6c0c9fda88830ebcd563e500a5a7da5a1658e98]
     commits-before: 2015-10-23T12:23:15
 ";
 
-            using var reader = new StringReader(yaml);
-            var config = ConfigSerializer.Read(reader);
+        using var reader = new StringReader(yaml);
+        var config = ConfigSerializer.Read(reader);
 
-            config.Ignore.ShouldNotBeNull();
-            config.Ignore.ShAs.ShouldNotBeEmpty();
-            config.Ignore.ShAs.ShouldBe(new[] { "b6c0c9fda88830ebcd563e500a5a7da5a1658e98" });
-            config.Ignore.Before.ShouldBe(DateTimeOffset.Parse("2015-10-23T12:23:15"));
-        }
+        config.Ignore.ShouldNotBeNull();
+        config.Ignore.ShAs.ShouldNotBeEmpty();
+        config.Ignore.ShAs.ShouldBe(new[] { "b6c0c9fda88830ebcd563e500a5a7da5a1658e98" });
+        config.Ignore.Before.ShouldBe(DateTimeOffset.Parse("2015-10-23T12:23:15"));
+    }
 
-        [Test]
-        public void ShouldSupportsOtherSequenceFormat()
-        {
-            var yaml = @"
+    [Test]
+    public void ShouldSupportsOtherSequenceFormat()
+    {
+        var yaml = @"
 ignore:
     sha:
         - b6c0c9fda88830ebcd563e500a5a7da5a1658e98
         - 6c19c7c219ecf8dbc468042baefa73a1b213e8b1
 ";
 
-            using var reader = new StringReader(yaml);
-            var config = ConfigSerializer.Read(reader);
+        using var reader = new StringReader(yaml);
+        var config = ConfigSerializer.Read(reader);
 
-            config.Ignore.ShouldNotBeNull();
-            config.Ignore.ShAs.ShouldNotBeEmpty();
-            config.Ignore.ShAs.ShouldBe(new[] { "b6c0c9fda88830ebcd563e500a5a7da5a1658e98", "6c19c7c219ecf8dbc468042baefa73a1b213e8b1" });
-        }
+        config.Ignore.ShouldNotBeNull();
+        config.Ignore.ShAs.ShouldNotBeEmpty();
+        config.Ignore.ShAs.ShouldBe(new[] { "b6c0c9fda88830ebcd563e500a5a7da5a1658e98", "6c19c7c219ecf8dbc468042baefa73a1b213e8b1" });
+    }
 
-        [Test]
-        public void WhenNotInConfigShouldHaveDefaults()
-        {
-            var yaml = @"
+    [Test]
+    public void WhenNotInConfigShouldHaveDefaults()
+    {
+        var yaml = @"
 next-version: 1.0
 ";
 
-            using var reader = new StringReader(yaml);
-            var config = ConfigSerializer.Read(reader);
+        using var reader = new StringReader(yaml);
+        var config = ConfigSerializer.Read(reader);
 
-            config.Ignore.ShouldNotBeNull();
-            config.Ignore.ShAs.ShouldBeEmpty();
-            config.Ignore.Before.ShouldBe(null);
-        }
+        config.Ignore.ShouldNotBeNull();
+        config.Ignore.ShAs.ShouldBeEmpty();
+        config.Ignore.Before.ShouldBe(null);
+    }
 
-        [Test]
-        public void WhenBadDateFormatShouldFail()
-        {
-            var yaml = @"
+    [Test]
+    public void WhenBadDateFormatShouldFail()
+    {
+        var yaml = @"
 ignore:
     commits-before: bad format date
 ";
 
-            using var reader = new StringReader(yaml);
-            Should.Throw<YamlException>(() => ConfigSerializer.Read(reader));
-        }
+        using var reader = new StringReader(yaml);
+        Should.Throw<YamlException>(() => ConfigSerializer.Read(reader));
+    }
 
-        [Test]
-        public void NewInstanceShouldBeEmpty()
-        {
-            var ignoreConfig = new IgnoreConfig();
+    [Test]
+    public void NewInstanceShouldBeEmpty()
+    {
+        var ignoreConfig = new IgnoreConfig();
 
-            ignoreConfig.IsEmpty.ShouldBeTrue();
-        }
+        ignoreConfig.IsEmpty.ShouldBeTrue();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Configuration/Init/InitScenarios.cs b/src/GitVersion.Core.Tests/Configuration/Init/InitScenarios.cs
index a60ce34483..0fca03c272 100644
--- a/src/GitVersion.Core.Tests/Configuration/Init/InitScenarios.cs
+++ b/src/GitVersion.Core.Tests/Configuration/Init/InitScenarios.cs
@@ -8,33 +8,32 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.Init
+namespace GitVersion.Core.Tests.Init;
+
+[TestFixture]
+public class InitScenarios : TestBase
 {
-    [TestFixture]
-    public class InitScenarios : TestBase
+    [SetUp]
+    public void Setup() => ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
+
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void CanSetNextVersion()
     {
-        [SetUp]
-        public void Setup() => ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
+        var workingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "c:\\proj" : "/proj";
+        var options = Options.Create(new GitVersionOptions { WorkingDirectory = workingDirectory });
 
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void CanSetNextVersion()
+        var sp = ConfigureServices(services =>
         {
-            var workingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "c:\\proj" : "/proj";
-            var options = Options.Create(new GitVersionOptions { WorkingDirectory = workingDirectory });
-
-            var sp = ConfigureServices(services =>
-            {
-                services.AddSingleton<IConsole>(new TestConsole("3", "2.0.0", "0"));
-                services.AddSingleton(options);
-            });
+            services.AddSingleton<IConsole>(new TestConsole("3", "2.0.0", "0"));
+            services.AddSingleton(options);
+        });
 
-            var configurationProvider = sp.GetService<IConfigProvider>();
-            var fileSystem = sp.GetService<IFileSystem>();
-            configurationProvider.Init(workingDirectory);
+        var configurationProvider = sp.GetService<IConfigProvider>();
+        var fileSystem = sp.GetService<IFileSystem>();
+        configurationProvider.Init(workingDirectory);
 
-            fileSystem.ReadAllText(Path.Combine(workingDirectory, "GitVersion.yml")).ShouldMatchApproved();
-        }
+        fileSystem.ReadAllText(Path.Combine(workingDirectory, "GitVersion.yml")).ShouldMatchApproved();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs b/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs
index f572afe661..9a97e97d5a 100644
--- a/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs
+++ b/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs
@@ -4,88 +4,87 @@
 using Microsoft.Extensions.Options;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class DynamicRepositoryTests : TestBase
 {
-    [TestFixture]
-    public class DynamicRepositoryTests : TestBase
-    {
-        private string workDirectory;
+    private string workDirectory;
 
-        private static void ClearReadOnly(DirectoryInfo parentDirectory)
+    private static void ClearReadOnly(DirectoryInfo parentDirectory)
+    {
+        if (parentDirectory == null) return;
+        parentDirectory.Attributes = FileAttributes.Normal;
+        foreach (var fi in parentDirectory.GetFiles())
         {
-            if (parentDirectory == null) return;
-            parentDirectory.Attributes = FileAttributes.Normal;
-            foreach (var fi in parentDirectory.GetFiles())
-            {
-                fi.Attributes = FileAttributes.Normal;
-            }
-            foreach (var di in parentDirectory.GetDirectories())
-            {
-                ClearReadOnly(di);
-            }
+            fi.Attributes = FileAttributes.Normal;
         }
-
-        [OneTimeSetUp]
-        public void CreateTemporaryRepository()
+        foreach (var di in parentDirectory.GetDirectories())
         {
-            // Note: we can't use guid because paths will be too long
-            this.workDirectory = Path.Combine(Path.GetTempPath(), "GV");
+            ClearReadOnly(di);
+        }
+    }
 
-            // Clean directory upfront, some build agents are having troubles
-            if (Directory.Exists(this.workDirectory))
-            {
-                var di = new DirectoryInfo(this.workDirectory);
-                ClearReadOnly(di);
+    [OneTimeSetUp]
+    public void CreateTemporaryRepository()
+    {
+        // Note: we can't use guid because paths will be too long
+        this.workDirectory = Path.Combine(Path.GetTempPath(), "GV");
 
-                Directory.Delete(this.workDirectory, true);
-            }
+        // Clean directory upfront, some build agents are having troubles
+        if (Directory.Exists(this.workDirectory))
+        {
+            var di = new DirectoryInfo(this.workDirectory);
+            ClearReadOnly(di);
 
-            Directory.CreateDirectory(this.workDirectory);
+            Directory.Delete(this.workDirectory, true);
         }
 
+        Directory.CreateDirectory(this.workDirectory);
+    }
 
-        [OneTimeTearDown]
-        public void Cleanup()
-        {
 
-        }
+    [OneTimeTearDown]
+    public void Cleanup()
+    {
 
-        // Note: use same name twice to see if changing commits works on same (cached) repository
-        [NonParallelizable]
-        [TestCase("GV_main", "https://github.com/GitTools/GitVersion", MainBranch, "4783d325521463cd6cf1b61074352da84451f25d", "4.0.0+1086")]
-        [TestCase("GV_main", "https://github.com/GitTools/GitVersion", MainBranch, "3bdcd899530b4e9b37d13639f317da04a749e728", "4.0.0+1092")]
-        public void FindsVersionInDynamicRepo(string name, string url, string targetBranch, string commitId, string expectedFullSemVer)
+    }
+
+    // Note: use same name twice to see if changing commits works on same (cached) repository
+    [NonParallelizable]
+    [TestCase("GV_main", "https://github.com/GitTools/GitVersion", MainBranch, "4783d325521463cd6cf1b61074352da84451f25d", "4.0.0+1086")]
+    [TestCase("GV_main", "https://github.com/GitTools/GitVersion", MainBranch, "3bdcd899530b4e9b37d13639f317da04a749e728", "4.0.0+1092")]
+    public void FindsVersionInDynamicRepo(string name, string url, string targetBranch, string commitId, string expectedFullSemVer)
+    {
+        var root = Path.Combine(this.workDirectory, name);
+        var dynamicDirectory = Path.Combine(root, "D"); // dynamic, keeping directory as short as possible
+        var workingDirectory = Path.Combine(root, "W"); // working, keeping directory as short as possible
+        var gitVersionOptions = new GitVersionOptions
         {
-            var root = Path.Combine(this.workDirectory, name);
-            var dynamicDirectory = Path.Combine(root, "D"); // dynamic, keeping directory as short as possible
-            var workingDirectory = Path.Combine(root, "W"); // working, keeping directory as short as possible
-            var gitVersionOptions = new GitVersionOptions
+            RepositoryInfo =
             {
-                RepositoryInfo =
-                {
-                    TargetUrl = url,
-                    DynamicRepositoryClonePath = dynamicDirectory,
-                    TargetBranch = targetBranch,
-                    CommitId = commitId,
-                },
-                Settings = { NoFetch = false },
-                WorkingDirectory = workingDirectory,
-            };
-            var options = Options.Create(gitVersionOptions);
+                TargetUrl = url,
+                DynamicRepositoryClonePath = dynamicDirectory,
+                TargetBranch = targetBranch,
+                CommitId = commitId,
+            },
+            Settings = { NoFetch = false },
+            WorkingDirectory = workingDirectory,
+        };
+        var options = Options.Create(gitVersionOptions);
 
-            Directory.CreateDirectory(dynamicDirectory);
-            Directory.CreateDirectory(workingDirectory);
+        Directory.CreateDirectory(dynamicDirectory);
+        Directory.CreateDirectory(workingDirectory);
 
-            var sp = ConfigureServices(services => services.AddSingleton(options));
+        var sp = ConfigureServices(services => services.AddSingleton(options));
 
-            var gitPreparer = sp.GetService<IGitPreparer>();
-            gitPreparer?.Prepare();
+        var gitPreparer = sp.GetService<IGitPreparer>();
+        gitPreparer?.Prepare();
 
-            var gitVersionCalculator = sp.GetService<IGitVersionCalculateTool>();
+        var gitVersionCalculator = sp.GetService<IGitVersionCalculateTool>();
 
-            var versionVariables = gitVersionCalculator?.CalculateVersionVariables();
+        var versionVariables = gitVersionCalculator?.CalculateVersionVariables();
 
-            Assert.AreEqual(expectedFullSemVer, versionVariables?.FullSemVer);
-        }
+        Assert.AreEqual(expectedFullSemVer, versionVariables?.FullSemVer);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs b/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs
index 82176a570a..4207c4b58b 100644
--- a/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs
+++ b/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs
@@ -15,105 +15,105 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+[Parallelizable(ParallelScope.None)]
+public class GitVersionExecutorTests : TestBase
 {
-    [TestFixture]
-    [Parallelizable(ParallelScope.None)]
-    public class GitVersionExecutorTests : TestBase
+    private IFileSystem fileSystem;
+    private ILog log;
+    private IGitVersionCache gitVersionCache;
+    private IServiceProvider sp;
+
+    [Test]
+    public void CacheKeySameAfterReNormalizing()
     {
-        private IFileSystem fileSystem;
-        private ILog log;
-        private IGitVersionCache gitVersionCache;
-        private IServiceProvider sp;
+        using var fixture = new EmptyRepositoryFixture();
+        var targetUrl = "https://github.com/GitTools/GitVersion.git";
+        var targetBranch = $"refs/head/{MainBranch}";
 
-        [Test]
-        public void CacheKeySameAfterReNormalizing()
+        var gitVersionOptions = new GitVersionOptions
         {
-            using var fixture = new EmptyRepositoryFixture();
-            var targetUrl = "https://github.com/GitTools/GitVersion.git";
-            var targetBranch = $"refs/head/{MainBranch}";
+            RepositoryInfo = { TargetUrl = targetUrl, TargetBranch = targetBranch },
+            WorkingDirectory = fixture.RepositoryPath,
+            Settings = { NoNormalize = false }
+        };
 
-            var gitVersionOptions = new GitVersionOptions
-            {
-                RepositoryInfo = { TargetUrl = targetUrl, TargetBranch = targetBranch },
-                WorkingDirectory = fixture.RepositoryPath,
-                Settings = { NoNormalize = false }
-            };
+        var environment = new TestEnvironment();
+        environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, "true");
 
-            var environment = new TestEnvironment();
-            environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, "true");
+        this.sp = GetServiceProvider(gitVersionOptions, environment: environment);
 
-            this.sp = GetServiceProvider(gitVersionOptions, environment: environment);
+        var preparer = this.sp.GetService<IGitPreparer>();
 
-            var preparer = this.sp.GetService<IGitPreparer>();
+        preparer.Prepare();
+        var cacheKeyFactory = this.sp.GetService<IGitVersionCacheKeyFactory>();
+        var cacheKey1 = cacheKeyFactory.Create(null);
+        preparer.Prepare();
 
-            preparer.Prepare();
-            var cacheKeyFactory = this.sp.GetService<IGitVersionCacheKeyFactory>();
-            var cacheKey1 = cacheKeyFactory.Create(null);
-            preparer.Prepare();
+        var cacheKey2 = cacheKeyFactory.Create(null);
 
-            var cacheKey2 = cacheKeyFactory.Create(null);
+        cacheKey2.Value.ShouldBe(cacheKey1.Value);
+    }
 
-            cacheKey2.Value.ShouldBe(cacheKey1.Value);
-        }
+    [Test]
+    public void GitPreparerShouldNotFailWhenTargetPathNotInitialized()
+    {
+        var targetUrl = "https://github.com/GitTools/GitVersion.git";
 
-        [Test]
-        public void GitPreparerShouldNotFailWhenTargetPathNotInitialized()
+        var gitVersionOptions = new GitVersionOptions
+        {
+            RepositoryInfo = { TargetUrl = targetUrl },
+            WorkingDirectory = null
+        };
+        Should.NotThrow(() =>
         {
+            this.sp = GetServiceProvider(gitVersionOptions);
+
+            this.sp.GetService<IGitPreparer>();
+        });
+    }
+
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void CacheKeyForWorktree()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        var worktreePath = Path.Combine(Directory.GetParent(fixture.RepositoryPath).FullName, Guid.NewGuid().ToString());
+        try
+        {
+            // create a branch and a new worktree for it
+            var repo = new Repository(fixture.RepositoryPath);
+            repo.Worktrees.Add("worktree", worktreePath, false);
+
             var targetUrl = "https://github.com/GitTools/GitVersion.git";
 
             var gitVersionOptions = new GitVersionOptions
             {
-                RepositoryInfo = { TargetUrl = targetUrl },
-                WorkingDirectory = null
+                RepositoryInfo = { TargetUrl = targetUrl, TargetBranch = MainBranch },
+                WorkingDirectory = worktreePath
             };
-            Should.NotThrow(() =>
-            {
-                this.sp = GetServiceProvider(gitVersionOptions);
 
-                this.sp.GetService<IGitPreparer>();
-            });
-        }
+            this.sp = GetServiceProvider(gitVersionOptions);
 
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void CacheKeyForWorktree()
+            var preparer = this.sp.GetService<IGitPreparer>();
+            preparer.Prepare();
+            var cacheKey = this.sp.GetService<IGitVersionCacheKeyFactory>().Create(null);
+            cacheKey.Value.ShouldNotBeEmpty();
+        }
+        finally
         {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            var worktreePath = Path.Combine(Directory.GetParent(fixture.RepositoryPath).FullName, Guid.NewGuid().ToString());
-            try
-            {
-                // create a branch and a new worktree for it
-                var repo = new Repository(fixture.RepositoryPath);
-                repo.Worktrees.Add("worktree", worktreePath, false);
-
-                var targetUrl = "https://github.com/GitTools/GitVersion.git";
-
-                var gitVersionOptions = new GitVersionOptions
-                {
-                    RepositoryInfo = { TargetUrl = targetUrl, TargetBranch = MainBranch },
-                    WorkingDirectory = worktreePath
-                };
-
-                this.sp = GetServiceProvider(gitVersionOptions);
-
-                var preparer = this.sp.GetService<IGitPreparer>();
-                preparer.Prepare();
-                var cacheKey = this.sp.GetService<IGitVersionCacheKeyFactory>().Create(null);
-                cacheKey.Value.ShouldNotBeEmpty();
-            }
-            finally
-            {
-                DirectoryHelper.DeleteDirectory(worktreePath);
-            }
+            DirectoryHelper.DeleteDirectory(worktreePath);
         }
+    }
 
-        [Test]
-        public void CacheFileExistsOnDisk()
-        {
-            const string versionCacheFileContent = @"
+    [Test]
+    public void CacheFileExistsOnDisk()
+    {
+        const string versionCacheFileContent = @"
         Major: 4
         Minor: 10
         Patch: 3
@@ -149,35 +149,35 @@ public void CacheFileExistsOnDisk()
         UncommittedChanges: 0
         ";
 
-            var stringBuilder = new StringBuilder();
-            void Action(string s) => stringBuilder.AppendLine(s);
+        var stringBuilder = new StringBuilder();
+        void Action(string s) => stringBuilder.AppendLine(s);
 
-            var logAppender = new TestLogAppender(Action);
-            this.log = new Log(logAppender);
+        var logAppender = new TestLogAppender(Action);
+        this.log = new Log(logAppender);
 
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
 
-            var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
+        var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
 
-            var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, this.log);
+        var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, this.log);
 
-            var versionVariables = gitVersionCalculator.CalculateVersionVariables();
-            versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
+        var versionVariables = gitVersionCalculator.CalculateVersionVariables();
+        versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
 
-            this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
-            versionVariables = gitVersionCalculator.CalculateVersionVariables();
-            versionVariables.AssemblySemVer.ShouldBe("4.10.3.0");
+        this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
+        versionVariables = gitVersionCalculator.CalculateVersionVariables();
+        versionVariables.AssemblySemVer.ShouldBe("4.10.3.0");
 
-            var logsMessages = stringBuilder.ToString();
+        var logsMessages = stringBuilder.ToString();
 
-            logsMessages.ShouldContain("Deserializing version variables from cache file", Case.Insensitive, logsMessages);
-        }
+        logsMessages.ShouldContain("Deserializing version variables from cache file", Case.Insensitive, logsMessages);
+    }
 
-        [Test]
-        public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDynamicallyCalculatedWithoutSavingInCache()
-        {
-            const string versionCacheFileContent = @"
+    [Test]
+    public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDynamicallyCalculatedWithoutSavingInCache()
+    {
+        const string versionCacheFileContent = @"
         Major: 4
         Minor: 10
         Patch: 3
@@ -211,59 +211,59 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
         UncommittedChanges: 0
         ";
 
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
 
-            var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
-            var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, this.log);
+        var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
+        var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, this.log);
 
-            var versionVariables = gitVersionCalculator.CalculateVersionVariables();
-            versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
+        var versionVariables = gitVersionCalculator.CalculateVersionVariables();
+        versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
 
-            this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
+        this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
 
-            var cacheDirectory = this.gitVersionCache.GetCacheDirectory();
+        var cacheDirectory = this.gitVersionCache.GetCacheDirectory();
 
-            var cacheDirectoryTimestamp = this.fileSystem.GetLastDirectoryWrite(cacheDirectory);
+        var cacheDirectoryTimestamp = this.fileSystem.GetLastDirectoryWrite(cacheDirectory);
 
-            var config = new ConfigurationBuilder().Add(new Config { TagPrefix = "prefix" }).Build();
-            gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath, ConfigInfo = { OverrideConfig = config } };
+        var config = new ConfigurationBuilder().Add(new Config { TagPrefix = "prefix" }).Build();
+        gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath, ConfigInfo = { OverrideConfig = config } };
 
-            gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
-            versionVariables = gitVersionCalculator.CalculateVersionVariables();
+        gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
+        versionVariables = gitVersionCalculator.CalculateVersionVariables();
 
-            versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
+        versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
 
-            var cachedDirectoryTimestampAfter = this.fileSystem.GetLastDirectoryWrite(cacheDirectory);
-            cachedDirectoryTimestampAfter.ShouldBe(cacheDirectoryTimestamp, "Cache was updated when override config was set");
-        }
+        var cachedDirectoryTimestampAfter = this.fileSystem.GetLastDirectoryWrite(cacheDirectory);
+        cachedDirectoryTimestampAfter.ShouldBe(cacheDirectoryTimestamp, "Cache was updated when override config was set");
+    }
 
-        [Test]
-        public void CacheFileIsMissing()
-        {
-            var stringBuilder = new StringBuilder();
-            void Action(string s) => stringBuilder.AppendLine(s);
+    [Test]
+    public void CacheFileIsMissing()
+    {
+        var stringBuilder = new StringBuilder();
+        void Action(string s) => stringBuilder.AppendLine(s);
 
-            var logAppender = new TestLogAppender(Action);
-            this.log = new Log(logAppender);
+        var logAppender = new TestLogAppender(Action);
+        this.log = new Log(logAppender);
 
-            using var fixture = new EmptyRepositoryFixture();
+        using var fixture = new EmptyRepositoryFixture();
 
-            var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
+        var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
 
-            fixture.Repository.MakeACommit();
-            var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, this.log, fixture.Repository.ToGitRepository());
+        fixture.Repository.MakeACommit();
+        var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, this.log, fixture.Repository.ToGitRepository());
 
-            gitVersionCalculator.CalculateVersionVariables();
+        gitVersionCalculator.CalculateVersionVariables();
 
-            var logsMessages = stringBuilder.ToString();
-            logsMessages.ShouldContain("yml not found", Case.Insensitive, logsMessages);
-        }
+        var logsMessages = stringBuilder.ToString();
+        logsMessages.ShouldContain("yml not found", Case.Insensitive, logsMessages);
+    }
 
-        [Test]
-        public void ConfigChangeInvalidatesCache()
-        {
-            const string versionCacheFileContent = @"
+    [Test]
+    public void ConfigChangeInvalidatesCache()
+    {
+        const string versionCacheFileContent = @"
         Major: 4
         Minor: 10
         Patch: 3
@@ -299,36 +299,36 @@ public void ConfigChangeInvalidatesCache()
         UncommittedChanges: 0
         ";
 
-            using var fixture = new EmptyRepositoryFixture();
+        using var fixture = new EmptyRepositoryFixture();
 
-            var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
+        var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
 
-            fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
 
-            var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
-            var versionVariables = gitVersionCalculator.CalculateVersionVariables();
+        var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
+        var versionVariables = gitVersionCalculator.CalculateVersionVariables();
 
-            versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
-            versionVariables.FileName.ShouldNotBeNullOrEmpty();
+        versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
+        versionVariables.FileName.ShouldNotBeNullOrEmpty();
 
-            this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
+        this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
 
-            versionVariables = gitVersionCalculator.CalculateVersionVariables();
-            versionVariables.AssemblySemVer.ShouldBe("4.10.3.0");
+        versionVariables = gitVersionCalculator.CalculateVersionVariables();
+        versionVariables.AssemblySemVer.ShouldBe("4.10.3.0");
 
-            var configPath = Path.Combine(fixture.RepositoryPath, ConfigFileLocator.DefaultFileName);
-            this.fileSystem.WriteAllText(configPath, "next-version: 5.0");
+        var configPath = Path.Combine(fixture.RepositoryPath, ConfigFileLocator.DefaultFileName);
+        this.fileSystem.WriteAllText(configPath, "next-version: 5.0");
 
-            gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, fs: this.fileSystem);
+        gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, fs: this.fileSystem);
 
-            versionVariables = gitVersionCalculator.CalculateVersionVariables();
-            versionVariables.AssemblySemVer.ShouldBe("5.0.0.0");
-        }
+        versionVariables = gitVersionCalculator.CalculateVersionVariables();
+        versionVariables.AssemblySemVer.ShouldBe("5.0.0.0");
+    }
 
-        [Test]
-        public void NoCacheBypassesCache()
-        {
-            const string versionCacheFileContent = @"
+    [Test]
+    public void NoCacheBypassesCache()
+    {
+        const string versionCacheFileContent = @"
         Major: 4
         Minor: 10
         Patch: 3
@@ -364,115 +364,142 @@ public void NoCacheBypassesCache()
         UncommittedChanges: 0
         ";
 
-            using var fixture = new EmptyRepositoryFixture();
-
-            var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
+        using var fixture = new EmptyRepositoryFixture();
 
-            fixture.Repository.MakeACommit();
-            var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
+        var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
 
-            var versionVariables = gitVersionCalculator.CalculateVersionVariables();
+        fixture.Repository.MakeACommit();
+        var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
 
-            versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
-            versionVariables.FileName.ShouldNotBeNullOrEmpty();
+        var versionVariables = gitVersionCalculator.CalculateVersionVariables();
 
-            this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
-            versionVariables = gitVersionCalculator.CalculateVersionVariables();
-            versionVariables.AssemblySemVer.ShouldBe("4.10.3.0");
+        versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
+        versionVariables.FileName.ShouldNotBeNullOrEmpty();
 
-            gitVersionOptions.Settings.NoCache = true;
-            versionVariables = gitVersionCalculator.CalculateVersionVariables();
-            versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
-        }
+        this.fileSystem.WriteAllText(versionVariables.FileName, versionCacheFileContent);
+        versionVariables = gitVersionCalculator.CalculateVersionVariables();
+        versionVariables.AssemblySemVer.ShouldBe("4.10.3.0");
 
-        [Test]
-        public void WorkingDirectoryWithoutGit()
-        {
-            var gitVersionOptions = new GitVersionOptions { WorkingDirectory = System.Environment.SystemDirectory };
+        gitVersionOptions.Settings.NoCache = true;
+        versionVariables = gitVersionCalculator.CalculateVersionVariables();
+        versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
+    }
 
-            var exception = Assert.Throws<DirectoryNotFoundException>(() =>
-            {
-                var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
-                gitVersionCalculator.CalculateVersionVariables();
-            });
-            exception.Message.ShouldContain("Cannot find the .git directory");
-        }
+    [Test]
+    public void WorkingDirectoryWithoutGit()
+    {
+        var gitVersionOptions = new GitVersionOptions { WorkingDirectory = System.Environment.SystemDirectory };
 
-        [Test]
-        public void WorkingDirectoryWithoutCommits()
+        var exception = Assert.Throws<DirectoryNotFoundException>(() =>
         {
-            using var fixture = new EmptyRepositoryFixture();
+            var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
+            gitVersionCalculator.CalculateVersionVariables();
+        });
+        exception.Message.ShouldContain("Cannot find the .git directory");
+    }
 
-            var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
+    [Test]
+    public void WorkingDirectoryWithoutCommits()
+    {
+        using var fixture = new EmptyRepositoryFixture();
 
-            var exception = Assert.Throws<GitVersionException>(() =>
-            {
-                var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
-                gitVersionCalculator.CalculateVersionVariables();
-            });
-            exception.Message.ShouldContain("No commits found on the current branch.");
-        }
+        var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
 
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void GetProjectRootDirectoryWorkingDirectoryWithWorktree()
+        var exception = Assert.Throws<GitVersionException>(() =>
         {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
+            var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions);
+            gitVersionCalculator.CalculateVersionVariables();
+        });
+        exception.Message.ShouldContain("No commits found on the current branch.");
+    }
 
-            var worktreePath = Path.Combine(Directory.GetParent(fixture.RepositoryPath).FullName, Guid.NewGuid().ToString());
-            try
-            {
-                // create a branch and a new worktree for it
-                var repo = new Repository(fixture.RepositoryPath);
-                repo.Worktrees.Add("worktree", worktreePath, false);
-
-                var targetUrl = "https://github.com/GitTools/GitVersion.git";
-
-                var gitVersionOptions = new GitVersionOptions
-                {
-                    RepositoryInfo = { TargetUrl = targetUrl },
-                    WorkingDirectory = worktreePath
-                };
-
-                this.sp = GetServiceProvider(gitVersionOptions);
-                var repositoryInfo = this.sp.GetService<IGitRepositoryInfo>();
-                repositoryInfo?.ProjectRootDirectory.TrimEnd('/', '\\').ShouldBe(worktreePath);
-            }
-            finally
-            {
-                DirectoryHelper.DeleteDirectory(worktreePath);
-            }
-        }
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void GetProjectRootDirectoryWorkingDirectoryWithWorktree()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
 
-        [Test]
-        public void GetProjectRootDirectoryNoWorktree()
+        var worktreePath = Path.Combine(Directory.GetParent(fixture.RepositoryPath).FullName, Guid.NewGuid().ToString());
+        try
         {
-            using var fixture = new EmptyRepositoryFixture();
+            // create a branch and a new worktree for it
+            var repo = new Repository(fixture.RepositoryPath);
+            repo.Worktrees.Add("worktree", worktreePath, false);
+
             var targetUrl = "https://github.com/GitTools/GitVersion.git";
 
             var gitVersionOptions = new GitVersionOptions
             {
                 RepositoryInfo = { TargetUrl = targetUrl },
-                WorkingDirectory = fixture.RepositoryPath
+                WorkingDirectory = worktreePath
             };
 
             this.sp = GetServiceProvider(gitVersionOptions);
             var repositoryInfo = this.sp.GetService<IGitRepositoryInfo>();
-
-            var expectedPath = fixture.RepositoryPath.TrimEnd('/', '\\');
-            repositoryInfo?.ProjectRootDirectory.TrimEnd('/', '\\').ShouldBe(expectedPath);
+            repositoryInfo?.ProjectRootDirectory.TrimEnd('/', '\\').ShouldBe(worktreePath);
+        }
+        finally
+        {
+            DirectoryHelper.DeleteDirectory(worktreePath);
         }
+    }
+
+    [Test]
+    public void GetProjectRootDirectoryNoWorktree()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        var targetUrl = "https://github.com/GitTools/GitVersion.git";
+
+        var gitVersionOptions = new GitVersionOptions
+        {
+            RepositoryInfo = { TargetUrl = targetUrl },
+            WorkingDirectory = fixture.RepositoryPath
+        };
+
+        this.sp = GetServiceProvider(gitVersionOptions);
+        var repositoryInfo = this.sp.GetService<IGitRepositoryInfo>();
 
-        [Test]
-        public void GetDotGitDirectoryNoWorktree()
+        var expectedPath = fixture.RepositoryPath.TrimEnd('/', '\\');
+        repositoryInfo?.ProjectRootDirectory.TrimEnd('/', '\\').ShouldBe(expectedPath);
+    }
+
+    [Test]
+    public void GetDotGitDirectoryNoWorktree()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+
+        var gitVersionOptions = new GitVersionOptions
+        {
+            WorkingDirectory = fixture.RepositoryPath
+        };
+
+        this.sp = GetServiceProvider(gitVersionOptions);
+        var repositoryInfo = this.sp.GetService<IGitRepositoryInfo>();
+
+        var expectedPath = Path.Combine(fixture.RepositoryPath, ".git");
+        repositoryInfo?.DotGitDirectory.ShouldBe(expectedPath);
+    }
+
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void GetDotGitDirectoryWorktree()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+
+        var worktreePath = Path.Combine(Directory.GetParent(fixture.RepositoryPath).FullName, Guid.NewGuid().ToString());
+        try
         {
-            using var fixture = new EmptyRepositoryFixture();
+            // create a branch and a new worktree for it
+            var repo = new Repository(fixture.RepositoryPath);
+            repo.Worktrees.Add("worktree", worktreePath, false);
 
             var gitVersionOptions = new GitVersionOptions
             {
-                WorkingDirectory = fixture.RepositoryPath
+                WorkingDirectory = worktreePath
             };
 
             this.sp = GetServiceProvider(gitVersionOptions);
@@ -481,91 +508,63 @@ public void GetDotGitDirectoryNoWorktree()
             var expectedPath = Path.Combine(fixture.RepositoryPath, ".git");
             repositoryInfo?.DotGitDirectory.ShouldBe(expectedPath);
         }
-
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void GetDotGitDirectoryWorktree()
+        finally
         {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-
-            var worktreePath = Path.Combine(Directory.GetParent(fixture.RepositoryPath).FullName, Guid.NewGuid().ToString());
-            try
-            {
-                // create a branch and a new worktree for it
-                var repo = new Repository(fixture.RepositoryPath);
-                repo.Worktrees.Add("worktree", worktreePath, false);
-
-                var gitVersionOptions = new GitVersionOptions
-                {
-                    WorkingDirectory = worktreePath
-                };
-
-                this.sp = GetServiceProvider(gitVersionOptions);
-                var repositoryInfo = this.sp.GetService<IGitRepositoryInfo>();
-
-                var expectedPath = Path.Combine(fixture.RepositoryPath, ".git");
-                repositoryInfo?.DotGitDirectory.ShouldBe(expectedPath);
-            }
-            finally
-            {
-                DirectoryHelper.DeleteDirectory(worktreePath);
-            }
+            DirectoryHelper.DeleteDirectory(worktreePath);
         }
+    }
 
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void CalculateVersionFromWorktreeHead()
-        {
-            // Setup
-            using var fixture = new EmptyRepositoryFixture();
-            var repoDir = new DirectoryInfo(fixture.RepositoryPath);
-            var worktreePath = Path.Combine(repoDir.Parent.FullName, $"{repoDir.Name}-v1");
-
-            fixture.Repository.MakeATaggedCommit("v1.0.0");
-            var branchV1 = fixture.Repository.CreateBranch("support/1.0");
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void CalculateVersionFromWorktreeHead()
+    {
+        // Setup
+        using var fixture = new EmptyRepositoryFixture();
+        var repoDir = new DirectoryInfo(fixture.RepositoryPath);
+        var worktreePath = Path.Combine(repoDir.Parent.FullName, $"{repoDir.Name}-v1");
 
-            fixture.Repository.MakeATaggedCommit("v2.0.0");
+        fixture.Repository.MakeATaggedCommit("v1.0.0");
+        var branchV1 = fixture.Repository.CreateBranch("support/1.0");
 
-            fixture.Repository.Worktrees.Add(branchV1.CanonicalName, "1.0", worktreePath, false);
-            using var worktreeFixture = new LocalRepositoryFixture(new Repository(worktreePath));
+        fixture.Repository.MakeATaggedCommit("v2.0.0");
 
-            var gitVersionOptions = new GitVersionOptions { WorkingDirectory = worktreeFixture.RepositoryPath };
+        fixture.Repository.Worktrees.Add(branchV1.CanonicalName, "1.0", worktreePath, false);
+        using var worktreeFixture = new LocalRepositoryFixture(new Repository(worktreePath));
 
-            var sut = GetGitVersionCalculator(gitVersionOptions);
+        var gitVersionOptions = new GitVersionOptions { WorkingDirectory = worktreeFixture.RepositoryPath };
 
-            // Execute
-            var version = sut.CalculateVersionVariables();
+        var sut = GetGitVersionCalculator(gitVersionOptions);
 
-            // Verify
-            version.SemVer.ShouldBe("1.0.0");
-            var commits = worktreeFixture.Repository.Head.Commits;
-            version.Sha.ShouldBe(commits.First().Sha);
-        }
+        // Execute
+        var version = sut.CalculateVersionVariables();
 
-        private IGitVersionCalculateTool GetGitVersionCalculator(GitVersionOptions gitVersionOptions, ILog logger = null, IGitRepository repository = null, IFileSystem fs = null)
-        {
-            this.sp = GetServiceProvider(gitVersionOptions, logger, repository, fs);
+        // Verify
+        version.SemVer.ShouldBe("1.0.0");
+        var commits = worktreeFixture.Repository.Head.Commits;
+        version.Sha.ShouldBe(commits.First().Sha);
+    }
 
-            this.fileSystem = this.sp.GetService<IFileSystem>();
-            this.log = this.sp.GetService<ILog>();
-            this.gitVersionCache = this.sp.GetService<IGitVersionCache>();
+    private IGitVersionCalculateTool GetGitVersionCalculator(GitVersionOptions gitVersionOptions, ILog logger = null, IGitRepository repository = null, IFileSystem fs = null)
+    {
+        this.sp = GetServiceProvider(gitVersionOptions, logger, repository, fs);
 
-            return this.sp.GetService<IGitVersionCalculateTool>();
-        }
+        this.fileSystem = this.sp.GetService<IFileSystem>();
+        this.log = this.sp.GetService<ILog>();
+        this.gitVersionCache = this.sp.GetService<IGitVersionCache>();
 
-        private static IServiceProvider GetServiceProvider(GitVersionOptions gitVersionOptions, ILog log = null, IGitRepository repository = null, IFileSystem fileSystem = null, IEnvironment environment = null) =>
-            ConfigureServices(services =>
-            {
-                if (log != null) services.AddSingleton(log);
-                if (fileSystem != null) services.AddSingleton(fileSystem);
-                if (repository != null) services.AddSingleton(repository);
-                if (environment != null) services.AddSingleton(environment);
-                var options = Options.Create(gitVersionOptions);
-                services.AddSingleton(options);
-                services.AddSingleton(RepositoryExtensions.ToGitRepositoryInfo(options));
-            });
+        return this.sp.GetService<IGitVersionCalculateTool>();
     }
-}
+
+    private static IServiceProvider GetServiceProvider(GitVersionOptions gitVersionOptions, ILog log = null, IGitRepository repository = null, IFileSystem fileSystem = null, IEnvironment environment = null) =>
+        ConfigureServices(services =>
+        {
+            if (log != null) services.AddSingleton(log);
+            if (fileSystem != null) services.AddSingleton(fileSystem);
+            if (repository != null) services.AddSingleton(repository);
+            if (environment != null) services.AddSingleton(environment);
+            var options = Options.Create(gitVersionOptions);
+            services.AddSingleton(options);
+            services.AddSingleton(RepositoryExtensions.ToGitRepositoryInfo(options));
+        });
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Core/GitVersionToolDirectoryTests.cs b/src/GitVersion.Core.Tests/Core/GitVersionToolDirectoryTests.cs
index f68e15d581..493d85401a 100644
--- a/src/GitVersion.Core.Tests/Core/GitVersionToolDirectoryTests.cs
+++ b/src/GitVersion.Core.Tests/Core/GitVersionToolDirectoryTests.cs
@@ -6,71 +6,69 @@
 using Microsoft.Extensions.Options;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class GitVersionTaskDirectoryTests : TestBase
 {
+    private string gitDirectory;
+    private string workDirectory;
 
-    [TestFixture]
-    public class GitVersionTaskDirectoryTests : TestBase
+    [SetUp]
+    public void SetUp()
     {
-        private string gitDirectory;
-        private string workDirectory;
-
-        [SetUp]
-        public void SetUp()
-        {
-            this.workDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
-            this.gitDirectory = Repository.Init(this.workDirectory).TrimEnd(Path.DirectorySeparatorChar);
-            Assert.NotNull(this.gitDirectory);
-        }
+        this.workDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+        this.gitDirectory = Repository.Init(this.workDirectory).TrimEnd(Path.DirectorySeparatorChar);
+        Assert.NotNull(this.gitDirectory);
+    }
 
-        [TearDown]
-        public void Cleanup() => Directory.Delete(this.workDirectory, true);
+    [TearDown]
+    public void Cleanup() => Directory.Delete(this.workDirectory, true);
 
-        [Test]
-        public void FindsGitDirectory()
+    [Test]
+    public void FindsGitDirectory()
+    {
+        try
         {
-            try
-            {
-                var options = Options.Create(new GitVersionOptions { WorkingDirectory = workDirectory, Settings = { NoFetch = true } });
+            var options = Options.Create(new GitVersionOptions { WorkingDirectory = workDirectory, Settings = { NoFetch = true } });
 
-                var sp = ConfigureServices(services => services.AddSingleton(options));
+            var sp = ConfigureServices(services => services.AddSingleton(options));
 
-                var gitVersionCalculator = sp.GetService<IGitVersionCalculateTool>();
+            var gitVersionCalculator = sp.GetService<IGitVersionCalculateTool>();
 
-                gitVersionCalculator.CalculateVersionVariables();
-            }
-            catch (Exception ex)
-            {
-                // `RepositoryNotFoundException` means that it couldn't find the .git directory,
-                // any other exception means that the .git was found but there was some other issue that this test doesn't care about.
-                Assert.IsNotAssignableFrom<RepositoryNotFoundException>(ex);
-            }
+            gitVersionCalculator.CalculateVersionVariables();
+        }
+        catch (Exception ex)
+        {
+            // `RepositoryNotFoundException` means that it couldn't find the .git directory,
+            // any other exception means that the .git was found but there was some other issue that this test doesn't care about.
+            Assert.IsNotAssignableFrom<RepositoryNotFoundException>(ex);
         }
+    }
 
 
-        [Test]
-        public void FindsGitDirectoryInParent()
-        {
-            var childDir = Path.Combine(this.workDirectory, "child");
-            Directory.CreateDirectory(childDir);
+    [Test]
+    public void FindsGitDirectoryInParent()
+    {
+        var childDir = Path.Combine(this.workDirectory, "child");
+        Directory.CreateDirectory(childDir);
 
-            try
-            {
-                var options = Options.Create(new GitVersionOptions { WorkingDirectory = childDir, Settings = { NoFetch = true } });
+        try
+        {
+            var options = Options.Create(new GitVersionOptions { WorkingDirectory = childDir, Settings = { NoFetch = true } });
 
-                var sp = ConfigureServices(services => services.AddSingleton(options));
+            var sp = ConfigureServices(services => services.AddSingleton(options));
 
-                var gitVersionCalculator = sp.GetService<IGitVersionCalculateTool>();
+            var gitVersionCalculator = sp.GetService<IGitVersionCalculateTool>();
 
-                gitVersionCalculator.CalculateVersionVariables();
-            }
-            catch (Exception ex)
-            {
-                // TODO I think this test is wrong.. It throws a different exception
-                // `RepositoryNotFoundException` means that it couldn't find the .git directory,
-                // any other exception means that the .git was found but there was some other issue that this test doesn't care about.
-                Assert.IsNotAssignableFrom<RepositoryNotFoundException>(ex);
-            }
+            gitVersionCalculator.CalculateVersionVariables();
+        }
+        catch (Exception ex)
+        {
+            // TODO I think this test is wrong.. It throws a different exception
+            // `RepositoryNotFoundException` means that it couldn't find the .git directory,
+            // any other exception means that the .git was found but there was some other issue that this test doesn't care about.
+            Assert.IsNotAssignableFrom<RepositoryNotFoundException>(ex);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Core/RepositoryExtensionsTests.cs b/src/GitVersion.Core.Tests/Core/RepositoryExtensionsTests.cs
index 0bcefb2709..60ca79ca12 100644
--- a/src/GitVersion.Core.Tests/Core/RepositoryExtensionsTests.cs
+++ b/src/GitVersion.Core.Tests/Core/RepositoryExtensionsTests.cs
@@ -3,52 +3,51 @@
 using NSubstitute;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class RepositoryExtensionsTests : TestBase
 {
-    [TestFixture]
-    public class RepositoryExtensionsTests : TestBase
+    [Test]
+    public void EnsureLocalBranchExistsForCurrentBranch_CaseInsensitivelyMatchesBranches()
+    {
+        var repository = Substitute.For<IGitRepository>();
+        var gitPreparer = Substitute.For<IGitPreparer>();
+        var remote = MockRemote(repository);
+
+        gitPreparer.EnsureLocalBranchExistsForCurrentBranch(remote, "refs/heads/featurE/feat-test");
+    }
+
+    private static IRemote MockRemote(IGitRepository repository)
     {
-        [Test]
-        public void EnsureLocalBranchExistsForCurrentBranch_CaseInsensitivelyMatchesBranches()
-        {
-            var repository = Substitute.For<IGitRepository>();
-            var gitPreparer = Substitute.For<IGitPreparer>();
-            var remote = MockRemote(repository);
-
-            gitPreparer.EnsureLocalBranchExistsForCurrentBranch(remote, "refs/heads/featurE/feat-test");
-        }
-
-        private static IRemote MockRemote(IGitRepository repository)
-        {
-            var tipId = Substitute.For<IObjectId>();
-            tipId.Sha.Returns("c6d8764d20ff16c0df14c73680e52b255b608926");
-
-            var tip = Substitute.For<ICommit>();
-            tip.Id.Returns(tipId);
-            tip.Sha.Returns(tipId.Sha);
-
-            var remote = Substitute.For<IRemote>();
-            remote.Name.Returns("origin");
-
-            var branch = Substitute.For<IBranch>();
-            branch.Tip.Returns(tip);
-            branch.Name.Returns(new ReferenceName("refs/heads/feature/feat-test"));
-
-            var branches = Substitute.For<IBranchCollection>();
-            branches[branch.Name.Canonical].Returns(branch);
-            branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { 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());
-
-            repository.Refs.Returns(references);
-            repository.Head.Returns(branch);
-            repository.Branches.Returns(branches);
-            return remote;
-        }
+        var tipId = Substitute.For<IObjectId>();
+        tipId.Sha.Returns("c6d8764d20ff16c0df14c73680e52b255b608926");
+
+        var tip = Substitute.For<ICommit>();
+        tip.Id.Returns(tipId);
+        tip.Sha.Returns(tipId.Sha);
+
+        var remote = Substitute.For<IRemote>();
+        remote.Name.Returns("origin");
+
+        var branch = Substitute.For<IBranch>();
+        branch.Tip.Returns(tip);
+        branch.Name.Returns(new ReferenceName("refs/heads/feature/feat-test"));
+
+        var branches = Substitute.For<IBranchCollection>();
+        branches[branch.Name.Canonical].Returns(branch);
+        branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { 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());
+
+        repository.Refs.Returns(references);
+        repository.Head.Returns(branch);
+        repository.Branches.Returns(branches);
+        return remote;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs b/src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs
index 2f9c421ba3..90ff1a1f3f 100644
--- a/src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs
+++ b/src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs
@@ -8,230 +8,229 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class RepositoryStoreTests : TestBase
 {
-    [TestFixture]
-    public class RepositoryStoreTests : TestBase
+    private readonly ILog log;
+    private readonly IIncrementStrategyFinder incrementStrategyFinder;
+
+    public RepositoryStoreTests()
     {
-        private readonly ILog log;
-        private readonly IIncrementStrategyFinder incrementStrategyFinder;
-
-        public RepositoryStoreTests()
-        {
-            var sp = ConfigureServices();
-            this.log = sp.GetService<ILog>();
-            this.incrementStrategyFinder = sp.GetService<IIncrementStrategyFinder>();
-        }
-
-        [Test]
-        public void FindsCorrectMergeBaseForForwardMerge()
-        {
-            //*9dfb8b4 49 minutes ago(develop)
-            //*54f21b2 53 minutes ago
-            //    |\
-            //    | | *a219831 51 minutes ago(HEAD -> release-2.0.0)
-            //    | |/
-            //    | *4441531 54 minutes ago
-            //    | *89840df 56 minutes ago
-            //    |/
-            //*91bf945 58 minutes ago(main)
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit("initial");
-            fixture.BranchTo("develop");
-            var fixtureRepository = fixture.Repository.ToGitRepository();
-            var expectedReleaseMergeBase = fixtureRepository.Head.Tip;
-
-            // Create release from develop
-            fixture.BranchTo("release-2.0.0");
-
-            // Make some commits on release
-            fixture.MakeACommit("release 1");
-            fixture.MakeACommit("release 2");
-            var expectedDevelopMergeBase = fixtureRepository.Head.Tip;
-
-            // First forward merge release to develop
-            fixture.Checkout("develop");
-            fixture.MergeNoFF("release-2.0.0");
-
-            // Make some new commit on release
-            fixture.Checkout("release-2.0.0");
-            fixture.MakeACommit("release 3 - after first merge");
-
-            // Make new commit on develop
-            fixture.Checkout("develop");
-
-            // Checkout to release (no new commits)
-            fixture.Checkout("release-2.0.0");
-
-            var develop = fixtureRepository.FindBranch("develop");
-            var release = fixtureRepository.FindBranch("release-2.0.0");
-            var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository, this.incrementStrategyFinder);
-
-            var releaseBranchMergeBase = gitRepoMetadataProvider.FindMergeBase(release, develop);
-
-            var developMergeBase = gitRepoMetadataProvider.FindMergeBase(develop, release);
-
-            fixtureRepository.DumpGraph(Console.WriteLine);
-
-            releaseBranchMergeBase.ShouldBe(expectedReleaseMergeBase);
-            developMergeBase.ShouldBe(expectedDevelopMergeBase);
-        }
-
-        [Test]
-        public void FindsCorrectMergeBaseForForwardMergeMovesOn()
-        {
-            //*9dfb8b4 49 minutes ago(develop)
-            //*54f21b2 53 minutes ago
-            //    |\
-            //    | | *a219831 51 minutes ago(HEAD -> release-2.0.0)
-            //    | |/
-            //    | *4441531 54 minutes ago
-            //    | *89840df 56 minutes ago
-            //    |/
-            //*91bf945 58 minutes ago(main)
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit("initial");
-            fixture.BranchTo("develop");
-            var fixtureRepository = fixture.Repository.ToGitRepository();
-            var expectedReleaseMergeBase = fixtureRepository.Head.Tip;
-
-            // Create release from develop
-            fixture.BranchTo("release-2.0.0");
-
-            // Make some commits on release
-            fixture.MakeACommit("release 1");
-            fixture.MakeACommit("release 2");
-            var expectedDevelopMergeBase = fixtureRepository.Head.Tip;
-
-            // First forward merge release to develop
-            fixture.Checkout("develop");
-            fixture.MergeNoFF("release-2.0.0");
-
-            // Make some new commit on release
-            fixture.Checkout("release-2.0.0");
-            fixture.MakeACommit("release 3 - after first merge");
-
-            // Make new commit on develop
-            fixture.Checkout("develop");
-            // Checkout to release (no new commits)
-            fixture.MakeACommit("develop after merge");
-
-            // Checkout to release (no new commits)
-            fixture.Checkout("release-2.0.0");
-
-            var develop = fixtureRepository.FindBranch("develop");
-            var release = fixtureRepository.FindBranch("release-2.0.0");
-            var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository, this.incrementStrategyFinder);
-
-            var releaseBranchMergeBase = gitRepoMetadataProvider.FindMergeBase(release, develop);
-
-            var developMergeBase = gitRepoMetadataProvider.FindMergeBase(develop, release);
-
-            fixtureRepository.DumpGraph(Console.WriteLine);
-
-            releaseBranchMergeBase.ShouldBe(expectedReleaseMergeBase);
-            developMergeBase.ShouldBe(expectedDevelopMergeBase);
-        }
-
-        [Test]
-        public void FindsCorrectMergeBaseForMultipleForwardMerges()
-        {
-            //*403b294 44 minutes ago(develop)
-            //|\
-            //| *306b243 45 minutes ago(HEAD -> release-2.0.0)
-            //| *4cf5969 47 minutes ago
-            //| *4814083 51 minutes ago
-            //* | cddd3cc 49 minutes ago
-            //* | 2b2b52a 53 minutes ago
-            //|\ \
-            //| |/
-            //| *8113776 54 minutes ago
-            //| *3c0235e 56 minutes ago
-            //|/
-            //*f6f1283 58 minutes ago(main)
-
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit("initial");
-            fixture.BranchTo("develop");
-            var fixtureRepository = fixture.Repository.ToGitRepository();
-            var expectedReleaseMergeBase = fixtureRepository.Head.Tip;
-
-            // Create release from develop
-            fixture.BranchTo("release-2.0.0");
-
-            // Make some commits on release
-            fixture.MakeACommit("release 1");
-            fixture.MakeACommit("release 2");
-
-            // First forward merge release to develop
-            fixture.Checkout("develop");
-            fixture.MergeNoFF("release-2.0.0");
-
-            // Make some new commit on release
-            fixture.Checkout("release-2.0.0");
-            fixture.MakeACommit("release 3 - after first merge");
-
-            // Make new commit on develop
-            fixture.Checkout("develop");
-            // Checkout to release (no new commits)
-            fixture.Checkout("release-2.0.0");
-            fixture.Checkout("develop");
-            fixture.MakeACommit("develop after merge");
-
-            // Checkout to release (no new commits)
-            fixture.Checkout("release-2.0.0");
-
-            // Make some new commit on release
-            fixture.MakeACommit("release 4");
-            fixture.MakeACommit("release 5");
-            var expectedDevelopMergeBase = fixtureRepository.Head.Tip;
-
-            // Second merge release to develop
-            fixture.Checkout("develop");
-            fixture.MergeNoFF("release-2.0.0");
-
-            // Checkout to release (no new commits)
-            fixture.Checkout("release-2.0.0");
+        var sp = ConfigureServices();
+        this.log = sp.GetService<ILog>();
+        this.incrementStrategyFinder = sp.GetService<IIncrementStrategyFinder>();
+    }
 
-            var develop = fixtureRepository.FindBranch("develop");
-            var release = fixtureRepository.FindBranch("release-2.0.0");
+    [Test]
+    public void FindsCorrectMergeBaseForForwardMerge()
+    {
+        //*9dfb8b4 49 minutes ago(develop)
+        //*54f21b2 53 minutes ago
+        //    |\
+        //    | | *a219831 51 minutes ago(HEAD -> release-2.0.0)
+        //    | |/
+        //    | *4441531 54 minutes ago
+        //    | *89840df 56 minutes ago
+        //    |/
+        //*91bf945 58 minutes ago(main)
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit("initial");
+        fixture.BranchTo("develop");
+        var fixtureRepository = fixture.Repository.ToGitRepository();
+        var expectedReleaseMergeBase = fixtureRepository.Head.Tip;
+
+        // Create release from develop
+        fixture.BranchTo("release-2.0.0");
+
+        // Make some commits on release
+        fixture.MakeACommit("release 1");
+        fixture.MakeACommit("release 2");
+        var expectedDevelopMergeBase = fixtureRepository.Head.Tip;
+
+        // First forward merge release to develop
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("release-2.0.0");
+
+        // Make some new commit on release
+        fixture.Checkout("release-2.0.0");
+        fixture.MakeACommit("release 3 - after first merge");
+
+        // Make new commit on develop
+        fixture.Checkout("develop");
+
+        // Checkout to release (no new commits)
+        fixture.Checkout("release-2.0.0");
+
+        var develop = fixtureRepository.FindBranch("develop");
+        var release = fixtureRepository.FindBranch("release-2.0.0");
+        var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository, this.incrementStrategyFinder);
+
+        var releaseBranchMergeBase = gitRepoMetadataProvider.FindMergeBase(release, develop);
+
+        var developMergeBase = gitRepoMetadataProvider.FindMergeBase(develop, release);
+
+        fixtureRepository.DumpGraph(Console.WriteLine);
+
+        releaseBranchMergeBase.ShouldBe(expectedReleaseMergeBase);
+        developMergeBase.ShouldBe(expectedDevelopMergeBase);
+    }
 
-            var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository, this.incrementStrategyFinder);
+    [Test]
+    public void FindsCorrectMergeBaseForForwardMergeMovesOn()
+    {
+        //*9dfb8b4 49 minutes ago(develop)
+        //*54f21b2 53 minutes ago
+        //    |\
+        //    | | *a219831 51 minutes ago(HEAD -> release-2.0.0)
+        //    | |/
+        //    | *4441531 54 minutes ago
+        //    | *89840df 56 minutes ago
+        //    |/
+        //*91bf945 58 minutes ago(main)
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit("initial");
+        fixture.BranchTo("develop");
+        var fixtureRepository = fixture.Repository.ToGitRepository();
+        var expectedReleaseMergeBase = fixtureRepository.Head.Tip;
+
+        // Create release from develop
+        fixture.BranchTo("release-2.0.0");
+
+        // Make some commits on release
+        fixture.MakeACommit("release 1");
+        fixture.MakeACommit("release 2");
+        var expectedDevelopMergeBase = fixtureRepository.Head.Tip;
+
+        // First forward merge release to develop
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("release-2.0.0");
+
+        // Make some new commit on release
+        fixture.Checkout("release-2.0.0");
+        fixture.MakeACommit("release 3 - after first merge");
+
+        // Make new commit on develop
+        fixture.Checkout("develop");
+        // Checkout to release (no new commits)
+        fixture.MakeACommit("develop after merge");
+
+        // Checkout to release (no new commits)
+        fixture.Checkout("release-2.0.0");
+
+        var develop = fixtureRepository.FindBranch("develop");
+        var release = fixtureRepository.FindBranch("release-2.0.0");
+        var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository, this.incrementStrategyFinder);
+
+        var releaseBranchMergeBase = gitRepoMetadataProvider.FindMergeBase(release, develop);
+
+        var developMergeBase = gitRepoMetadataProvider.FindMergeBase(develop, release);
+
+        fixtureRepository.DumpGraph(Console.WriteLine);
+
+        releaseBranchMergeBase.ShouldBe(expectedReleaseMergeBase);
+        developMergeBase.ShouldBe(expectedDevelopMergeBase);
+    }
 
-            var releaseBranchMergeBase = gitRepoMetadataProvider.FindMergeBase(release, develop);
+    [Test]
+    public void FindsCorrectMergeBaseForMultipleForwardMerges()
+    {
+        //*403b294 44 minutes ago(develop)
+        //|\
+        //| *306b243 45 minutes ago(HEAD -> release-2.0.0)
+        //| *4cf5969 47 minutes ago
+        //| *4814083 51 minutes ago
+        //* | cddd3cc 49 minutes ago
+        //* | 2b2b52a 53 minutes ago
+        //|\ \
+        //| |/
+        //| *8113776 54 minutes ago
+        //| *3c0235e 56 minutes ago
+        //|/
+        //*f6f1283 58 minutes ago(main)
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit("initial");
+        fixture.BranchTo("develop");
+        var fixtureRepository = fixture.Repository.ToGitRepository();
+        var expectedReleaseMergeBase = fixtureRepository.Head.Tip;
+
+        // Create release from develop
+        fixture.BranchTo("release-2.0.0");
+
+        // Make some commits on release
+        fixture.MakeACommit("release 1");
+        fixture.MakeACommit("release 2");
+
+        // First forward merge release to develop
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("release-2.0.0");
+
+        // Make some new commit on release
+        fixture.Checkout("release-2.0.0");
+        fixture.MakeACommit("release 3 - after first merge");
+
+        // Make new commit on develop
+        fixture.Checkout("develop");
+        // Checkout to release (no new commits)
+        fixture.Checkout("release-2.0.0");
+        fixture.Checkout("develop");
+        fixture.MakeACommit("develop after merge");
+
+        // Checkout to release (no new commits)
+        fixture.Checkout("release-2.0.0");
+
+        // Make some new commit on release
+        fixture.MakeACommit("release 4");
+        fixture.MakeACommit("release 5");
+        var expectedDevelopMergeBase = fixtureRepository.Head.Tip;
+
+        // Second merge release to develop
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("release-2.0.0");
+
+        // Checkout to release (no new commits)
+        fixture.Checkout("release-2.0.0");
+
+        var develop = fixtureRepository.FindBranch("develop");
+        var release = fixtureRepository.FindBranch("release-2.0.0");
+
+        var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository, this.incrementStrategyFinder);
+
+        var releaseBranchMergeBase = gitRepoMetadataProvider.FindMergeBase(release, develop);
+
+        var developMergeBase = gitRepoMetadataProvider.FindMergeBase(develop, release);
+
+        fixtureRepository.DumpGraph(Console.WriteLine);
+
+        releaseBranchMergeBase.ShouldBe(expectedReleaseMergeBase);
+        developMergeBase.ShouldBe(expectedDevelopMergeBase);
+    }
 
-            var developMergeBase = gitRepoMetadataProvider.FindMergeBase(develop, release);
+    [Test]
+    public void GetBranchesContainingCommitThrowsDirectlyOnNullCommit()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        var fixtureRepository = fixture.Repository.ToGitRepository();
+        var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository, this.incrementStrategyFinder);
 
-            fixtureRepository.DumpGraph(Console.WriteLine);
+        Assert.Throws<ArgumentNullException>(() => gitRepoMetadataProvider.GetBranchesContainingCommit(null));
+    }
 
-            releaseBranchMergeBase.ShouldBe(expectedReleaseMergeBase);
-            developMergeBase.ShouldBe(expectedDevelopMergeBase);
-        }
+    [Test]
+    public void FindCommitBranchWasBranchedFromShouldReturnNullIfTheRemoteIsTheOnlySource()
+    {
+        using var fixture = new RemoteRepositoryFixture();
+        fixture.MakeACommit("initial");
 
-        [Test]
-        public void GetBranchesContainingCommitThrowsDirectlyOnNullCommit()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            var fixtureRepository = fixture.Repository.ToGitRepository();
-            var gitRepoMetadataProvider = new RepositoryStore(this.log, fixtureRepository, this.incrementStrategyFinder);
+        var localRepository = fixture.LocalRepositoryFixture.Repository.ToGitRepository();
 
-            Assert.Throws<ArgumentNullException>(() => gitRepoMetadataProvider.GetBranchesContainingCommit(null));
-        }
+        var gitRepoMetadataProvider = new RepositoryStore(this.log, localRepository, this.incrementStrategyFinder);
 
-        [Test]
-        public void FindCommitBranchWasBranchedFromShouldReturnNullIfTheRemoteIsTheOnlySource()
-        {
-            using var fixture = new RemoteRepositoryFixture();
-            fixture.MakeACommit("initial");
+        var branchedCommit = gitRepoMetadataProvider.FindCommitBranchWasBranchedFrom(localRepository.FindBranch("main"), new Model.Configuration.Config(), Array.Empty<IBranch>());
 
-            var localRepository = fixture.LocalRepositoryFixture.Repository.ToGitRepository();
-
-            var gitRepoMetadataProvider = new RepositoryStore(this.log, localRepository, this.incrementStrategyFinder);
-
-            var branchedCommit = gitRepoMetadataProvider.FindCommitBranchWasBranchedFrom(localRepository.FindBranch("main"), new Model.Configuration.Config(), Array.Empty<IBranch>());
-
-            Assert.IsNull(branchedCommit.Branch);
-            Assert.IsNull(branchedCommit.Commit);
-        }
+        Assert.IsNull(branchedCommit.Branch);
+        Assert.IsNull(branchedCommit.Commit);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/DocumentationTests.cs b/src/GitVersion.Core.Tests/DocumentationTests.cs
index fcd79e53dc..435b3c81b6 100644
--- a/src/GitVersion.Core.Tests/DocumentationTests.cs
+++ b/src/GitVersion.Core.Tests/DocumentationTests.cs
@@ -9,94 +9,93 @@
 using Shouldly;
 using YamlDotNet.Serialization;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class DocumentationTests : TestBase
 {
-    [TestFixture]
-    public class DocumentationTests : TestBase
-    {
-        private DirectoryInfo docsDirectory;
+    private DirectoryInfo docsDirectory;
 
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => this.docsDirectory = GetDocsDirectory();
+    [OneTimeSetUp]
+    public void OneTimeSetUp() => this.docsDirectory = GetDocsDirectory();
 
-        [Test]
-        public void ConfigurationDocumentationIsUpToDate()
-        {
-            var configurationDocumentationFile = ReadDocumentationFile("input/docs/reference/configuration.md");
+    [Test]
+    public void ConfigurationDocumentationIsUpToDate()
+    {
+        var configurationDocumentationFile = ReadDocumentationFile("input/docs/reference/configuration.md");
 
-            const BindingFlags bindingFlags = BindingFlags.Public | BindingFlags.DeclaredOnly | BindingFlags.Instance;
-            var configProperties = typeof(Config)
-                .GetProperties(bindingFlags)
-                .Union(typeof(BranchConfig).GetProperties(bindingFlags))
-                .Select(p => p.GetCustomAttribute<YamlMemberAttribute>())
-                .Where(a => a != null)
-                .Select(a => a.Alias)
-                .ToList();
+        const BindingFlags bindingFlags = BindingFlags.Public | BindingFlags.DeclaredOnly | BindingFlags.Instance;
+        var configProperties = typeof(Config)
+            .GetProperties(bindingFlags)
+            .Union(typeof(BranchConfig).GetProperties(bindingFlags))
+            .Select(p => p.GetCustomAttribute<YamlMemberAttribute>())
+            .Where(a => a != null)
+            .Select(a => a.Alias)
+            .ToList();
 
-            configProperties.ShouldNotBeEmpty();
+        configProperties.ShouldNotBeEmpty();
 
-            foreach (var configProperty in configProperties)
-            {
-                var formattedConfigProperty = $"### {configProperty}";
-                configurationDocumentationFile.ShouldContain(formattedConfigProperty, Case.Insensitive,
-                    System.Environment.NewLine + configurationDocumentationFile);
-            }
+        foreach (var configProperty in configProperties)
+        {
+            var formattedConfigProperty = $"### {configProperty}";
+            configurationDocumentationFile.ShouldContain(formattedConfigProperty, Case.Insensitive,
+                System.Environment.NewLine + configurationDocumentationFile);
         }
+    }
 
 
-        [Test]
-        public void VariableDocumentationIsUpToDate()
+    [Test]
+    public void VariableDocumentationIsUpToDate()
+    {
+        var variableDocumentationFile = ReadDocumentationFile("input/docs/reference/variables.md");
+        var variables = VersionVariables.AvailableVariables.ToList();
+
+        variables.ShouldNotBeEmpty();
+
+        foreach (var variable in variables)
         {
-            var variableDocumentationFile = ReadDocumentationFile("input/docs/reference/variables.md");
-            var variables = VersionVariables.AvailableVariables.ToList();
+            variableDocumentationFile.ShouldContain(variable, Case.Insensitive,
+                System.Environment.NewLine + variableDocumentationFile);
+        }
+    }
 
-            variables.ShouldNotBeEmpty();
+    private string ReadDocumentationFile(string relativeDocumentationFilePath)
+    {
+        var documentationFilePath = Path.Combine(this.docsDirectory.FullName, relativeDocumentationFilePath);
+        // Normalize path separators and such.
+        documentationFilePath = new FileInfo(documentationFilePath).FullName;
 
-            foreach (var variable in variables)
-            {
-                variableDocumentationFile.ShouldContain(variable, Case.Insensitive,
-                    System.Environment.NewLine + variableDocumentationFile);
-            }
+        if (!File.Exists(documentationFilePath))
+        {
+            throw new FileNotFoundException($"The documentation file '{documentationFilePath}' couldn't be found.", documentationFilePath);
         }
 
-        private string ReadDocumentationFile(string relativeDocumentationFilePath)
+        return File.ReadAllText(documentationFilePath);
+    }
+
+    private static DirectoryInfo GetDocsDirectory()
+    {
+        var currentDirectory = new FileInfo(typeof(DocumentationTests).Assembly.Location).Directory;
+        while (currentDirectory != null)
         {
-            var documentationFilePath = Path.Combine(this.docsDirectory.FullName, relativeDocumentationFilePath);
-            // Normalize path separators and such.
-            documentationFilePath = new FileInfo(documentationFilePath).FullName;
+            var docsDirectory = currentDirectory
+                .EnumerateDirectories("docs", SearchOption.TopDirectoryOnly)
+                .FirstOrDefault();
 
-            if (!File.Exists(documentationFilePath))
+            if (docsDirectory != null)
             {
-                throw new FileNotFoundException($"The documentation file '{documentationFilePath}' couldn't be found.", documentationFilePath);
+                currentDirectory = docsDirectory;
+                break;
             }
 
-            return File.ReadAllText(documentationFilePath);
+            currentDirectory = currentDirectory.Parent;
         }
 
-        private static DirectoryInfo GetDocsDirectory()
+        if (currentDirectory == null || !currentDirectory.Name.Equals("docs", StringComparison.Ordinal))
         {
-            var currentDirectory = new FileInfo(typeof(DocumentationTests).Assembly.Location).Directory;
-            while (currentDirectory != null)
-            {
-                var docsDirectory = currentDirectory
-                    .EnumerateDirectories("docs", SearchOption.TopDirectoryOnly)
-                    .FirstOrDefault();
-
-                if (docsDirectory != null)
-                {
-                    currentDirectory = docsDirectory;
-                    break;
-                }
-
-                currentDirectory = currentDirectory.Parent;
-            }
-
-            if (currentDirectory == null || !currentDirectory.Name.Equals("docs", StringComparison.Ordinal))
-            {
-                throw new DirectoryNotFoundException("Couldn't find the 'docs' directory.");
-            }
-
-            return currentDirectory;
+            throw new DirectoryNotFoundException("Couldn't find the 'docs' directory.");
         }
+
+        return currentDirectory;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs b/src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs
index aa1e5108f7..c15e381029 100644
--- a/src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs
+++ b/src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs
@@ -16,151 +16,150 @@
 using NSubstitute;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+public static class GitToolsTestingExtensions
 {
-    public static class GitToolsTestingExtensions
-    {
-        private static int commitCount = 1;
-        private static readonly DateTimeOffset when = DateTimeOffset.Now;
+    private static int commitCount = 1;
+    private static readonly DateTimeOffset when = DateTimeOffset.Now;
 
-        public static ICommit CreateMockCommit()
-        {
-            var objectId = Substitute.For<IObjectId>();
-            objectId.Sha.Returns(Guid.NewGuid().ToString("n") + "00000000");
-
-            var commit = Substitute.For<ICommit>();
-            commit.Id.Returns(objectId);
-            commit.Sha.Returns(objectId.Sha);
-            commit.Message.Returns("Commit " + commitCount++);
-            commit.Parents.Returns(Enumerable.Empty<ICommit>());
-            commit.When.Returns(when.AddSeconds(1));
-            return commit;
-        }
-        public static IBranch CreateMockBranch(string name, params ICommit[] commits)
-        {
-            var branch = Substitute.For<IBranch>();
-            branch.Name.Returns(new ReferenceName(name));
-            branch.IsTracking.Returns(true);
-            branch.IsRemote.Returns(false);
-            branch.IsDetachedHead.Returns(false);
-            branch.Tip.Returns(commits.FirstOrDefault());
-
-            var commitsCollection = Substitute.For<ICommitCollection>();
-            commitsCollection.GetEnumerator().Returns(_ => ((IEnumerable<ICommit>)commits).GetEnumerator());
-            commitsCollection.GetCommitsPriorTo(Arg.Any<DateTimeOffset>()).Returns(commits);
-            branch.Commits.Returns(commitsCollection);
-            return branch;
-        }
+    public static ICommit CreateMockCommit()
+    {
+        var objectId = Substitute.For<IObjectId>();
+        objectId.Sha.Returns(Guid.NewGuid().ToString("n") + "00000000");
+
+        var commit = Substitute.For<ICommit>();
+        commit.Id.Returns(objectId);
+        commit.Sha.Returns(objectId.Sha);
+        commit.Message.Returns("Commit " + commitCount++);
+        commit.Parents.Returns(Enumerable.Empty<ICommit>());
+        commit.When.Returns(when.AddSeconds(1));
+        return commit;
+    }
+    public static IBranch CreateMockBranch(string name, params ICommit[] commits)
+    {
+        var branch = Substitute.For<IBranch>();
+        branch.Name.Returns(new ReferenceName(name));
+        branch.IsTracking.Returns(true);
+        branch.IsRemote.Returns(false);
+        branch.IsDetachedHead.Returns(false);
+        branch.Tip.Returns(commits.FirstOrDefault());
+
+        var commitsCollection = Substitute.For<ICommitCollection>();
+        commitsCollection.GetEnumerator().Returns(_ => ((IEnumerable<ICommit>)commits).GetEnumerator());
+        commitsCollection.GetCommitsPriorTo(Arg.Any<DateTimeOffset>()).Returns(commits);
+        branch.Commits.Returns(commitsCollection);
+        return branch;
+    }
 
-        public static IBranch FindBranch(this IGitRepository repository, string branchName) => repository.Branches.FirstOrDefault(x => x.Name.WithoutRemote == branchName);
+    public static IBranch FindBranch(this IGitRepository repository, string branchName) => repository.Branches.FirstOrDefault(x => x.Name.WithoutRemote == branchName);
 
-        public static void DumpGraph(this IGitRepository repository, Action<string> writer = null, int? maxCommits = null) => GitExtensions.DumpGraph(repository.Path, writer, maxCommits);
+    public static void DumpGraph(this IGitRepository repository, Action<string> writer = null, int? maxCommits = null) => GitExtensions.DumpGraph(repository.Path, writer, maxCommits);
 
-        public static void DumpGraph(this IRepository repository, Action<string> writer = null, int? maxCommits = null) => GitExtensions.DumpGraph(repository.ToGitRepository().Path, writer, maxCommits);
+    public static void DumpGraph(this IRepository repository, Action<string> writer = null, int? maxCommits = null) => GitExtensions.DumpGraph(repository.ToGitRepository().Path, writer, maxCommits);
 
-        public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Config configuration = null, IRepository repository = null, string commitId = null, bool onlyTrackedBranches = true, string branch = null)
-        {
-            configuration ??= new ConfigurationBuilder().Build();
+    public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Config configuration = null, IRepository repository = null, string commitId = null, bool onlyTrackedBranches = true, string branch = null)
+    {
+        configuration ??= new ConfigurationBuilder().Build();
 
-            repository ??= fixture.Repository;
+        repository ??= fixture.Repository;
 
-            var options = Options.Create(new GitVersionOptions
+        var options = Options.Create(new GitVersionOptions
+        {
+            WorkingDirectory = repository.Info.WorkingDirectory,
+            ConfigInfo = { OverrideConfig = configuration },
+            RepositoryInfo =
             {
-                WorkingDirectory = repository.Info.WorkingDirectory,
-                ConfigInfo = { OverrideConfig = configuration },
-                RepositoryInfo =
-                {
-                    TargetBranch = branch,
-                    CommitId = commitId,
-                },
-                Settings = { OnlyTrackedBranches = onlyTrackedBranches }
-            });
+                TargetBranch = branch,
+                CommitId = commitId,
+            },
+            Settings = { OnlyTrackedBranches = onlyTrackedBranches }
+        });
 
-            var sp = ConfigureServices(services => services.AddSingleton(options));
+        var sp = ConfigureServices(services => services.AddSingleton(options));
 
-            var variableProvider = sp.GetService<IVariableProvider>();
-            var nextVersionCalculator = sp.GetService<INextVersionCalculator>();
-            var contextOptions = sp.GetService<Lazy<GitVersionContext>>();
+        var variableProvider = sp.GetService<IVariableProvider>();
+        var nextVersionCalculator = sp.GetService<INextVersionCalculator>();
+        var contextOptions = sp.GetService<Lazy<GitVersionContext>>();
 
-            var context = contextOptions!.Value;
+        var context = contextOptions!.Value;
 
-            try
-            {
-                var semanticVersion = nextVersionCalculator!.FindVersion();
-                var variables = variableProvider!.GetVariablesFor(semanticVersion, context.Configuration, context.IsCurrentCommitTagged);
+        try
+        {
+            var semanticVersion = nextVersionCalculator!.FindVersion();
+            var variables = variableProvider!.GetVariablesFor(semanticVersion, context.Configuration, context.IsCurrentCommitTagged);
 
-                return variables;
-            }
-            catch (Exception)
-            {
-                Console.WriteLine("Test failing, dumping repository graph");
-                repository.DumpGraph();
-                throw;
-            }
+            return variables;
         }
-
-        public static void WriteVersionVariables(this RepositoryFixtureBase fixture, string versionFile)
+        catch (Exception)
         {
-            var versionInfo = fixture.GetVersion();
-
-            using var stream = File.Open(versionFile, FileMode.Create, FileAccess.ReadWrite, FileShare.ReadWrite);
-            using var writer = new StreamWriter(stream);
-            writer.Write(versionInfo.ToString());
+            Console.WriteLine("Test failing, dumping repository graph");
+            repository.DumpGraph();
+            throw;
         }
+    }
 
-        public static void AssertFullSemver(this RepositoryFixtureBase fixture, string fullSemver, Config configuration = null, IRepository repository = null, string commitId = null, bool onlyTrackedBranches = true, string targetBranch = null)
-        {
-            configuration ??= new Config();
-            configuration = new ConfigurationBuilder().Add(configuration).Build();
-            Console.WriteLine("---------");
+    public static void WriteVersionVariables(this RepositoryFixtureBase fixture, string versionFile)
+    {
+        var versionInfo = fixture.GetVersion();
 
-            try
-            {
-                var variables = fixture.GetVersion(configuration, repository, commitId, onlyTrackedBranches, targetBranch);
-                variables.FullSemVer.ShouldBe(fullSemver);
-            }
-            catch (Exception)
-            {
-                (repository ?? fixture.Repository).DumpGraph();
-                throw;
-            }
-            if (commitId == null)
-            {
-                fixture.SequenceDiagram.NoteOver(fullSemver, fixture.Repository.Head.FriendlyName, color: "#D3D3D3");
-            }
+        using var stream = File.Open(versionFile, FileMode.Create, FileAccess.ReadWrite, FileShare.ReadWrite);
+        using var writer = new StreamWriter(stream);
+        writer.Write(versionInfo.ToString());
+    }
+
+    public static void AssertFullSemver(this RepositoryFixtureBase fixture, string fullSemver, Config configuration = null, IRepository repository = null, string commitId = null, bool onlyTrackedBranches = true, string targetBranch = null)
+    {
+        configuration ??= new Config();
+        configuration = new ConfigurationBuilder().Add(configuration).Build();
+        Console.WriteLine("---------");
+
+        try
+        {
+            var variables = fixture.GetVersion(configuration, repository, commitId, onlyTrackedBranches, targetBranch);
+            variables.FullSemVer.ShouldBe(fullSemver);
+        }
+        catch (Exception)
+        {
+            (repository ?? fixture.Repository).DumpGraph();
+            throw;
+        }
+        if (commitId == null)
+        {
+            fixture.SequenceDiagram.NoteOver(fullSemver, fixture.Repository.Head.FriendlyName, color: "#D3D3D3");
         }
+    }
 
-        /// <summary>
-        /// Simulates running on build server
-        /// </summary>
-        public static void InitializeRepo(this RemoteRepositoryFixture fixture)
+    /// <summary>
+    /// Simulates running on build server
+    /// </summary>
+    public static void InitializeRepo(this RemoteRepositoryFixture fixture)
+    {
+        var gitVersionOptions = new GitVersionOptions
         {
-            var gitVersionOptions = new GitVersionOptions
-            {
-                WorkingDirectory = fixture.LocalRepositoryFixture.RepositoryPath
-            };
-            var options = Options.Create(gitVersionOptions);
+            WorkingDirectory = fixture.LocalRepositoryFixture.RepositoryPath
+        };
+        var options = Options.Create(gitVersionOptions);
 
-            var environment = new TestEnvironment();
-            environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, "true");
+        var environment = new TestEnvironment();
+        environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, "true");
 
-            var serviceProvider = ConfigureServices(services =>
-            {
-                services.AddSingleton(options);
-                services.AddSingleton(environment);
-            });
+        var serviceProvider = ConfigureServices(services =>
+        {
+            services.AddSingleton(options);
+            services.AddSingleton(environment);
+        });
 
-            var gitPreparer = serviceProvider.GetService<IGitPreparer>();
-            gitPreparer!.Prepare();
-        }
+        var gitPreparer = serviceProvider.GetService<IGitPreparer>();
+        gitPreparer!.Prepare();
+    }
 
-        private static IServiceProvider ConfigureServices(Action<IServiceCollection> servicesOverrides = null)
-        {
-            var services = new ServiceCollection()
-                .AddModule(new GitVersionCoreTestModule());
+    private static IServiceProvider ConfigureServices(Action<IServiceCollection> servicesOverrides = null)
+    {
+        var services = new ServiceCollection()
+            .AddModule(new GitVersionCoreTestModule());
 
-            servicesOverrides?.Invoke(services);
-            return services.BuildServiceProvider();
-        }
+        servicesOverrides?.Invoke(services);
+        return services.BuildServiceProvider();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs b/src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs
index 341ea533c7..d5687d360a 100644
--- a/src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs
+++ b/src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs
@@ -3,249 +3,248 @@
 using GitVersion.Helpers;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class StringFormatWithExtensionTests
 {
-    [TestFixture]
-    public class StringFormatWithExtensionTests
-    {
-        private IEnvironment environment;
-
-        [SetUp]
-        public void Setup() => this.environment = new TestEnvironment();
-
-        [Test]
-        public void FormatWithNoTokens()
-        {
-            var propertyObject = new { };
-            var target = "Some String without tokens";
-            var expected = target;
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void FormatWithSingleSimpleToken()
-        {
-            var propertyObject = new { SomeProperty = "SomeValue" };
-            var target = "{SomeProperty}";
-            var expected = "SomeValue";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void FormatWithMultipleTokensAndVerbatimText()
-        {
-            var propertyObject = new { SomeProperty = "SomeValue", AnotherProperty = "Other Value" };
-            var target = "{SomeProperty} some text {AnotherProperty}";
-            var expected = "SomeValue some text Other Value";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void FormatWithEnvVarToken()
-        {
-            this.environment.SetEnvironmentVariable("GIT_VERSION_TEST_VAR", "Env Var Value");
-            var propertyObject = new { };
-            var target = "{env:GIT_VERSION_TEST_VAR}";
-            var expected = "Env Var Value";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void FormatWithEnvVarTokenWithFallback()
-        {
-            this.environment.SetEnvironmentVariable("GIT_VERSION_TEST_VAR", "Env Var Value");
-            var propertyObject = new { };
-            var target = "{env:GIT_VERSION_TEST_VAR ?? fallback}";
-            var expected = "Env Var Value";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void FormatWithUnsetEnvVarToken_WithFallback()
-        {
-            this.environment.SetEnvironmentVariable("GIT_VERSION_UNSET_TEST_VAR", null);
-            var propertyObject = new { };
-            var target = "{env:GIT_VERSION_UNSET_TEST_VAR ?? fallback}";
-            var expected = "fallback";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void FormatWithUnsetEnvVarToken_WithoutFallback()
-        {
-            this.environment.SetEnvironmentVariable("GIT_VERSION_UNSET_TEST_VAR", null);
-            var propertyObject = new { };
-            var target = "{env:GIT_VERSION_UNSET_TEST_VAR}";
-            Assert.Throws<ArgumentException>(() => target.FormatWith(propertyObject, this.environment));
-        }
-
-        [Test]
-        public void FormatWithMultipleEnvVars()
-        {
-            this.environment.SetEnvironmentVariable("GIT_VERSION_TEST_VAR_1", "Val-1");
-            this.environment.SetEnvironmentVariable("GIT_VERSION_TEST_VAR_2", "Val-2");
-            var propertyObject = new { };
-            var target = "{env:GIT_VERSION_TEST_VAR_1} and {env:GIT_VERSION_TEST_VAR_2}";
-            var expected = "Val-1 and Val-2";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void FormatWithMultipleEnvChars()
-        {
-            var propertyObject = new { };
-            //Test the greediness of the regex in matching env: char
-            var target = "{env:env:GIT_VERSION_TEST_VAR_1} and {env:DUMMY_VAR ?? fallback}";
-            var expected = "{env:env:GIT_VERSION_TEST_VAR_1} and fallback";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void FormatWithMultipleFallbackChars()
-        {
-            var propertyObject = new { };
-            //Test the greediness of the regex in matching env: and ?? chars
-            var target = "{env:env:GIT_VERSION_TEST_VAR_1} and {env:DUMMY_VAR ??? fallback}";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.AreEqual(target, actual);
-        }
-
-        [Test]
-        public void FormatWithSingleFallbackChar()
-        {
-            this.environment.SetEnvironmentVariable("DUMMY_ENV_VAR", "Dummy-Val");
-            var propertyObject = new { };
-            //Test the sanity of the regex when there is a grammar mismatch
-            var target = "{en:DUMMY_ENV_VAR} and {env:DUMMY_ENV_VAR??fallback}";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.AreEqual(target, actual);
-        }
-
-        [Test]
-        public void FormatWIthNullPropagationWithMultipleSpaces()
-        {
-            var propertyObject = new { SomeProperty = "Some Value" };
-            var target = "{SomeProperty} and {env:DUMMY_ENV_VAR  ??  fallback}";
-            var expected = "Some Value and fallback";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void FormatEnvVar_WithFallback_QuotedAndEmpty()
-        {
-            this.environment.SetEnvironmentVariable("ENV_VAR", null);
-            var propertyObject = new { };
-            var target = "{env:ENV_VAR ?? \"\"}";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.That(actual, Is.EqualTo(""));
-        }
-
-        [Test]
-        public void FormatProperty_String()
-        {
-            var propertyObject = new { Property = "Value" };
-            var target = "{Property}";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.That(actual, Is.EqualTo("Value"));
-        }
-
-        [Test]
-        public void FormatProperty_Integer()
-        {
-            var propertyObject = new { Property = 42 };
-            var target = "{Property}";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.That(actual, Is.EqualTo("42"));
-        }
-
-        [Test]
-        public void FormatProperty_NullObject()
-        {
-            var propertyObject = new { Property = (object)null };
-            var target = "{Property}";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.That(actual, Is.EqualTo(""));
-        }
-
-        [Test]
-        public void FormatProperty_NullInteger()
-        {
-            var propertyObject = new { Property = (int?)null };
-            var target = "{Property}";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.That(actual, Is.EqualTo(""));
-        }
-
-        [Test]
-        public void FormatProperty_String_WithFallback()
-        {
-            var propertyObject = new { Property = "Value" };
-            var target = "{Property ?? fallback}";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.That(actual, Is.EqualTo("Value"));
-        }
-
-        [Test]
-        public void FormatProperty_Integer_WithFallback()
-        {
-            var propertyObject = new { Property = 42 };
-            var target = "{Property ?? fallback}";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.That(actual, Is.EqualTo("42"));
-        }
-
-        [Test]
-        public void FormatProperty_NullObject_WithFallback()
-        {
-            var propertyObject = new { Property = (object)null };
-            var target = "{Property ?? fallback}";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.That(actual, Is.EqualTo("fallback"));
-        }
-
-        [Test]
-        public void FormatProperty_NullInteger_WithFallback()
-        {
-            var propertyObject = new { Property = (int?)null };
-            var target = "{Property ?? fallback}";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.That(actual, Is.EqualTo("fallback"));
-        }
-
-        [Test]
-        public void FormatProperty_NullObject_WithFallback_Quoted()
-        {
-            var propertyObject = new { Property = (object)null };
-            var target = "{Property ?? \"fallback\"}";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.That(actual, Is.EqualTo("fallback"));
-        }
-
-        [Test]
-        public void FormatProperty_NullObject_WithFallback_QuotedAndPadded()
-        {
-            var propertyObject = new { Property = (object)null };
-            var target = "{Property ?? \" fallback \"}";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.That(actual, Is.EqualTo(" fallback "));
-        }
-
-        [Test]
-        public void FormatProperty_NullObject_WithFallback_QuotedAndEmpty()
-        {
-            var propertyObject = new { Property = (object)null };
-            var target = "{Property ?? \"\"}";
-            var actual = target.FormatWith(propertyObject, this.environment);
-            Assert.That(actual, Is.EqualTo(""));
-        }
-    }
-}
+    private IEnvironment environment;
+
+    [SetUp]
+    public void Setup() => this.environment = new TestEnvironment();
+
+    [Test]
+    public void FormatWithNoTokens()
+    {
+        var propertyObject = new { };
+        var target = "Some String without tokens";
+        var expected = target;
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.AreEqual(expected, actual);
+    }
+
+    [Test]
+    public void FormatWithSingleSimpleToken()
+    {
+        var propertyObject = new { SomeProperty = "SomeValue" };
+        var target = "{SomeProperty}";
+        var expected = "SomeValue";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.AreEqual(expected, actual);
+    }
+
+    [Test]
+    public void FormatWithMultipleTokensAndVerbatimText()
+    {
+        var propertyObject = new { SomeProperty = "SomeValue", AnotherProperty = "Other Value" };
+        var target = "{SomeProperty} some text {AnotherProperty}";
+        var expected = "SomeValue some text Other Value";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.AreEqual(expected, actual);
+    }
+
+    [Test]
+    public void FormatWithEnvVarToken()
+    {
+        this.environment.SetEnvironmentVariable("GIT_VERSION_TEST_VAR", "Env Var Value");
+        var propertyObject = new { };
+        var target = "{env:GIT_VERSION_TEST_VAR}";
+        var expected = "Env Var Value";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.AreEqual(expected, actual);
+    }
+
+    [Test]
+    public void FormatWithEnvVarTokenWithFallback()
+    {
+        this.environment.SetEnvironmentVariable("GIT_VERSION_TEST_VAR", "Env Var Value");
+        var propertyObject = new { };
+        var target = "{env:GIT_VERSION_TEST_VAR ?? fallback}";
+        var expected = "Env Var Value";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.AreEqual(expected, actual);
+    }
+
+    [Test]
+    public void FormatWithUnsetEnvVarToken_WithFallback()
+    {
+        this.environment.SetEnvironmentVariable("GIT_VERSION_UNSET_TEST_VAR", null);
+        var propertyObject = new { };
+        var target = "{env:GIT_VERSION_UNSET_TEST_VAR ?? fallback}";
+        var expected = "fallback";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.AreEqual(expected, actual);
+    }
+
+    [Test]
+    public void FormatWithUnsetEnvVarToken_WithoutFallback()
+    {
+        this.environment.SetEnvironmentVariable("GIT_VERSION_UNSET_TEST_VAR", null);
+        var propertyObject = new { };
+        var target = "{env:GIT_VERSION_UNSET_TEST_VAR}";
+        Assert.Throws<ArgumentException>(() => target.FormatWith(propertyObject, this.environment));
+    }
+
+    [Test]
+    public void FormatWithMultipleEnvVars()
+    {
+        this.environment.SetEnvironmentVariable("GIT_VERSION_TEST_VAR_1", "Val-1");
+        this.environment.SetEnvironmentVariable("GIT_VERSION_TEST_VAR_2", "Val-2");
+        var propertyObject = new { };
+        var target = "{env:GIT_VERSION_TEST_VAR_1} and {env:GIT_VERSION_TEST_VAR_2}";
+        var expected = "Val-1 and Val-2";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.AreEqual(expected, actual);
+    }
+
+    [Test]
+    public void FormatWithMultipleEnvChars()
+    {
+        var propertyObject = new { };
+        //Test the greediness of the regex in matching env: char
+        var target = "{env:env:GIT_VERSION_TEST_VAR_1} and {env:DUMMY_VAR ?? fallback}";
+        var expected = "{env:env:GIT_VERSION_TEST_VAR_1} and fallback";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.AreEqual(expected, actual);
+    }
+
+    [Test]
+    public void FormatWithMultipleFallbackChars()
+    {
+        var propertyObject = new { };
+        //Test the greediness of the regex in matching env: and ?? chars
+        var target = "{env:env:GIT_VERSION_TEST_VAR_1} and {env:DUMMY_VAR ??? fallback}";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.AreEqual(target, actual);
+    }
+
+    [Test]
+    public void FormatWithSingleFallbackChar()
+    {
+        this.environment.SetEnvironmentVariable("DUMMY_ENV_VAR", "Dummy-Val");
+        var propertyObject = new { };
+        //Test the sanity of the regex when there is a grammar mismatch
+        var target = "{en:DUMMY_ENV_VAR} and {env:DUMMY_ENV_VAR??fallback}";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.AreEqual(target, actual);
+    }
+
+    [Test]
+    public void FormatWIthNullPropagationWithMultipleSpaces()
+    {
+        var propertyObject = new { SomeProperty = "Some Value" };
+        var target = "{SomeProperty} and {env:DUMMY_ENV_VAR  ??  fallback}";
+        var expected = "Some Value and fallback";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.AreEqual(expected, actual);
+    }
+
+    [Test]
+    public void FormatEnvVar_WithFallback_QuotedAndEmpty()
+    {
+        this.environment.SetEnvironmentVariable("ENV_VAR", null);
+        var propertyObject = new { };
+        var target = "{env:ENV_VAR ?? \"\"}";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.That(actual, Is.EqualTo(""));
+    }
+
+    [Test]
+    public void FormatProperty_String()
+    {
+        var propertyObject = new { Property = "Value" };
+        var target = "{Property}";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.That(actual, Is.EqualTo("Value"));
+    }
+
+    [Test]
+    public void FormatProperty_Integer()
+    {
+        var propertyObject = new { Property = 42 };
+        var target = "{Property}";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.That(actual, Is.EqualTo("42"));
+    }
+
+    [Test]
+    public void FormatProperty_NullObject()
+    {
+        var propertyObject = new { Property = (object)null };
+        var target = "{Property}";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.That(actual, Is.EqualTo(""));
+    }
+
+    [Test]
+    public void FormatProperty_NullInteger()
+    {
+        var propertyObject = new { Property = (int?)null };
+        var target = "{Property}";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.That(actual, Is.EqualTo(""));
+    }
+
+    [Test]
+    public void FormatProperty_String_WithFallback()
+    {
+        var propertyObject = new { Property = "Value" };
+        var target = "{Property ?? fallback}";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.That(actual, Is.EqualTo("Value"));
+    }
+
+    [Test]
+    public void FormatProperty_Integer_WithFallback()
+    {
+        var propertyObject = new { Property = 42 };
+        var target = "{Property ?? fallback}";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.That(actual, Is.EqualTo("42"));
+    }
+
+    [Test]
+    public void FormatProperty_NullObject_WithFallback()
+    {
+        var propertyObject = new { Property = (object)null };
+        var target = "{Property ?? fallback}";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.That(actual, Is.EqualTo("fallback"));
+    }
+
+    [Test]
+    public void FormatProperty_NullInteger_WithFallback()
+    {
+        var propertyObject = new { Property = (int?)null };
+        var target = "{Property ?? fallback}";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.That(actual, Is.EqualTo("fallback"));
+    }
+
+    [Test]
+    public void FormatProperty_NullObject_WithFallback_Quoted()
+    {
+        var propertyObject = new { Property = (object)null };
+        var target = "{Property ?? \"fallback\"}";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.That(actual, Is.EqualTo("fallback"));
+    }
+
+    [Test]
+    public void FormatProperty_NullObject_WithFallback_QuotedAndPadded()
+    {
+        var propertyObject = new { Property = (object)null };
+        var target = "{Property ?? \" fallback \"}";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.That(actual, Is.EqualTo(" fallback "));
+    }
+
+    [Test]
+    public void FormatProperty_NullObject_WithFallback_QuotedAndEmpty()
+    {
+        var propertyObject = new { Property = (object)null };
+        var target = "{Property ?? \"\"}";
+        var actual = target.FormatWith(propertyObject, this.environment);
+        Assert.That(actual, Is.EqualTo(""));
+    }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Helpers/DirectoryHelper.cs b/src/GitVersion.Core.Tests/Helpers/DirectoryHelper.cs
index 8ba59b9d91..51ff6edb9f 100644
--- a/src/GitVersion.Core.Tests/Helpers/DirectoryHelper.cs
+++ b/src/GitVersion.Core.Tests/Helpers/DirectoryHelper.cs
@@ -2,81 +2,80 @@
 using System.Diagnostics;
 using System.IO;
 
-namespace GitVersion.Core.Tests.Helpers
+namespace GitVersion.Core.Tests.Helpers;
+
+public static class DirectoryHelper
 {
-    public static class DirectoryHelper
+    private static readonly Dictionary<string, string> ToRename = new()
     {
-        private static readonly Dictionary<string, string> ToRename = new()
-        {
-            { "gitted", ".git" },
-            { "gitmodules", ".gitmodules" },
-        };
+        { "gitted", ".git" },
+        { "gitmodules", ".gitmodules" },
+    };
 
-        public static void CopyFilesRecursively(DirectoryInfo source, DirectoryInfo target)
-        {
-            // From http://stackoverflow.com/questions/58744/best-way-to-copy-the-entire-contents-of-a-directory-in-c/58779#58779
+    public static void CopyFilesRecursively(DirectoryInfo source, DirectoryInfo target)
+    {
+        // From http://stackoverflow.com/questions/58744/best-way-to-copy-the-entire-contents-of-a-directory-in-c/58779#58779
 
-            foreach (var dir in source.GetDirectories())
-            {
-                CopyFilesRecursively(dir, target.CreateSubdirectory(Rename(dir.Name)));
-            }
-            foreach (var file in source.GetFiles())
-            {
-                file.CopyTo(Path.Combine(target.FullName, Rename(file.Name)));
-            }
+        foreach (var dir in source.GetDirectories())
+        {
+            CopyFilesRecursively(dir, target.CreateSubdirectory(Rename(dir.Name)));
         }
+        foreach (var file in source.GetFiles())
+        {
+            file.CopyTo(Path.Combine(target.FullName, Rename(file.Name)));
+        }
+    }
 
-        private static string Rename(string name) => ToRename.ContainsKey(name) ? ToRename[name] : name;
+    private static string Rename(string name) => ToRename.ContainsKey(name) ? ToRename[name] : name;
 
-        public static void DeleteSubDirectories(string parentPath)
+    public static void DeleteSubDirectories(string parentPath)
+    {
+        var dirs = Directory.GetDirectories(parentPath);
+        foreach (var dir in dirs)
         {
-            var dirs = Directory.GetDirectories(parentPath);
-            foreach (var dir in dirs)
-            {
-                DeleteDirectory(dir);
-            }
+            DeleteDirectory(dir);
         }
+    }
 
-        public static void DeleteDirectory(string directoryPath)
-        {
-            // From http://stackoverflow.com/questions/329355/cannot-delete-directory-with-directory-deletepath-true/329502#329502
+    public static void DeleteDirectory(string directoryPath)
+    {
+        // From http://stackoverflow.com/questions/329355/cannot-delete-directory-with-directory-deletepath-true/329502#329502
 
-            if (!Directory.Exists(directoryPath))
-            {
-                Trace.WriteLine(
-                    $"Directory '{directoryPath}' is missing and can't be removed.");
+        if (!Directory.Exists(directoryPath))
+        {
+            Trace.WriteLine(
+                $"Directory '{directoryPath}' is missing and can't be removed.");
 
-                return;
-            }
+            return;
+        }
 
-            var files = Directory.GetFiles(directoryPath);
-            var dirs = Directory.GetDirectories(directoryPath);
+        var files = Directory.GetFiles(directoryPath);
+        var dirs = Directory.GetDirectories(directoryPath);
 
-            foreach (var file in files)
-            {
-                File.SetAttributes(file, FileAttributes.Normal);
-                File.Delete(file);
-            }
+        foreach (var file in files)
+        {
+            File.SetAttributes(file, FileAttributes.Normal);
+            File.Delete(file);
+        }
 
-            foreach (var dir in dirs)
-            {
-                DeleteDirectory(dir);
-            }
+        foreach (var dir in dirs)
+        {
+            DeleteDirectory(dir);
+        }
 
-            File.SetAttributes(directoryPath, FileAttributes.Normal);
-            try
-            {
-                Directory.Delete(directoryPath, false);
-            }
-            catch (IOException)
-            {
-                Trace.WriteLine(string.Format("{0}The directory '{1}' could not be deleted!" +
-                                              "{0}Most of the time, this is due to an external process accessing the files in the temporary repositories created during the test runs, and keeping a handle on the directory, thus preventing the deletion of those files." +
-                                              "{0}Known and common causes include:" +
-                                              "{0}- Windows Search Indexer (go to the Indexing Options, in the Windows Control Panel, and exclude the bin folder of LibGit2Sharp.Tests)" +
-                                              "{0}- Antivirus (exclude the bin folder of LibGit2Sharp.Tests from the paths scanned by your real-time antivirus){0}",
-                    System.Environment.NewLine, Path.GetFullPath(directoryPath)));
-            }
+        File.SetAttributes(directoryPath, FileAttributes.Normal);
+        try
+        {
+            Directory.Delete(directoryPath, false);
+        }
+        catch (IOException)
+        {
+            Trace.WriteLine(string.Format("{0}The directory '{1}' could not be deleted!" +
+                                          "{0}Most of the time, this is due to an external process accessing the files in the temporary repositories created during the test runs, and keeping a handle on the directory, thus preventing the deletion of those files." +
+                                          "{0}Known and common causes include:" +
+                                          "{0}- Windows Search Indexer (go to the Indexing Options, in the Windows Control Panel, and exclude the bin folder of LibGit2Sharp.Tests)" +
+                                          "{0}- Antivirus (exclude the bin folder of LibGit2Sharp.Tests from the paths scanned by your real-time antivirus){0}",
+                System.Environment.NewLine, Path.GetFullPath(directoryPath)));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs b/src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs
index 8b4ad145b0..b715516f4a 100644
--- a/src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs
+++ b/src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs
@@ -10,98 +10,97 @@
 using Microsoft.Extensions.Options;
 using NSubstitute;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+public class GitVersionContextBuilder
 {
-    public class GitVersionContextBuilder
+    private IGitRepository repository;
+    private Config configuration;
+    public IServiceProvider ServicesProvider;
+    private Action<IServiceCollection> overrideServices;
+
+    public GitVersionContextBuilder WithRepository(IGitRepository gitRepository)
     {
-        private IGitRepository repository;
-        private Config configuration;
-        public IServiceProvider ServicesProvider;
-        private Action<IServiceCollection> overrideServices;
+        this.repository = gitRepository;
+        return this;
+    }
 
-        public GitVersionContextBuilder WithRepository(IGitRepository gitRepository)
-        {
-            this.repository = gitRepository;
-            return this;
-        }
+    public GitVersionContextBuilder WithConfig(Config config)
+    {
+        this.configuration = config;
+        return this;
+    }
 
-        public GitVersionContextBuilder WithConfig(Config config)
-        {
-            this.configuration = config;
-            return this;
-        }
+    public GitVersionContextBuilder OverrideServices(Action<IServiceCollection> overrides = null)
+    {
+        this.overrideServices = overrides;
+        return this;
+    }
 
-        public GitVersionContextBuilder OverrideServices(Action<IServiceCollection> overrides = null)
-        {
-            this.overrideServices = overrides;
-            return this;
-        }
+    public GitVersionContextBuilder WithDevelopBranch() => WithBranch("develop");
 
-        public GitVersionContextBuilder WithDevelopBranch() => WithBranch("develop");
+    private GitVersionContextBuilder WithBranch(string branchName)
+    {
+        this.repository = CreateRepository();
+        return AddBranch(branchName);
+    }
 
-        private GitVersionContextBuilder WithBranch(string branchName)
-        {
-            this.repository = CreateRepository();
-            return AddBranch(branchName);
-        }
+    private GitVersionContextBuilder AddBranch(string branchName)
+    {
+        var mockCommit = GitToolsTestingExtensions.CreateMockCommit();
+        var mockBranch = GitToolsTestingExtensions.CreateMockBranch(branchName, mockCommit);
+
+        var branches = this.repository.Branches.ToList();
+        branches.Add(mockBranch);
+        this.repository.Branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)branches).GetEnumerator());
+        this.repository.Head.Returns(mockBranch);
+        return this;
+    }
 
-        private GitVersionContextBuilder AddBranch(string branchName)
-        {
-            var mockCommit = GitToolsTestingExtensions.CreateMockCommit();
-            var mockBranch = GitToolsTestingExtensions.CreateMockBranch(branchName, mockCommit);
+    public void Build()
+    {
+        var repo = this.repository ?? CreateRepository();
 
-            var branches = this.repository.Branches.ToList();
-            branches.Add(mockBranch);
-            this.repository.Branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)branches).GetEnumerator());
-            this.repository.Head.Returns(mockBranch);
-            return this;
-        }
+        var config = new ConfigurationBuilder()
+            .Add(this.configuration ?? new Config())
+            .Build();
 
-        public void Build()
+        var options = Options.Create(new GitVersionOptions
         {
-            var repo = this.repository ?? CreateRepository();
-
-            var config = new ConfigurationBuilder()
-                         .Add(this.configuration ?? new Config())
-                         .Build();
-
-            var options = Options.Create(new GitVersionOptions
-            {
-                WorkingDirectory = new EmptyRepositoryFixture().RepositoryPath,
-                ConfigInfo = { OverrideConfig = config }
-            });
-
-            this.ServicesProvider = ConfigureServices(services =>
-            {
-                services.AddSingleton(options);
-                services.AddSingleton(repo);
-                this.overrideServices?.Invoke(services);
-            });
-        }
-
-        private static IGitRepository CreateRepository()
+            WorkingDirectory = new EmptyRepositoryFixture().RepositoryPath,
+            ConfigInfo = { OverrideConfig = config }
+        });
+
+        this.ServicesProvider = ConfigureServices(services =>
         {
-            var mockCommit = GitToolsTestingExtensions.CreateMockCommit();
-            var mockBranch = GitToolsTestingExtensions.CreateMockBranch(TestBase.MainBranch, mockCommit);
-            var branches = Substitute.For<IBranchCollection>();
-            branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { mockBranch }).GetEnumerator());
+            services.AddSingleton(options);
+            services.AddSingleton(repo);
+            this.overrideServices?.Invoke(services);
+        });
+    }
 
-            var mockRepository = Substitute.For<IGitRepository>();
-            mockRepository.Branches.Returns(branches);
-            mockRepository.Head.Returns(mockBranch);
-            mockRepository.Commits.Returns(mockBranch.Commits);
+    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());
 
-            return mockRepository;
-        }
+        var mockRepository = Substitute.For<IGitRepository>();
+        mockRepository.Branches.Returns(branches);
+        mockRepository.Head.Returns(mockBranch);
+        mockRepository.Commits.Returns(mockBranch.Commits);
 
-        private static IServiceProvider ConfigureServices(Action<IServiceCollection> overrideServices = null)
-        {
-            var services = new ServiceCollection()
-                .AddModule(new GitVersionCoreTestModule());
+        return mockRepository;
+    }
+
+    private static IServiceProvider ConfigureServices(Action<IServiceCollection> overrideServices = null)
+    {
+        var services = new ServiceCollection()
+            .AddModule(new GitVersionCoreTestModule());
 
-            overrideServices?.Invoke(services);
+        overrideServices?.Invoke(services);
 
-            return services.BuildServiceProvider();
-        }
+        return services.BuildServiceProvider();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs b/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs
index 8ff8c7ed94..3b6121518d 100644
--- a/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs
+++ b/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs
@@ -2,18 +2,17 @@
 using GitVersion.Logging;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GitVersion.Core.Tests.Helpers
+namespace GitVersion.Core.Tests.Helpers;
+
+public class GitVersionCoreTestModule : IGitVersionModule
 {
-    public class GitVersionCoreTestModule : IGitVersionModule
+    public void RegisterTypes(IServiceCollection services)
     {
-        public void RegisterTypes(IServiceCollection services)
-        {
-            services.AddModule(new GitVersionLibGit2SharpModule());
-            services.AddModule(new GitVersionCoreModule());
+        services.AddModule(new GitVersionLibGit2SharpModule());
+        services.AddModule(new GitVersionCoreModule());
 
-            services.AddSingleton<IFileSystem, TestFileSystem>();
-            services.AddSingleton<IEnvironment, TestEnvironment>();
-            services.AddSingleton<ILog, NullLog>();
-        }
+        services.AddSingleton<IFileSystem, TestFileSystem>();
+        services.AddSingleton<IEnvironment, TestEnvironment>();
+        services.AddSingleton<ILog, NullLog>();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Helpers/PathHelper.cs b/src/GitVersion.Core.Tests/Helpers/PathHelper.cs
index 9172d7b497..5154bcd171 100644
--- a/src/GitVersion.Core.Tests/Helpers/PathHelper.cs
+++ b/src/GitVersion.Core.Tests/Helpers/PathHelper.cs
@@ -2,25 +2,24 @@
 using System.IO;
 using System.Reflection;
 
-namespace GitVersion.Core.Tests.Helpers
+namespace GitVersion.Core.Tests.Helpers;
+
+public static class PathHelper
 {
-    public static class PathHelper
-    {
-        public static string GetCurrentDirectory() => Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+    public static string GetCurrentDirectory() => Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 
-        public static string GetExecutable() => RuntimeHelper.IsCoreClr() ? "dotnet" : Path.Combine(GetExeDirectory(), "gitversion.exe");
+    public static string GetExecutable() => RuntimeHelper.IsCoreClr() ? "dotnet" : Path.Combine(GetExeDirectory(), "gitversion.exe");
 
-        public static string GetExecutableArgs(string args)
+    public static string GetExecutableArgs(string args)
+    {
+        if (RuntimeHelper.IsCoreClr())
         {
-            if (RuntimeHelper.IsCoreClr())
-            {
-                args = $"{Path.Combine(GetExeDirectory(), "gitversion.dll")} {args}";
-            }
-            return args;
+            args = $"{Path.Combine(GetExeDirectory(), "gitversion.dll")} {args}";
         }
+        return args;
+    }
 
-        public static string GetTempPath() => Path.Combine(GetCurrentDirectory(), "TestRepositories", Guid.NewGuid().ToString());
+    public static string GetTempPath() => Path.Combine(GetCurrentDirectory(), "TestRepositories", Guid.NewGuid().ToString());
 
-        private static string GetExeDirectory() => Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)?.Replace("GitVersion.App.Tests", "GitVersion.App");
-    }
-}
+    private static string GetExeDirectory() => Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)?.Replace("GitVersion.App.Tests", "GitVersion.App");
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Helpers/RuntimeHelper.cs b/src/GitVersion.Core.Tests/Helpers/RuntimeHelper.cs
index 4d5e3d3fe1..e08c88ccf5 100644
--- a/src/GitVersion.Core.Tests/Helpers/RuntimeHelper.cs
+++ b/src/GitVersion.Core.Tests/Helpers/RuntimeHelper.cs
@@ -1,22 +1,21 @@
-namespace GitVersion.Core.Tests.Helpers
+namespace GitVersion.Core.Tests.Helpers;
+
+public static class RuntimeHelper
 {
-    public static class RuntimeHelper
-    {
 #if !NETFRAMEWORK
-        private static bool? _isCoreClr;
+    private static bool? _isCoreClr;
 #endif
 
-        public static bool IsCoreClr()
-        {
+    public static bool IsCoreClr()
+    {
 #if !NETFRAMEWORK
-            _isCoreClr ??= System.Environment.Version.Major >= 5
-                           || System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription.StartsWith(".NET Core");
-            return _isCoreClr.Value;
+        _isCoreClr ??= System.Environment.Version.Major >= 5
+                       || System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription.StartsWith(".NET Core");
+        return _isCoreClr.Value;
 #else
 #pragma warning disable IDE0022 // Use expression body for methods // Cannot be set because of the pragma section
             return false;
 #pragma warning restore IDE0022 // Use expression body for methods
 #endif
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Helpers/TestBase.cs b/src/GitVersion.Core.Tests/Helpers/TestBase.cs
index 7279a2dc48..3299c943b9 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestBase.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestBase.cs
@@ -5,41 +5,40 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion.Core.Tests.Helpers
+namespace GitVersion.Core.Tests.Helpers;
+
+public class TestBase
 {
-    public class TestBase
-    {
-        protected const string NoMonoDescription = "Won't run on Mono due to source information not being available for ShouldMatchApproved.";
-        protected const string NoMono = "NoMono";
-        protected const string NoNet48 = "NoNet48";
-        public const string MainBranch = "main";
+    protected const string NoMonoDescription = "Won't run on Mono due to source information not being available for ShouldMatchApproved.";
+    protected const string NoMono = "NoMono";
+    protected const string NoNet48 = "NoNet48";
+    public const string MainBranch = "main";
 
-        protected static IServiceProvider ConfigureServices(Action<IServiceCollection> overrideServices = null)
-        {
-            var services = new ServiceCollection()
-                .AddModule(new GitVersionCoreTestModule());
+    protected static IServiceProvider ConfigureServices(Action<IServiceCollection> overrideServices = null)
+    {
+        var services = new ServiceCollection()
+            .AddModule(new GitVersionCoreTestModule());
 
-            overrideServices?.Invoke(services);
+        overrideServices?.Invoke(services);
 
-            return services.BuildServiceProvider();
-        }
+        return services.BuildServiceProvider();
+    }
 
-        protected static IServiceProvider BuildServiceProvider(string workingDirectory, IGitRepository repository, string branch, Config config = null)
+    protected static IServiceProvider BuildServiceProvider(string workingDirectory, IGitRepository repository, string branch, Config config = null)
+    {
+        config ??= new ConfigurationBuilder().Build();
+        var options = Options.Create(new GitVersionOptions
         {
-            config ??= new ConfigurationBuilder().Build();
-            var options = Options.Create(new GitVersionOptions
-            {
-                WorkingDirectory = workingDirectory,
-                ConfigInfo = { OverrideConfig = config },
-                RepositoryInfo = { TargetBranch = branch }
-            });
+            WorkingDirectory = workingDirectory,
+            ConfigInfo = { OverrideConfig = config },
+            RepositoryInfo = { TargetBranch = branch }
+        });
 
-            var sp = ConfigureServices(services =>
-            {
-                services.AddSingleton(options);
-                services.AddSingleton(repository);
-            });
-            return sp;
-        }
+        var sp = ConfigureServices(services =>
+        {
+            services.AddSingleton(options);
+            services.AddSingleton(repository);
+        });
+        return sp;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Helpers/TestConsole.cs b/src/GitVersion.Core.Tests/Helpers/TestConsole.cs
index 38886c09e8..86da5e267a 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestConsole.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestConsole.cs
@@ -2,32 +2,31 @@
 using System.Collections.Generic;
 using GitVersion.Logging;
 
-namespace GitVersion.Core.Tests.Helpers
+namespace GitVersion.Core.Tests.Helpers;
+
+public class TestConsole : IConsole
 {
-    public class TestConsole : IConsole
-    {
-        private readonly Queue<string> responses;
-        private readonly ILog log;
+    private readonly Queue<string> responses;
+    private readonly ILog log;
 
-        public TestConsole(params string[] responses)
-        {
-            this.log = new NullLog();
-            this.responses = new Queue<string>(responses);
-        }
+    public TestConsole(params string[] responses)
+    {
+        this.log = new NullLog();
+        this.responses = new Queue<string>(responses);
+    }
 
-        public void WriteLine(string msg) => this.log.Info(msg + System.Environment.NewLine);
+    public void WriteLine(string msg) => this.log.Info(msg + System.Environment.NewLine);
 
-        public void WriteLine() => this.log.Info(System.Environment.NewLine);
+    public void WriteLine() => this.log.Info(System.Environment.NewLine);
 
-        public void Write(string msg) => this.log.Info(msg);
+    public void Write(string msg) => this.log.Info(msg);
 
-        public string ReadLine() => this.responses.Dequeue();
+    public string ReadLine() => this.responses.Dequeue();
 
-        public IDisposable UseColor(ConsoleColor consoleColor) => new NoOpDisposable();
+    public IDisposable UseColor(ConsoleColor consoleColor) => new NoOpDisposable();
 
-        private class NoOpDisposable : IDisposable
-        {
-            public void Dispose() { }
-        }
+    private class NoOpDisposable : IDisposable
+    {
+        public void Dispose() { }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs b/src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs
index aa596d4935..b29638048d 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs
@@ -4,46 +4,45 @@
 using GitVersion.Model.Configuration;
 using GitVersion.VersionCalculation;
 
-namespace GitVersion.Core.Tests.Helpers
+namespace GitVersion.Core.Tests.Helpers;
+
+public class TestEffectiveConfiguration : EffectiveConfiguration
 {
-    public class TestEffectiveConfiguration : EffectiveConfiguration
+    public TestEffectiveConfiguration(
+        AssemblyVersioningScheme assemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
+        AssemblyFileVersioningScheme assemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,
+        string assemblyVersioningFormat = null,
+        string assemblyFileVersioningFormat = null,
+        string assemblyInformationalFormat = null,
+        VersioningMode versioningMode = VersioningMode.ContinuousDelivery,
+        string gitTagPrefix = "v",
+        string tag = "",
+        string nextVersion = null,
+        string branchPrefixToTrim = "",
+        bool preventIncrementForMergedBranchVersion = false,
+        string tagNumberPattern = null,
+        string continuousDeploymentFallbackTag = "ci",
+        bool trackMergeTarget = false,
+        string majorMessage = null,
+        string minorMessage = null,
+        string patchMessage = null,
+        string noBumpMessage = null,
+        CommitMessageIncrementMode commitMessageMode = CommitMessageIncrementMode.Enabled,
+        int legacySemVerPadding = 4,
+        int buildMetaDataPadding = 4,
+        int commitsSinceVersionSourcePadding = 4,
+        IEnumerable<IVersionFilter> versionFilters = null,
+        bool tracksReleaseBranches = false,
+        bool isRelease = false,
+        string commitDateFormat = "yyyy-MM-dd",
+        bool updateBuildNumber = false) :
+        base(assemblyVersioningScheme, assemblyFileVersioningScheme, assemblyInformationalFormat, assemblyVersioningFormat, assemblyFileVersioningFormat, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch,
+            branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,
+            trackMergeTarget,
+            majorMessage, minorMessage, patchMessage, noBumpMessage,
+            commitMessageMode, legacySemVerPadding, buildMetaDataPadding, commitsSinceVersionSourcePadding,
+            versionFilters ?? Enumerable.Empty<IVersionFilter>(),
+            tracksReleaseBranches, isRelease, commitDateFormat, updateBuildNumber, 0, 0)
     {
-        public TestEffectiveConfiguration(
-            AssemblyVersioningScheme assemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
-            AssemblyFileVersioningScheme assemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,
-            string assemblyVersioningFormat = null,
-            string assemblyFileVersioningFormat = null,
-            string assemblyInformationalFormat = null,
-            VersioningMode versioningMode = VersioningMode.ContinuousDelivery,
-            string gitTagPrefix = "v",
-            string tag = "",
-            string nextVersion = null,
-            string branchPrefixToTrim = "",
-            bool preventIncrementForMergedBranchVersion = false,
-            string tagNumberPattern = null,
-            string continuousDeploymentFallbackTag = "ci",
-            bool trackMergeTarget = false,
-            string majorMessage = null,
-            string minorMessage = null,
-            string patchMessage = null,
-            string noBumpMessage = null,
-            CommitMessageIncrementMode commitMessageMode = CommitMessageIncrementMode.Enabled,
-            int legacySemVerPadding = 4,
-            int buildMetaDataPadding = 4,
-            int commitsSinceVersionSourcePadding = 4,
-            IEnumerable<IVersionFilter> versionFilters = null,
-            bool tracksReleaseBranches = false,
-            bool isRelease = false,
-            string commitDateFormat = "yyyy-MM-dd",
-            bool updateBuildNumber = false) :
-            base(assemblyVersioningScheme, assemblyFileVersioningScheme, assemblyInformationalFormat, assemblyVersioningFormat, assemblyFileVersioningFormat, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch,
-                    branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,
-                    trackMergeTarget,
-                    majorMessage, minorMessage, patchMessage, noBumpMessage,
-                    commitMessageMode, legacySemVerPadding, buildMetaDataPadding, commitsSinceVersionSourcePadding,
-                    versionFilters ?? Enumerable.Empty<IVersionFilter>(),
-                    tracksReleaseBranches, isRelease, commitDateFormat, updateBuildNumber, 0, 0)
-        {
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Helpers/TestEnvironment.cs b/src/GitVersion.Core.Tests/Helpers/TestEnvironment.cs
index d351f5fff6..d63ea8f5d8 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestEnvironment.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestEnvironment.cs
@@ -1,15 +1,14 @@
 using System.Collections.Generic;
 
-namespace GitVersion.Core.Tests.Helpers
+namespace GitVersion.Core.Tests.Helpers;
+
+public class TestEnvironment : IEnvironment
 {
-    public class TestEnvironment : IEnvironment
-    {
-        private readonly IDictionary<string, string> map;
+    private readonly IDictionary<string, string> map;
 
-        public TestEnvironment() => this.map = new Dictionary<string, string>();
+    public TestEnvironment() => this.map = new Dictionary<string, string>();
 
-        public string GetEnvironmentVariable(string variableName) => this.map.TryGetValue(variableName, out var val) ? val : null;
+    public string GetEnvironmentVariable(string variableName) => this.map.TryGetValue(variableName, out var val) ? val : null;
 
-        public void SetEnvironmentVariable(string variableName, string value) => this.map[variableName] = value;
-    }
-}
+    public void SetEnvironmentVariable(string variableName, string value) => this.map[variableName] = value;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Helpers/TestFileSystem.cs b/src/GitVersion.Core.Tests/Helpers/TestFileSystem.cs
index a7e2b119d5..0b255d04cf 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestFileSystem.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestFileSystem.cs
@@ -4,114 +4,113 @@
 using System.Text;
 using GitVersion.Helpers;
 
-namespace GitVersion.Core.Tests.Helpers
+namespace GitVersion.Core.Tests.Helpers;
+
+public class TestFileSystem : IFileSystem
 {
-    public class TestFileSystem : IFileSystem
-    {
-        private readonly Dictionary<string, byte[]> fileSystem = new(StringComparerUtils.OsDependentComparer);
+    private readonly Dictionary<string, byte[]> fileSystem = new(StringComparerUtils.OsDependentComparer);
 
-        public void Copy(string from, string to, bool overwrite)
+    public void Copy(string from, string to, bool overwrite)
+    {
+        var fromPath = Path.GetFullPath(from);
+        var toPath = Path.GetFullPath(to);
+        if (this.fileSystem.ContainsKey(toPath))
         {
-            var fromPath = Path.GetFullPath(from);
-            var toPath = Path.GetFullPath(to);
-            if (this.fileSystem.ContainsKey(toPath))
-            {
-                if (overwrite)
-                    this.fileSystem.Remove(toPath);
-                else
-                    throw new IOException("File already exists");
-            }
-
-            if (!this.fileSystem.TryGetValue(fromPath, out var source))
-                throw new FileNotFoundException($"The source file '{fromPath}' was not found", from);
-
-            this.fileSystem.Add(toPath, source);
+            if (overwrite)
+                this.fileSystem.Remove(toPath);
+            else
+                throw new IOException("File already exists");
         }
 
-        public void Move(string from, string to)
-        {
-            var fromPath = Path.GetFullPath(from);
-            Copy(from, to, false);
-            this.fileSystem.Remove(fromPath);
-        }
+        if (!this.fileSystem.TryGetValue(fromPath, out var source))
+            throw new FileNotFoundException($"The source file '{fromPath}' was not found", from);
 
-        public bool Exists(string file)
-        {
-            var path = Path.GetFullPath(file);
-            return this.fileSystem.ContainsKey(path);
-        }
+        this.fileSystem.Add(toPath, source);
+    }
 
-        public void Delete(string path)
-        {
-            var fullPath = Path.GetFullPath(path);
-            this.fileSystem.Remove(fullPath);
-        }
+    public void Move(string from, string to)
+    {
+        var fromPath = Path.GetFullPath(from);
+        Copy(from, to, false);
+        this.fileSystem.Remove(fromPath);
+    }
 
-        public string ReadAllText(string path)
-        {
-            var fullPath = Path.GetFullPath(path);
-            if (!this.fileSystem.TryGetValue(fullPath, out var content))
-                throw new FileNotFoundException($"The file '{fullPath}' was not found", fullPath);
+    public bool Exists(string file)
+    {
+        var path = Path.GetFullPath(file);
+        return this.fileSystem.ContainsKey(path);
+    }
 
-            var encoding = EncodingHelper.DetectEncoding(content) ?? Encoding.UTF8;
-            return encoding.GetString(content);
-        }
+    public void Delete(string path)
+    {
+        var fullPath = Path.GetFullPath(path);
+        this.fileSystem.Remove(fullPath);
+    }
 
-        public void WriteAllText(string file, string fileContents)
-        {
-            var path = Path.GetFullPath(file);
-            var encoding = this.fileSystem.ContainsKey(path)
-                ? EncodingHelper.DetectEncoding(this.fileSystem[path]) ?? Encoding.UTF8
-                : Encoding.UTF8;
-            WriteAllText(path, fileContents, encoding);
-        }
+    public string ReadAllText(string path)
+    {
+        var fullPath = Path.GetFullPath(path);
+        if (!this.fileSystem.TryGetValue(fullPath, out var content))
+            throw new FileNotFoundException($"The file '{fullPath}' was not found", fullPath);
 
-        public void WriteAllText(string file, string fileContents, Encoding encoding)
-        {
-            var path = Path.GetFullPath(file);
-            this.fileSystem[path] = encoding.GetBytes(fileContents);
-        }
+        var encoding = EncodingHelper.DetectEncoding(content) ?? Encoding.UTF8;
+        return encoding.GetString(content);
+    }
 
-        public IEnumerable<string> DirectoryEnumerateFiles(string directory, string searchPattern, SearchOption searchOption) => throw new NotImplementedException();
+    public void WriteAllText(string file, string fileContents)
+    {
+        var path = Path.GetFullPath(file);
+        var encoding = this.fileSystem.ContainsKey(path)
+            ? EncodingHelper.DetectEncoding(this.fileSystem[path]) ?? Encoding.UTF8
+            : Encoding.UTF8;
+        WriteAllText(path, fileContents, encoding);
+    }
 
-        public Stream OpenWrite(string path) => new TestStream(path, this);
+    public void WriteAllText(string file, string fileContents, Encoding encoding)
+    {
+        var path = Path.GetFullPath(file);
+        this.fileSystem[path] = encoding.GetBytes(fileContents);
+    }
+
+    public IEnumerable<string> DirectoryEnumerateFiles(string directory, string searchPattern, SearchOption searchOption) => throw new NotImplementedException();
 
-        public Stream OpenRead(string path)
+    public Stream OpenWrite(string path) => new TestStream(path, this);
+
+    public Stream OpenRead(string path)
+    {
+        var fullPath = Path.GetFullPath(path);
+        if (this.fileSystem.ContainsKey(fullPath))
         {
-            var fullPath = Path.GetFullPath(path);
-            if (this.fileSystem.ContainsKey(fullPath))
-            {
-                var content = this.fileSystem[fullPath];
-                return new MemoryStream(content);
-            }
-
-            throw new FileNotFoundException("File not found.", fullPath);
+            var content = this.fileSystem[fullPath];
+            return new MemoryStream(content);
         }
 
-        public void CreateDirectory(string path)
+        throw new FileNotFoundException("File not found.", fullPath);
+    }
+
+    public void CreateDirectory(string path)
+    {
+        var fullPath = Path.GetFullPath(path);
+        if (this.fileSystem.ContainsKey(fullPath))
         {
-            var fullPath = Path.GetFullPath(path);
-            if (this.fileSystem.ContainsKey(fullPath))
-            {
-                this.fileSystem[fullPath] = Array.Empty<byte>();
-            }
-            else
-            {
-                this.fileSystem.Add(fullPath, Array.Empty<byte>());
-            }
+            this.fileSystem[fullPath] = Array.Empty<byte>();
         }
-
-        public bool DirectoryExists(string path)
+        else
         {
-            var fullPath = Path.GetFullPath(path);
-            return this.fileSystem.ContainsKey(fullPath);
+            this.fileSystem.Add(fullPath, Array.Empty<byte>());
         }
+    }
 
-        public long GetLastDirectoryWrite(string path) => 1;
-
-        public bool PathsEqual(string path, string otherPath) => string.Equals(
-                Path.GetFullPath(path).TrimEnd('\\').TrimEnd('/'),
-                Path.GetFullPath(otherPath).TrimEnd('\\').TrimEnd('/'),
-                StringComparerUtils.OsDependentComparison);
+    public bool DirectoryExists(string path)
+    {
+        var fullPath = Path.GetFullPath(path);
+        return this.fileSystem.ContainsKey(fullPath);
     }
-}
+
+    public long GetLastDirectoryWrite(string path) => 1;
+
+    public bool PathsEqual(string path, string otherPath) => string.Equals(
+        Path.GetFullPath(path).TrimEnd('\\').TrimEnd('/'),
+        Path.GetFullPath(otherPath).TrimEnd('\\').TrimEnd('/'),
+        StringComparerUtils.OsDependentComparison);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Helpers/TestLogAppender.cs b/src/GitVersion.Core.Tests/Helpers/TestLogAppender.cs
index 0c11e54db2..11e1cea32f 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestLogAppender.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestLogAppender.cs
@@ -1,13 +1,12 @@
 using System;
 using GitVersion.Logging;
 
-namespace GitVersion.Core.Tests.Helpers
+namespace GitVersion.Core.Tests.Helpers;
+
+public class TestLogAppender : ILogAppender
 {
-    public class TestLogAppender : ILogAppender
-    {
-        private readonly Action<string> logAction;
+    private readonly Action<string> logAction;
 
-        public TestLogAppender(Action<string> logAction) => this.logAction = logAction;
-        public void WriteTo(LogLevel level, string message) => this.logAction(message);
-    }
-}
+    public TestLogAppender(Action<string> logAction) => this.logAction = logAction;
+    public void WriteTo(LogLevel level, string message) => this.logAction(message);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Helpers/TestStream.cs b/src/GitVersion.Core.Tests/Helpers/TestStream.cs
index 1a353fa299..d576eefa4e 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestStream.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestStream.cs
@@ -1,49 +1,48 @@
 using System.IO;
 
-namespace GitVersion.Core.Tests.Helpers
+namespace GitVersion.Core.Tests.Helpers;
+
+public class TestStream : Stream
 {
-    public class TestStream : Stream
+    private readonly string path;
+    private readonly TestFileSystem testFileSystem;
+    private readonly MemoryStream underlying = new();
+
+    public TestStream(string path, TestFileSystem testFileSystem)
+    {
+        this.path = path;
+        this.testFileSystem = testFileSystem;
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        Flush();
+        base.Dispose(disposing);
+    }
+
+    public override void Flush()
+    {
+        this.underlying.Position = 0;
+        var readToEnd = new StreamReader(this.underlying).ReadToEnd();
+        this.testFileSystem.WriteAllText(this.path, readToEnd);
+    }
+
+    public override long Seek(long offset, SeekOrigin origin) => this.underlying.Seek(offset, origin);
+
+    public override void SetLength(long value) => this.underlying.SetLength(value);
+
+    public override int Read(byte[] buffer, int offset, int count) => this.underlying.Read(buffer, offset, count);
+
+    public override void Write(byte[] buffer, int offset, int count) => this.underlying.Write(buffer, offset, count);
+
+    public override bool CanRead => this.underlying.CanRead;
+    public override bool CanSeek => this.underlying.CanSeek;
+    public override bool CanWrite => this.underlying.CanWrite;
+    public override long Length => this.underlying.Length;
+
+    public override long Position
     {
-        private readonly string path;
-        private readonly TestFileSystem testFileSystem;
-        private readonly MemoryStream underlying = new();
-
-        public TestStream(string path, TestFileSystem testFileSystem)
-        {
-            this.path = path;
-            this.testFileSystem = testFileSystem;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            Flush();
-            base.Dispose(disposing);
-        }
-
-        public override void Flush()
-        {
-            this.underlying.Position = 0;
-            var readToEnd = new StreamReader(this.underlying).ReadToEnd();
-            this.testFileSystem.WriteAllText(this.path, readToEnd);
-        }
-
-        public override long Seek(long offset, SeekOrigin origin) => this.underlying.Seek(offset, origin);
-
-        public override void SetLength(long value) => this.underlying.SetLength(value);
-
-        public override int Read(byte[] buffer, int offset, int count) => this.underlying.Read(buffer, offset, count);
-
-        public override void Write(byte[] buffer, int offset, int count) => this.underlying.Write(buffer, offset, count);
-
-        public override bool CanRead => this.underlying.CanRead;
-        public override bool CanSeek => this.underlying.CanSeek;
-        public override bool CanWrite => this.underlying.CanWrite;
-        public override long Length => this.underlying.Length;
-
-        public override long Position
-        {
-            get => this.underlying.Position;
-            set => this.underlying.Position = value;
-        }
+        get => this.underlying.Position;
+        set => this.underlying.Position = value;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Helpers/TestableVersionVariables.cs b/src/GitVersion.Core.Tests/Helpers/TestableVersionVariables.cs
index 60082319f1..8a92d66c1e 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestableVersionVariables.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestableVersionVariables.cs
@@ -1,26 +1,25 @@
 using GitVersion.OutputVariables;
 
-namespace GitVersion.Core.Tests.Helpers
+namespace GitVersion.Core.Tests.Helpers;
+
+internal class TestableVersionVariables : VersionVariables
 {
-    internal class TestableVersionVariables : VersionVariables
+    public TestableVersionVariables(
+        string major = "", string minor = "", string patch = "", string buildMetaData = "",
+        string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "",
+        string escapedBranchName = "", string sha = "", string shortSha = "", string majorMinorPatch = "",
+        string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "",
+        string assemblySemVer = "", string assemblySemFileVer = "", string preReleaseTag = "",
+        string preReleaseTagWithDash = "", string preReleaseLabel = "", string preReleaseLabelWithDash = "", string preReleaseNumber = "",
+        string weightedPreReleaseNumber = "", string informationalVersion = "", string commitDate = "",
+        string nugetVersion = "", string nugetVersionV2 = "", string nugetPreReleaseTag = "",
+        string nugetPreReleaseTagV2 = "", string versionSourceSha = "", string commitsSinceVersionSource = "",
+        string commitsSinceVersionSourcePadded = "", string uncommittedChanges = "") : base(
+        major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, escapedBranchName,
+        sha, shortSha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer,
+        assemblySemVer, assemblySemFileVer, preReleaseTag, weightedPreReleaseNumber, preReleaseTagWithDash,
+        preReleaseLabel, preReleaseLabelWithDash, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2,
+        nugetPreReleaseTag, nugetPreReleaseTagV2, versionSourceSha, commitsSinceVersionSource, commitsSinceVersionSourcePadded, uncommittedChanges)
     {
-        public TestableVersionVariables(
-            string major = "", string minor = "", string patch = "", string buildMetaData = "",
-            string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "",
-            string escapedBranchName = "", string sha = "", string shortSha = "", string majorMinorPatch = "",
-            string semVer = "", string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "",
-            string assemblySemVer = "", string assemblySemFileVer = "", string preReleaseTag = "",
-            string preReleaseTagWithDash = "", string preReleaseLabel = "", string preReleaseLabelWithDash = "", string preReleaseNumber = "",
-            string weightedPreReleaseNumber = "", string informationalVersion = "", string commitDate = "",
-            string nugetVersion = "", string nugetVersionV2 = "", string nugetPreReleaseTag = "",
-            string nugetPreReleaseTagV2 = "", string versionSourceSha = "", string commitsSinceVersionSource = "",
-            string commitsSinceVersionSourcePadded = "", string uncommittedChanges = "") : base(
-                major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName, escapedBranchName,
-                sha, shortSha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer,
-                assemblySemVer, assemblySemFileVer, preReleaseTag, weightedPreReleaseNumber, preReleaseTagWithDash,
-                preReleaseLabel, preReleaseLabelWithDash, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2,
-                nugetPreReleaseTag, nugetPreReleaseTagV2, versionSourceSha, commitsSinceVersionSource, commitsSinceVersionSourcePadded, uncommittedChanges)
-        {
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/BranchWithoutCommitScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/BranchWithoutCommitScenarios.cs
index 05031627e2..a5c16ff5b3 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/BranchWithoutCommitScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/BranchWithoutCommitScenarios.cs
@@ -3,38 +3,37 @@
 using LibGit2Sharp;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class BranchWithoutCommitScenarios : TestBase
 {
-    [TestFixture]
-    public class BranchWithoutCommitScenarios : TestBase
+    [Test]
+    public void CanTakeVersionFromReleaseBranch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.3");
+        var commit = fixture.Repository.MakeACommit();
+        fixture.Repository.CreateBranch("release-4.0.123");
+        fixture.Checkout(commit.Sha);
+
+        fixture.AssertFullSemver("4.0.123-beta.1+0", null, fixture.Repository, commit.Sha, onlyTrackedBranches: false, targetBranch: "release-4.0.123");
+    }
+
+    [Test]
+    public void BranchVersionHavePrecedenceOverTagVersionIfVersionGreaterThanTag()
     {
-        [Test]
-        public void CanTakeVersionFromReleaseBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.3");
-            var commit = fixture.Repository.MakeACommit();
-            fixture.Repository.CreateBranch("release-4.0.123");
-            fixture.Checkout(commit.Sha);
-
-            fixture.AssertFullSemver("4.0.123-beta.1+0", null, fixture.Repository, commit.Sha, onlyTrackedBranches: false, targetBranch: "release-4.0.123");
-        }
-
-        [Test]
-        public void BranchVersionHavePrecedenceOverTagVersionIfVersionGreaterThanTag()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-
-            fixture.Repository.MakeACommit();
-
-            fixture.Repository.CreateBranch("develop");
-            fixture.Checkout("develop");
-            fixture.MakeATaggedCommit("0.1.0-alpha.1"); // simulate merge from feature branch
-
-            fixture.Repository.CreateBranch("release/1.0");
-            fixture.Checkout("release/1.0");
-
-            fixture.AssertFullSemver("1.0.0-beta.1+0");
-        }
+        using var fixture = new EmptyRepositoryFixture();
+
+        fixture.Repository.MakeACommit();
+
+        fixture.Repository.CreateBranch("develop");
+        fixture.Checkout("develop");
+        fixture.MakeATaggedCommit("0.1.0-alpha.1"); // simulate merge from feature branch
+
+        fixture.Repository.CreateBranch("release/1.0");
+        fixture.Checkout("release/1.0");
+
+        fixture.AssertFullSemver("1.0.0-beta.1+0");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs
index 649dbe5876..6e927b5305 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs
@@ -6,398 +6,397 @@
 using LibGit2Sharp;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class DevelopScenarios : TestBase
 {
-    [TestFixture]
-    public class DevelopScenarios : TestBase
+    [Test]
+    public void WhenDevelopHasMultipleCommitsSpecifyExistingCommitId()
     {
-        [Test]
-        public void WhenDevelopHasMultipleCommitsSpecifyExistingCommitId()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
 
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
-            var thirdCommit = fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
+        var thirdCommit = fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
 
-            fixture.AssertFullSemver("1.1.0-alpha.3", commitId: thirdCommit.Sha);
-        }
+        fixture.AssertFullSemver("1.1.0-alpha.3", commitId: thirdCommit.Sha);
+    }
 
-        [Test]
-        public void WhenDevelopHasMultipleCommitsSpecifyNonExistingCommitId()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+    [Test]
+    public void WhenDevelopHasMultipleCommitsSpecifyNonExistingCommitId()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
 
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
 
-            fixture.AssertFullSemver("1.1.0-alpha.5", commitId: "nonexistingcommitid");
-        }
+        fixture.AssertFullSemver("1.1.0-alpha.5", commitId: "nonexistingcommitid");
+    }
 
-        [Test]
-        public void WhenDevelopBranchedFromTaggedCommitOnMainVersionDoesNotChange()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            fixture.AssertFullSemver("1.0.0");
-        }
-
-        [Test]
-        public void CanChangeDevelopTagViaConfig()
+    [Test]
+    public void WhenDevelopBranchedFromTaggedCommitOnMainVersionDoesNotChange()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        fixture.AssertFullSemver("1.0.0");
+    }
+
+    [Test]
+    public void CanChangeDevelopTagViaConfig()
+    {
+        var config = new Config
         {
-            var config = new Config
+            Branches =
             {
-                Branches =
                 {
+                    "develop",
+                    new BranchConfig
                     {
-                        "develop",
-                        new BranchConfig
-                        {
-                            Tag = "alpha",
-                            SourceBranches = new HashSet<string>()
-                        }
+                        Tag = "alpha",
+                        SourceBranches = new HashSet<string>()
                     }
                 }
-            };
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.1.0-alpha.1", config);
-        }
-
-        [Test]
-        public void WhenDeveloperBranchExistsDontTreatAsDevelop()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("developer"));
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.0.1-developer.1+1"); // this tag should be the branch name by default, not unstable
-        }
-
-        [Test]
-        public void WhenDevelopBranchedFromMainMinorIsIncreased()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.1.0-alpha.1");
-        }
-
-        [Test]
-        public void MergingReleaseBranchBackIntoDevelopWithMergingToMainDoesBumpDevelopVersion()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("release-2.0.0"));
-            fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, MainBranch);
-            fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
-
-            Commands.Checkout(fixture.Repository, "develop");
-            fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
-            fixture.AssertFullSemver("2.1.0-alpha.2");
-        }
-
-        [Test]
-        public void CanHandleContinuousDelivery()
-        {
-            var config = new Config
-            {
-                Branches = { { "develop", new BranchConfig { VersioningMode = VersioningMode.ContinuousDelivery } } }
-            };
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            fixture.Repository.MakeATaggedCommit("1.1.0-alpha7");
-            fixture.AssertFullSemver("1.1.0-alpha.7", config);
-        }
-
-        [Test]
-        public void WhenDevelopBranchedFromMainDetachedHeadMinorIsIncreased()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            fixture.Repository.MakeACommit();
-            var commit = fixture.Repository.Head.Tip;
-            fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, commit);
-            fixture.AssertFullSemver("1.1.0-alpha.1", onlyTrackedBranches: false);
-        }
-
-        [Test]
-        public void InheritVersionFromReleaseBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeATaggedCommit("1.0.0");
-            fixture.BranchTo("develop");
-            fixture.MakeACommit();
-            fixture.BranchTo("release/2.0.0");
-            fixture.MakeACommit();
-            fixture.MakeACommit();
-            fixture.Checkout("develop");
-            fixture.AssertFullSemver("1.1.0-alpha.1");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("2.1.0-alpha.1");
-            fixture.MergeNoFF("release/2.0.0");
-            fixture.AssertFullSemver("2.1.0-alpha.4");
-            fixture.BranchTo("feature/MyFeature");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("2.1.0-MyFeature.1+5");
-        }
-
-        [Test]
-        public void WhenMultipleDevelopBranchesExistAndCurrentBranchHasIncrementInheritPolicyAndCurrentCommitIsAMerge()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.CreateBranch("bob_develop");
-            fixture.Repository.CreateBranch("develop");
-            fixture.Repository.CreateBranch("feature/x");
+            }
+        };
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("1.1.0-alpha.1", config);
+    }
 
-            Commands.Checkout(fixture.Repository, "develop");
-            fixture.Repository.MakeACommit();
+    [Test]
+    public void WhenDeveloperBranchExistsDontTreatAsDevelop()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("developer"));
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("1.0.1-developer.1+1"); // this tag should be the branch name by default, not unstable
+    }
 
-            Commands.Checkout(fixture.Repository, "feature/x");
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MergeNoFF("develop");
+    [Test]
+    public void WhenDevelopBranchedFromMainMinorIsIncreased()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("1.1.0-alpha.1");
+    }
 
-            fixture.AssertFullSemver("1.1.0-x.1+3");
-        }
+    [Test]
+    public void MergingReleaseBranchBackIntoDevelopWithMergingToMainDoesBumpDevelopVersion()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("release-2.0.0"));
+        fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, MainBranch);
+        fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
+
+        Commands.Checkout(fixture.Repository, "develop");
+        fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
+        fixture.AssertFullSemver("2.1.0-alpha.2");
+    }
 
-        [Test]
-        public void TagOnHotfixShouldNotAffectDevelop()
-        {
-            using var fixture = new BaseGitFlowRepositoryFixture("1.2.0");
-            Commands.Checkout(fixture.Repository, MainBranch);
-            var hotfix = fixture.Repository.CreateBranch("hotfix-1.2.1");
-            Commands.Checkout(fixture.Repository, hotfix);
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.2.1-beta.1+1");
-            fixture.Repository.ApplyTag("1.2.1-beta.1");
-            fixture.AssertFullSemver("1.2.1-beta.1");
-            Commands.Checkout(fixture.Repository, "develop");
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.3.0-alpha.2");
-        }
-
-        [Test]
-        public void CommitsSinceVersionSourceShouldNotGoDownUponGitFlowReleaseFinish()
+    [Test]
+    public void CanHandleContinuousDelivery()
+    {
+        var config = new Config
         {
-            var config = new Config
-            {
-                VersioningMode = VersioningMode.ContinuousDeployment
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit();
-            fixture.ApplyTag("1.1.0");
-            fixture.BranchTo("develop");
-            fixture.MakeACommit("commit in develop - 1");
-            fixture.AssertFullSemver("1.2.0-alpha.1");
-            fixture.BranchTo("release/1.2.0");
-            fixture.AssertFullSemver("1.2.0-beta.1+0");
-            fixture.Checkout("develop");
-            fixture.MakeACommit("commit in develop - 2");
-            fixture.MakeACommit("commit in develop - 3");
-            fixture.MakeACommit("commit in develop - 4");
-            fixture.MakeACommit("commit in develop - 5");
-            fixture.AssertFullSemver("1.3.0-alpha.4");
-            fixture.Checkout("release/1.2.0");
-            fixture.MakeACommit("commit in release/1.2.0 - 1");
-            fixture.MakeACommit("commit in release/1.2.0 - 2");
-            fixture.MakeACommit("commit in release/1.2.0 - 3");
-            fixture.AssertFullSemver("1.2.0-beta.1+3");
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("release/1.2.0");
-            fixture.ApplyTag("1.2.0");
-            fixture.Checkout("develop");
-            fixture.MergeNoFF("release/1.2.0");
-            fixture.MakeACommit("commit in develop - 6");
-            fixture.AssertFullSemver("1.3.0-alpha.9");
-            fixture.SequenceDiagram.Destroy("release/1.2.0");
-            fixture.Repository.Branches.Remove("release/1.2.0");
-
-            var expectedFullSemVer = "1.3.0-alpha.9";
-            fixture.AssertFullSemver(expectedFullSemVer, config);
-        }
-
-        [Test]
-        public void CommitsSinceVersionSourceShouldNotGoDownUponMergingFeatureOnlyToDevelop()
+            Branches = { { "develop", new BranchConfig { VersioningMode = VersioningMode.ContinuousDelivery } } }
+        };
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        fixture.Repository.MakeATaggedCommit("1.1.0-alpha7");
+        fixture.AssertFullSemver("1.1.0-alpha.7", config);
+    }
+
+    [Test]
+    public void WhenDevelopBranchedFromMainDetachedHeadMinorIsIncreased()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        fixture.Repository.MakeACommit();
+        var commit = fixture.Repository.Head.Tip;
+        fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, commit);
+        fixture.AssertFullSemver("1.1.0-alpha.1", onlyTrackedBranches: false);
+    }
+
+    [Test]
+    public void InheritVersionFromReleaseBranch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeATaggedCommit("1.0.0");
+        fixture.BranchTo("develop");
+        fixture.MakeACommit();
+        fixture.BranchTo("release/2.0.0");
+        fixture.MakeACommit();
+        fixture.MakeACommit();
+        fixture.Checkout("develop");
+        fixture.AssertFullSemver("1.1.0-alpha.1");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("2.1.0-alpha.1");
+        fixture.MergeNoFF("release/2.0.0");
+        fixture.AssertFullSemver("2.1.0-alpha.4");
+        fixture.BranchTo("feature/MyFeature");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("2.1.0-MyFeature.1+5");
+    }
+
+    [Test]
+    public void WhenMultipleDevelopBranchesExistAndCurrentBranchHasIncrementInheritPolicyAndCurrentCommitIsAMerge()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.CreateBranch("bob_develop");
+        fixture.Repository.CreateBranch("develop");
+        fixture.Repository.CreateBranch("feature/x");
+
+        Commands.Checkout(fixture.Repository, "develop");
+        fixture.Repository.MakeACommit();
+
+        Commands.Checkout(fixture.Repository, "feature/x");
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MergeNoFF("develop");
+
+        fixture.AssertFullSemver("1.1.0-x.1+3");
+    }
+
+    [Test]
+    public void TagOnHotfixShouldNotAffectDevelop()
+    {
+        using var fixture = new BaseGitFlowRepositoryFixture("1.2.0");
+        Commands.Checkout(fixture.Repository, MainBranch);
+        var hotfix = fixture.Repository.CreateBranch("hotfix-1.2.1");
+        Commands.Checkout(fixture.Repository, hotfix);
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("1.2.1-beta.1+1");
+        fixture.Repository.ApplyTag("1.2.1-beta.1");
+        fixture.AssertFullSemver("1.2.1-beta.1");
+        Commands.Checkout(fixture.Repository, "develop");
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("1.3.0-alpha.2");
+    }
+
+    [Test]
+    public void CommitsSinceVersionSourceShouldNotGoDownUponGitFlowReleaseFinish()
+    {
+        var config = new Config
         {
-            var config = new Config
-            {
-                VersioningMode = VersioningMode.ContinuousDeployment
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit($"commit in {MainBranch} - 1");
-            fixture.ApplyTag("1.1.0");
-            fixture.BranchTo("develop");
-            fixture.MakeACommit("commit in develop - 1");
-            fixture.AssertFullSemver("1.2.0-alpha.1");
-            fixture.BranchTo("release/1.2.0");
-            fixture.MakeACommit("commit in release - 1");
-            fixture.MakeACommit("commit in release - 2");
-            fixture.MakeACommit("commit in release - 3");
-            fixture.AssertFullSemver("1.2.0-beta.1+3");
-            fixture.ApplyTag("1.2.0");
-            fixture.Checkout("develop");
-            fixture.MakeACommit("commit in develop - 2");
-            fixture.AssertFullSemver("1.3.0-alpha.1");
-            fixture.MergeNoFF("release/1.2.0");
-            fixture.AssertFullSemver("1.3.0-alpha.5");
-            fixture.SequenceDiagram.Destroy("release/1.2.0");
-            fixture.Repository.Branches.Remove("release/1.2.0");
-
-            var expectedFullSemVer = "1.3.0-alpha.5";
-            fixture.AssertFullSemver(expectedFullSemVer, config);
-        }
-
-        [Test]
-        public void PreviousPreReleaseTagShouldBeRespectedWhenCountingCommits()
+            VersioningMode = VersioningMode.ContinuousDeployment
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.ApplyTag("1.1.0");
+        fixture.BranchTo("develop");
+        fixture.MakeACommit("commit in develop - 1");
+        fixture.AssertFullSemver("1.2.0-alpha.1");
+        fixture.BranchTo("release/1.2.0");
+        fixture.AssertFullSemver("1.2.0-beta.1+0");
+        fixture.Checkout("develop");
+        fixture.MakeACommit("commit in develop - 2");
+        fixture.MakeACommit("commit in develop - 3");
+        fixture.MakeACommit("commit in develop - 4");
+        fixture.MakeACommit("commit in develop - 5");
+        fixture.AssertFullSemver("1.3.0-alpha.4");
+        fixture.Checkout("release/1.2.0");
+        fixture.MakeACommit("commit in release/1.2.0 - 1");
+        fixture.MakeACommit("commit in release/1.2.0 - 2");
+        fixture.MakeACommit("commit in release/1.2.0 - 3");
+        fixture.AssertFullSemver("1.2.0-beta.1+3");
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("release/1.2.0");
+        fixture.ApplyTag("1.2.0");
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("release/1.2.0");
+        fixture.MakeACommit("commit in develop - 6");
+        fixture.AssertFullSemver("1.3.0-alpha.9");
+        fixture.SequenceDiagram.Destroy("release/1.2.0");
+        fixture.Repository.Branches.Remove("release/1.2.0");
+
+        var expectedFullSemVer = "1.3.0-alpha.9";
+        fixture.AssertFullSemver(expectedFullSemVer, config);
+    }
+
+    [Test]
+    public void CommitsSinceVersionSourceShouldNotGoDownUponMergingFeatureOnlyToDevelop()
+    {
+        var config = new Config
         {
-            using var fixture = new EmptyRepositoryFixture();
+            VersioningMode = VersioningMode.ContinuousDeployment
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit($"commit in {MainBranch} - 1");
+        fixture.ApplyTag("1.1.0");
+        fixture.BranchTo("develop");
+        fixture.MakeACommit("commit in develop - 1");
+        fixture.AssertFullSemver("1.2.0-alpha.1");
+        fixture.BranchTo("release/1.2.0");
+        fixture.MakeACommit("commit in release - 1");
+        fixture.MakeACommit("commit in release - 2");
+        fixture.MakeACommit("commit in release - 3");
+        fixture.AssertFullSemver("1.2.0-beta.1+3");
+        fixture.ApplyTag("1.2.0");
+        fixture.Checkout("develop");
+        fixture.MakeACommit("commit in develop - 2");
+        fixture.AssertFullSemver("1.3.0-alpha.1");
+        fixture.MergeNoFF("release/1.2.0");
+        fixture.AssertFullSemver("1.3.0-alpha.5");
+        fixture.SequenceDiagram.Destroy("release/1.2.0");
+        fixture.Repository.Branches.Remove("release/1.2.0");
+
+        var expectedFullSemVer = "1.3.0-alpha.5";
+        fixture.AssertFullSemver(expectedFullSemVer, config);
+    }
+
+    [Test]
+    public void PreviousPreReleaseTagShouldBeRespectedWhenCountingCommits()
+    {
+        using var fixture = new EmptyRepositoryFixture();
 
-            fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
 
-            fixture.BranchTo("develop");
-            fixture.MakeATaggedCommit("1.0.0-alpha.3"); // manual bump version
+        fixture.BranchTo("develop");
+        fixture.MakeATaggedCommit("1.0.0-alpha.3"); // manual bump version
 
-            fixture.MakeACommit();
-            fixture.MakeACommit();
+        fixture.MakeACommit();
+        fixture.MakeACommit();
 
-            fixture.AssertFullSemver("1.0.0-alpha.5");
-        }
+        fixture.AssertFullSemver("1.0.0-alpha.5");
+    }
 
-        [Test]
-        public void WhenPreventIncrementOfMergedBranchVersionIsSetToFalseForDevelopCommitsSinceVersionSourceShouldNotGoDownWhenMergingReleaseToDevelop()
+    [Test]
+    public void WhenPreventIncrementOfMergedBranchVersionIsSetToFalseForDevelopCommitsSinceVersionSourceShouldNotGoDownWhenMergingReleaseToDevelop()
+    {
+        var config = new Config
         {
-            var config = new Config
-            {
-                VersioningMode = VersioningMode.ContinuousDeployment,
-                Branches = new Dictionary<string, BranchConfig>
-                {
-                    { "develop", new BranchConfig { PreventIncrementOfMergedBranchVersion = false } },
-                }
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            const string ReleaseBranch = "release/1.1.0";
-            fixture.MakeACommit();
-            fixture.BranchTo("develop");
-            fixture.MakeATaggedCommit("1.0.0");
-            fixture.Repository.MakeCommits(1);
-
-            // Create a release branch and make some commits
-            fixture.BranchTo(ReleaseBranch);
-            fixture.Repository.MakeCommits(3);
-
-            // Simulate a GitFlow release finish.
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF(ReleaseBranch);
-            fixture.ApplyTag("v1.1.0");
-            fixture.Checkout("develop");
-            // Simulate some work done on develop while the release branch was open.
-            fixture.Repository.MakeCommits(2);
-            fixture.MergeNoFF(ReleaseBranch);
-
-            // Version numbers will still be correct when the release branch is around.
-            fixture.AssertFullSemver("1.2.0-alpha.6");
-            fixture.AssertFullSemver("1.2.0-alpha.6", config);
-
-            var versionSourceBeforeReleaseBranchIsRemoved = fixture.GetVersion(config).Sha;
-
-            fixture.Repository.Branches.Remove(ReleaseBranch);
-            var versionSourceAfterReleaseBranchIsRemoved = fixture.GetVersion(config).Sha;
-            Assert.AreEqual(versionSourceBeforeReleaseBranchIsRemoved, versionSourceAfterReleaseBranchIsRemoved);
-            fixture.AssertFullSemver("1.2.0-alpha.6");
-            fixture.AssertFullSemver("1.2.0-alpha.6", config);
-
-            config.Branches = new Dictionary<string, BranchConfig>
+            VersioningMode = VersioningMode.ContinuousDeployment,
+            Branches = new Dictionary<string, BranchConfig>
             {
-                { "develop", new BranchConfig { PreventIncrementOfMergedBranchVersion = true } },
-            };
-            fixture.AssertFullSemver("1.2.0-alpha.3", config);
-        }
+                { "develop", new BranchConfig { PreventIncrementOfMergedBranchVersion = false } },
+            }
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        const string ReleaseBranch = "release/1.1.0";
+        fixture.MakeACommit();
+        fixture.BranchTo("develop");
+        fixture.MakeATaggedCommit("1.0.0");
+        fixture.Repository.MakeCommits(1);
+
+        // Create a release branch and make some commits
+        fixture.BranchTo(ReleaseBranch);
+        fixture.Repository.MakeCommits(3);
+
+        // Simulate a GitFlow release finish.
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF(ReleaseBranch);
+        fixture.ApplyTag("v1.1.0");
+        fixture.Checkout("develop");
+        // Simulate some work done on develop while the release branch was open.
+        fixture.Repository.MakeCommits(2);
+        fixture.MergeNoFF(ReleaseBranch);
+
+        // Version numbers will still be correct when the release branch is around.
+        fixture.AssertFullSemver("1.2.0-alpha.6");
+        fixture.AssertFullSemver("1.2.0-alpha.6", config);
+
+        var versionSourceBeforeReleaseBranchIsRemoved = fixture.GetVersion(config).Sha;
+
+        fixture.Repository.Branches.Remove(ReleaseBranch);
+        var versionSourceAfterReleaseBranchIsRemoved = fixture.GetVersion(config).Sha;
+        Assert.AreEqual(versionSourceBeforeReleaseBranchIsRemoved, versionSourceAfterReleaseBranchIsRemoved);
+        fixture.AssertFullSemver("1.2.0-alpha.6");
+        fixture.AssertFullSemver("1.2.0-alpha.6", config);
+
+        config.Branches = new Dictionary<string, BranchConfig>
+        {
+            { "develop", new BranchConfig { PreventIncrementOfMergedBranchVersion = true } },
+        };
+        fixture.AssertFullSemver("1.2.0-alpha.3", config);
+    }
 
-        [Test]
-        public void WhenPreventIncrementOfMergedBranchVersionIsSetToFalseForDevelopCommitsSinceVersionSourceShouldNotGoDownWhenMergingHotfixToDevelop()
+    [Test]
+    public void WhenPreventIncrementOfMergedBranchVersionIsSetToFalseForDevelopCommitsSinceVersionSourceShouldNotGoDownWhenMergingHotfixToDevelop()
+    {
+        var config = new Config
         {
-            var config = new Config
+            VersioningMode = VersioningMode.ContinuousDeployment,
+            Branches = new Dictionary<string, BranchConfig>
             {
-                VersioningMode = VersioningMode.ContinuousDeployment,
-                Branches = new Dictionary<string, BranchConfig>
-                {
-                    { "develop", new BranchConfig { PreventIncrementOfMergedBranchVersion = false } },
-                    { "hotfix", new BranchConfig { PreventIncrementOfMergedBranchVersion = true, Regex = "^(origin/)?hotfix[/-]" } },
-
-                }
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit();
-            fixture.BranchTo("develop");
-            fixture.MakeATaggedCommit("1.0.0");
-            fixture.Repository.MakeCommits(1);
-
-            fixture.Checkout("develop");
-            fixture.Repository.MakeCommits(3);
-            fixture.AssertFullSemver("1.1.0-alpha.4", config);
-
-            const string ReleaseBranch = "release/1.1.0";
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch(ReleaseBranch));
-            fixture.Repository.MakeCommits(3);
-            fixture.AssertFullSemver("1.1.0-beta.3", config);
-
-            // Simulate a GitFlow release finish.
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF(ReleaseBranch);
-            fixture.ApplyTag("v1.1.0");
-            fixture.Checkout("develop");
-
-            // Simulate some work done on develop while the release branch was open.
-            fixture.Repository.MakeCommits(2);
-            fixture.MergeNoFF(ReleaseBranch);
-            fixture.Repository.Branches.Remove(ReleaseBranch);
-            fixture.AssertFullSemver("1.2.0-alpha.6", config);
-
-            // Create hotfix for defects found in release/1.1.0
-            const string HotfixBranch = "hotfix/1.1.1";
-            fixture.Checkout(MainBranch);
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch(HotfixBranch));
-            fixture.Repository.MakeCommits(3);
-
-            // Hotfix finish
-            fixture.Checkout(MainBranch);
-            fixture.Repository.MergeNoFF(HotfixBranch);
-            fixture.Repository.ApplyTag("v1.1.1");
-
-            // Verify develop version
-            fixture.Checkout("develop");
-            // Simulate some work done on develop while the hotfix branch was open.
-            fixture.Repository.MakeCommits(3);
-            fixture.AssertFullSemver("1.2.0-alpha.9", config);
-            fixture.Repository.MergeNoFF(HotfixBranch);
-            fixture.AssertFullSemver("1.2.0-alpha.19", config);
-
-            fixture.Repository.Branches.Remove(HotfixBranch);
-            fixture.AssertFullSemver("1.2.0-alpha.19", config);
-        }
+                { "develop", new BranchConfig { PreventIncrementOfMergedBranchVersion = false } },
+                { "hotfix", new BranchConfig { PreventIncrementOfMergedBranchVersion = true, Regex = "^(origin/)?hotfix[/-]" } },
+
+            }
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.BranchTo("develop");
+        fixture.MakeATaggedCommit("1.0.0");
+        fixture.Repository.MakeCommits(1);
+
+        fixture.Checkout("develop");
+        fixture.Repository.MakeCommits(3);
+        fixture.AssertFullSemver("1.1.0-alpha.4", config);
+
+        const string ReleaseBranch = "release/1.1.0";
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch(ReleaseBranch));
+        fixture.Repository.MakeCommits(3);
+        fixture.AssertFullSemver("1.1.0-beta.3", config);
+
+        // Simulate a GitFlow release finish.
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF(ReleaseBranch);
+        fixture.ApplyTag("v1.1.0");
+        fixture.Checkout("develop");
+
+        // Simulate some work done on develop while the release branch was open.
+        fixture.Repository.MakeCommits(2);
+        fixture.MergeNoFF(ReleaseBranch);
+        fixture.Repository.Branches.Remove(ReleaseBranch);
+        fixture.AssertFullSemver("1.2.0-alpha.6", config);
+
+        // Create hotfix for defects found in release/1.1.0
+        const string HotfixBranch = "hotfix/1.1.1";
+        fixture.Checkout(MainBranch);
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch(HotfixBranch));
+        fixture.Repository.MakeCommits(3);
+
+        // Hotfix finish
+        fixture.Checkout(MainBranch);
+        fixture.Repository.MergeNoFF(HotfixBranch);
+        fixture.Repository.ApplyTag("v1.1.1");
+
+        // Verify develop version
+        fixture.Checkout("develop");
+        // Simulate some work done on develop while the hotfix branch was open.
+        fixture.Repository.MakeCommits(3);
+        fixture.AssertFullSemver("1.2.0-alpha.9", config);
+        fixture.Repository.MergeNoFF(HotfixBranch);
+        fixture.AssertFullSemver("1.2.0-alpha.19", config);
+
+        fixture.Repository.Branches.Remove(HotfixBranch);
+        fixture.AssertFullSemver("1.2.0-alpha.19", config);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs
index 8d72f3afc5..45745fba91 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs
@@ -4,405 +4,404 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class DocumentationSamples : TestBase
 {
-    [TestFixture]
-    public class DocumentationSamples : TestBase
+    [Test]
+    public void GitFlowFeatureBranch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.SequenceDiagram.Participant(MainBranch);
+        fixture.SequenceDiagram.Participant("develop");
+
+        // GitFlow setup
+        fixture.Repository.MakeACommit();
+        fixture.ApplyTag("1.2.0");
+        fixture.BranchTo("develop");
+
+        // Branch to develop
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.3.0-alpha.1");
+
+        // Open Pull Request
+        fixture.BranchTo("feature/myfeature", "feature");
+        fixture.SequenceDiagram.Activate("feature/myfeature");
+        fixture.AssertFullSemver("1.3.0-myfeature.1+1");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.3.0-myfeature.1+2");
+
+        // Merge into develop
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("feature/myfeature");
+        fixture.SequenceDiagram.Destroy("feature/myfeature");
+        fixture.SequenceDiagram.NoteOver("Feature branches should\r\n" +
+                                         "be deleted once merged", "feature/myfeature");
+        fixture.AssertFullSemver("1.3.0-alpha.3");
+        Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
+    }
+
+    [Test]
+    public void GitFlowPullRequestBranch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.SequenceDiagram.Participant(MainBranch);
+        fixture.SequenceDiagram.Participant("develop");
+
+        // GitFlow setup
+        fixture.Repository.MakeACommit();
+        fixture.ApplyTag("1.2.0");
+        fixture.BranchTo("develop");
+
+        // Branch to develop
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.3.0-alpha.1");
+
+        // Open Pull Request
+        fixture.BranchTo("pull/2/merge", "pr");
+        fixture.SequenceDiagram.Activate("pull/2/merge");
+        fixture.AssertFullSemver("1.3.0-PullRequest0002.1");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.3.0-PullRequest0002.2");
+
+        // Merge into develop
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("pull/2/merge");
+        fixture.SequenceDiagram.Destroy("pull/2/merge");
+        fixture.SequenceDiagram.NoteOver("Feature branches/pr's should\r\n" +
+                                         "be deleted once merged", "pull/2/merge");
+        fixture.AssertFullSemver("1.3.0-alpha.3");
+        Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
+    }
+
+    [Test]
+    public void GitFlowHotfixBranch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.SequenceDiagram.Participant("develop");
+        fixture.SequenceDiagram.Participant(MainBranch);
+
+        fixture.Repository.MakeACommit();
+        fixture.ApplyTag("1.2.0");
+
+        // Create hotfix branch
+        fixture.Checkout(MainBranch);
+        fixture.BranchTo("hotfix/1.2.1", "hotfix");
+        fixture.SequenceDiagram.Activate("hotfix/1.2.1");
+        fixture.MakeACommit();
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.2.1-beta.1+2");
+
+        // Apply beta.1 tag should be exact tag
+        fixture.ApplyTag("1.2.1-beta.1");
+        fixture.AssertFullSemver("1.2.1-beta.1");
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("hotfix/1.2.1");
+        fixture.SequenceDiagram.Destroy("hotfix/1.2.1");
+        fixture.SequenceDiagram.NoteOver("Hotfix branches are deleted once merged", "hotfix/1.2.1");
+        fixture.ApplyTag("1.2.1");
+        Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
+    }
+
+    [Test]
+    public void GitFlowMinorRelease()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.SequenceDiagram.Participant(MainBranch);
+        fixture.SequenceDiagram.Participant("develop");
+
+        // GitFlow setup
+        fixture.Repository.MakeACommit();
+        fixture.ApplyTag("1.2.1");
+
+        // GitFlow setup
+        fixture.BranchTo("develop");
+        fixture.MakeACommit();
+
+        // Create release branch
+        fixture.BranchTo("release/1.3.0", "release");
+        fixture.SequenceDiagram.Activate("release/1.3.0");
+        fixture.AssertFullSemver("1.3.0-beta.1+0");
+
+        // Make another commit on develop
+        fixture.Checkout("develop");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.4.0-alpha.1");
+
+        // Make a commit to release-1.3.0
+        fixture.Checkout("release/1.3.0");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.3.0-beta.1+1");
+
+        // Apply beta.1 tag should be exact tag
+        fixture.ApplyTag("1.3.0-beta.1");
+        fixture.AssertFullSemver("1.3.0-beta.1");
+
+        // Make a commit after a tag should bump up the beta
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.3.0-beta.2+2");
+
+        // Complete release
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("release/1.3.0");
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("release/1.3.0");
+        fixture.SequenceDiagram.Destroy("release/1.3.0");
+        fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/1.3.0");
+
+        fixture.Checkout(MainBranch);
+        fixture.ApplyTag("1.3.0");
+        fixture.AssertFullSemver("1.3.0");
+
+        // Not 0 for commit count as we can't know the increment rules of the merged branch
+        fixture.Checkout("develop");
+        fixture.AssertFullSemver("1.4.0-alpha.4");
+        Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
+    }
+
+    [Test]
+    public void GitFlowMajorRelease()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.SequenceDiagram.Participant(MainBranch);
+        fixture.SequenceDiagram.Participant("develop");
+
+        fixture.Repository.MakeACommit();
+        fixture.ApplyTag("1.3.0");
+
+        // GitFlow setup
+        fixture.BranchTo("develop");
+        fixture.MakeACommit();
+
+        // Create release branch
+        fixture.BranchTo("release/2.0.0", "release");
+        fixture.SequenceDiagram.Activate("release/2.0.0");
+        fixture.AssertFullSemver("2.0.0-beta.1+0");
+
+        // Make another commit on develop
+        fixture.Checkout("develop");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("2.1.0-alpha.1");
+
+        // Make a commit to release-2.0.0
+        fixture.Checkout("release/2.0.0");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("2.0.0-beta.1+1");
+
+        // Apply beta.1 tag should be exact tag
+        fixture.ApplyTag("2.0.0-beta.1");
+        fixture.AssertFullSemver("2.0.0-beta.1");
+
+        // Make a commit after a tag should bump up the beta
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("2.0.0-beta.2+2");
+
+        // Complete release
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("release/2.0.0");
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("release/2.0.0");
+        fixture.SequenceDiagram.Destroy("release/2.0.0");
+        fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/2.0.0");
+
+        fixture.Checkout(MainBranch);
+        fixture.AssertFullSemver("2.0.0+0");
+        fixture.ApplyTag("2.0.0");
+        fixture.AssertFullSemver("2.0.0");
+
+        // Not 0 for commit count as we can't know the increment rules of the merged branch
+        fixture.Checkout("develop");
+        fixture.AssertFullSemver("2.1.0-alpha.4");
+        Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
+    }
+
+    [Test]
+    public void GitFlowSupportHotfixRelease()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.SequenceDiagram.Participant("develop");
+        fixture.SequenceDiagram.Participant(MainBranch);
+
+        fixture.Repository.MakeACommit();
+        fixture.ApplyTag("1.3.0");
+
+        // GitFlow setup
+        fixture.Repository.MakeACommit();
+        fixture.BranchTo("develop");
+        fixture.SequenceDiagram.NoteOver("Create 2.0.0 release and complete", "develop", MainBranch);
+        fixture.Checkout(MainBranch);
+        fixture.ApplyTag("2.0.0");
+
+        // Create hotfix branch
+        fixture.Checkout("1.3.0");
+        fixture.BranchToFromTag("support/1.x", "1.3.0", MainBranch, "support");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.3.1+1");
+
+        fixture.BranchTo("hotfix/1.3.1", "hotfix2");
+        fixture.SequenceDiagram.Activate("hotfix/1.3.1");
+        fixture.MakeACommit();
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.3.1-beta.1+3");
+
+        // Apply beta.1 tag should be exact tag
+        fixture.ApplyTag("1.3.1-beta.1");
+        fixture.AssertFullSemver("1.3.1-beta.1");
+        fixture.Checkout("support/1.x");
+        fixture.MergeNoFF("hotfix/1.3.1");
+        fixture.SequenceDiagram.Destroy("hotfix/1.3.1");
+        fixture.SequenceDiagram.NoteOver("Hotfix branches are deleted once merged", "hotfix/1.3.1");
+        fixture.AssertFullSemver("1.3.1+4");
+        fixture.ApplyTag("1.3.1");
+        fixture.AssertFullSemver("1.3.1");
+        Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
+    }
+
+    [Test]
+    public void GitFlowSupportMinorRelease()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.SequenceDiagram.Participant("develop");
+        fixture.SequenceDiagram.Participant(MainBranch);
+
+        fixture.Repository.MakeACommit();
+        fixture.ApplyTag("1.3.0");
+
+        // GitFlow setup
+        fixture.Repository.MakeACommit();
+        fixture.BranchTo("develop");
+        fixture.SequenceDiagram.NoteOver("Create 2.0.0 release and complete", "develop", MainBranch);
+        fixture.Checkout(MainBranch);
+        fixture.ApplyTag("2.0.0");
+
+        // Create hotfix branch
+        fixture.Checkout("1.3.0");
+        fixture.BranchToFromTag("support/1.x", "1.3.0", MainBranch, "support");
+        fixture.SequenceDiagram.NoteOver("Create 1.3.1 release and complete", MainBranch, "support/1.x");
+        fixture.Repository.MakeACommit();
+        fixture.ApplyTag("1.3.1");
+
+        fixture.BranchTo("release/1.4.0", "supportRelease");
+        fixture.SequenceDiagram.Activate("release/1.4.0");
+        fixture.MakeACommit();
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.4.0-beta.1+2");
+
+        // Apply beta.1 tag should be exact tag
+        fixture.ApplyTag("1.4.0-beta.1");
+        fixture.AssertFullSemver("1.4.0-beta.1");
+        fixture.Checkout("support/1.x");
+        fixture.MergeNoFF("release/1.4.0");
+        fixture.SequenceDiagram.Destroy("release/1.4.0");
+        fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/1.4.0");
+        fixture.AssertFullSemver("1.4.0+0");
+        fixture.ApplyTag("1.4.0");
+        fixture.AssertFullSemver("1.4.0");
+        Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
+    }
+
+
+    [Test]
+    public void GitHubFlowFeatureBranch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.SequenceDiagram.Participant(MainBranch);
+
+        // GitFlow setup
+        fixture.Repository.MakeACommit();
+        fixture.ApplyTag("1.2.0");
+
+        // Branch to develop
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.2.1+1");
+
+        // Open Pull Request
+        fixture.BranchTo("feature/myfeature", "feature");
+        fixture.SequenceDiagram.Activate("feature/myfeature");
+        fixture.AssertFullSemver("1.2.1-myfeature.1+1");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.2.1-myfeature.1+2");
+
+        // Merge into main
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/myfeature");
+        fixture.SequenceDiagram.Destroy("feature/myfeature");
+        fixture.SequenceDiagram.NoteOver("Feature branches should\r\n" +
+                                         "be deleted once merged", "feature/myfeature");
+        fixture.AssertFullSemver("1.2.1+3");
+    }
+
+    [Test]
+    public void GitHubFlowPullRequestBranch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.SequenceDiagram.Participant(MainBranch);
+
+        // GitFlow setup
+        fixture.Repository.MakeACommit();
+        fixture.ApplyTag("1.2.0");
+
+        // Branch to develop
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.2.1+1");
+
+        // Open Pull Request
+        fixture.BranchTo("pull/2/merge", "pr");
+        fixture.SequenceDiagram.Activate("pull/2/merge");
+        fixture.AssertFullSemver("1.2.1-PullRequest0002.1");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.2.1-PullRequest0002.2");
+
+        // Merge into main
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("pull/2/merge");
+        fixture.SequenceDiagram.Destroy("pull/2/merge");
+        fixture.SequenceDiagram.NoteOver("Feature branches/pr's should\r\n" +
+                                         "be deleted once merged", "pull/2/merge");
+        fixture.AssertFullSemver("1.2.1+3");
+    }
+
+    [Test]
+    public void GitHubFlowMajorRelease()
     {
-        [Test]
-        public void GitFlowFeatureBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.SequenceDiagram.Participant(MainBranch);
-            fixture.SequenceDiagram.Participant("develop");
-
-            // GitFlow setup
-            fixture.Repository.MakeACommit();
-            fixture.ApplyTag("1.2.0");
-            fixture.BranchTo("develop");
-
-            // Branch to develop
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.3.0-alpha.1");
-
-            // Open Pull Request
-            fixture.BranchTo("feature/myfeature", "feature");
-            fixture.SequenceDiagram.Activate("feature/myfeature");
-            fixture.AssertFullSemver("1.3.0-myfeature.1+1");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.3.0-myfeature.1+2");
-
-            // Merge into develop
-            fixture.Checkout("develop");
-            fixture.MergeNoFF("feature/myfeature");
-            fixture.SequenceDiagram.Destroy("feature/myfeature");
-            fixture.SequenceDiagram.NoteOver("Feature branches should\r\n" +
-                                             "be deleted once merged", "feature/myfeature");
-            fixture.AssertFullSemver("1.3.0-alpha.3");
-            Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
-        }
-
-        [Test]
-        public void GitFlowPullRequestBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.SequenceDiagram.Participant(MainBranch);
-            fixture.SequenceDiagram.Participant("develop");
-
-            // GitFlow setup
-            fixture.Repository.MakeACommit();
-            fixture.ApplyTag("1.2.0");
-            fixture.BranchTo("develop");
-
-            // Branch to develop
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.3.0-alpha.1");
-
-            // Open Pull Request
-            fixture.BranchTo("pull/2/merge", "pr");
-            fixture.SequenceDiagram.Activate("pull/2/merge");
-            fixture.AssertFullSemver("1.3.0-PullRequest0002.1");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.3.0-PullRequest0002.2");
-
-            // Merge into develop
-            fixture.Checkout("develop");
-            fixture.MergeNoFF("pull/2/merge");
-            fixture.SequenceDiagram.Destroy("pull/2/merge");
-            fixture.SequenceDiagram.NoteOver("Feature branches/pr's should\r\n" +
-                                             "be deleted once merged", "pull/2/merge");
-            fixture.AssertFullSemver("1.3.0-alpha.3");
-            Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
-        }
-
-        [Test]
-        public void GitFlowHotfixBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.SequenceDiagram.Participant("develop");
-            fixture.SequenceDiagram.Participant(MainBranch);
-
-            fixture.Repository.MakeACommit();
-            fixture.ApplyTag("1.2.0");
-
-            // Create hotfix branch
-            fixture.Checkout(MainBranch);
-            fixture.BranchTo("hotfix/1.2.1", "hotfix");
-            fixture.SequenceDiagram.Activate("hotfix/1.2.1");
-            fixture.MakeACommit();
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.2.1-beta.1+2");
-
-            // Apply beta.1 tag should be exact tag
-            fixture.ApplyTag("1.2.1-beta.1");
-            fixture.AssertFullSemver("1.2.1-beta.1");
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("hotfix/1.2.1");
-            fixture.SequenceDiagram.Destroy("hotfix/1.2.1");
-            fixture.SequenceDiagram.NoteOver("Hotfix branches are deleted once merged", "hotfix/1.2.1");
-            fixture.ApplyTag("1.2.1");
-            Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
-        }
-
-        [Test]
-        public void GitFlowMinorRelease()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.SequenceDiagram.Participant(MainBranch);
-            fixture.SequenceDiagram.Participant("develop");
-
-            // GitFlow setup
-            fixture.Repository.MakeACommit();
-            fixture.ApplyTag("1.2.1");
-
-            // GitFlow setup
-            fixture.BranchTo("develop");
-            fixture.MakeACommit();
-
-            // Create release branch
-            fixture.BranchTo("release/1.3.0", "release");
-            fixture.SequenceDiagram.Activate("release/1.3.0");
-            fixture.AssertFullSemver("1.3.0-beta.1+0");
-
-            // Make another commit on develop
-            fixture.Checkout("develop");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.4.0-alpha.1");
-
-            // Make a commit to release-1.3.0
-            fixture.Checkout("release/1.3.0");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.3.0-beta.1+1");
-
-            // Apply beta.1 tag should be exact tag
-            fixture.ApplyTag("1.3.0-beta.1");
-            fixture.AssertFullSemver("1.3.0-beta.1");
-
-            // Make a commit after a tag should bump up the beta
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.3.0-beta.2+2");
-
-            // Complete release
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("release/1.3.0");
-            fixture.Checkout("develop");
-            fixture.MergeNoFF("release/1.3.0");
-            fixture.SequenceDiagram.Destroy("release/1.3.0");
-            fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/1.3.0");
-
-            fixture.Checkout(MainBranch);
-            fixture.ApplyTag("1.3.0");
-            fixture.AssertFullSemver("1.3.0");
-
-            // Not 0 for commit count as we can't know the increment rules of the merged branch
-            fixture.Checkout("develop");
-            fixture.AssertFullSemver("1.4.0-alpha.4");
-            Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
-        }
-
-        [Test]
-        public void GitFlowMajorRelease()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.SequenceDiagram.Participant(MainBranch);
-            fixture.SequenceDiagram.Participant("develop");
-
-            fixture.Repository.MakeACommit();
-            fixture.ApplyTag("1.3.0");
-
-            // GitFlow setup
-            fixture.BranchTo("develop");
-            fixture.MakeACommit();
-
-            // Create release branch
-            fixture.BranchTo("release/2.0.0", "release");
-            fixture.SequenceDiagram.Activate("release/2.0.0");
-            fixture.AssertFullSemver("2.0.0-beta.1+0");
-
-            // Make another commit on develop
-            fixture.Checkout("develop");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("2.1.0-alpha.1");
-
-            // Make a commit to release-2.0.0
-            fixture.Checkout("release/2.0.0");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("2.0.0-beta.1+1");
-
-            // Apply beta.1 tag should be exact tag
-            fixture.ApplyTag("2.0.0-beta.1");
-            fixture.AssertFullSemver("2.0.0-beta.1");
-
-            // Make a commit after a tag should bump up the beta
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("2.0.0-beta.2+2");
-
-            // Complete release
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("release/2.0.0");
-            fixture.Checkout("develop");
-            fixture.MergeNoFF("release/2.0.0");
-            fixture.SequenceDiagram.Destroy("release/2.0.0");
-            fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/2.0.0");
-
-            fixture.Checkout(MainBranch);
-            fixture.AssertFullSemver("2.0.0+0");
-            fixture.ApplyTag("2.0.0");
-            fixture.AssertFullSemver("2.0.0");
-
-            // Not 0 for commit count as we can't know the increment rules of the merged branch
-            fixture.Checkout("develop");
-            fixture.AssertFullSemver("2.1.0-alpha.4");
-            Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
-        }
-
-        [Test]
-        public void GitFlowSupportHotfixRelease()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.SequenceDiagram.Participant("develop");
-            fixture.SequenceDiagram.Participant(MainBranch);
-
-            fixture.Repository.MakeACommit();
-            fixture.ApplyTag("1.3.0");
-
-            // GitFlow setup
-            fixture.Repository.MakeACommit();
-            fixture.BranchTo("develop");
-            fixture.SequenceDiagram.NoteOver("Create 2.0.0 release and complete", "develop", MainBranch);
-            fixture.Checkout(MainBranch);
-            fixture.ApplyTag("2.0.0");
-
-            // Create hotfix branch
-            fixture.Checkout("1.3.0");
-            fixture.BranchToFromTag("support/1.x", "1.3.0", MainBranch, "support");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.3.1+1");
-
-            fixture.BranchTo("hotfix/1.3.1", "hotfix2");
-            fixture.SequenceDiagram.Activate("hotfix/1.3.1");
-            fixture.MakeACommit();
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.3.1-beta.1+3");
-
-            // Apply beta.1 tag should be exact tag
-            fixture.ApplyTag("1.3.1-beta.1");
-            fixture.AssertFullSemver("1.3.1-beta.1");
-            fixture.Checkout("support/1.x");
-            fixture.MergeNoFF("hotfix/1.3.1");
-            fixture.SequenceDiagram.Destroy("hotfix/1.3.1");
-            fixture.SequenceDiagram.NoteOver("Hotfix branches are deleted once merged", "hotfix/1.3.1");
-            fixture.AssertFullSemver("1.3.1+4");
-            fixture.ApplyTag("1.3.1");
-            fixture.AssertFullSemver("1.3.1");
-            Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
-        }
-
-        [Test]
-        public void GitFlowSupportMinorRelease()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.SequenceDiagram.Participant("develop");
-            fixture.SequenceDiagram.Participant(MainBranch);
-
-            fixture.Repository.MakeACommit();
-            fixture.ApplyTag("1.3.0");
-
-            // GitFlow setup
-            fixture.Repository.MakeACommit();
-            fixture.BranchTo("develop");
-            fixture.SequenceDiagram.NoteOver("Create 2.0.0 release and complete", "develop", MainBranch);
-            fixture.Checkout(MainBranch);
-            fixture.ApplyTag("2.0.0");
-
-            // Create hotfix branch
-            fixture.Checkout("1.3.0");
-            fixture.BranchToFromTag("support/1.x", "1.3.0", MainBranch, "support");
-            fixture.SequenceDiagram.NoteOver("Create 1.3.1 release and complete", MainBranch, "support/1.x");
-            fixture.Repository.MakeACommit();
-            fixture.ApplyTag("1.3.1");
-
-            fixture.BranchTo("release/1.4.0", "supportRelease");
-            fixture.SequenceDiagram.Activate("release/1.4.0");
-            fixture.MakeACommit();
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.4.0-beta.1+2");
-
-            // Apply beta.1 tag should be exact tag
-            fixture.ApplyTag("1.4.0-beta.1");
-            fixture.AssertFullSemver("1.4.0-beta.1");
-            fixture.Checkout("support/1.x");
-            fixture.MergeNoFF("release/1.4.0");
-            fixture.SequenceDiagram.Destroy("release/1.4.0");
-            fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/1.4.0");
-            fixture.AssertFullSemver("1.4.0+0");
-            fixture.ApplyTag("1.4.0");
-            fixture.AssertFullSemver("1.4.0");
-            Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
-        }
-
-
-        [Test]
-        public void GitHubFlowFeatureBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.SequenceDiagram.Participant(MainBranch);
-
-            // GitFlow setup
-            fixture.Repository.MakeACommit();
-            fixture.ApplyTag("1.2.0");
-
-            // Branch to develop
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.2.1+1");
-
-            // Open Pull Request
-            fixture.BranchTo("feature/myfeature", "feature");
-            fixture.SequenceDiagram.Activate("feature/myfeature");
-            fixture.AssertFullSemver("1.2.1-myfeature.1+1");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.2.1-myfeature.1+2");
-
-            // Merge into main
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/myfeature");
-            fixture.SequenceDiagram.Destroy("feature/myfeature");
-            fixture.SequenceDiagram.NoteOver("Feature branches should\r\n" +
-                                             "be deleted once merged", "feature/myfeature");
-            fixture.AssertFullSemver("1.2.1+3");
-        }
-
-        [Test]
-        public void GitHubFlowPullRequestBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.SequenceDiagram.Participant(MainBranch);
-
-            // GitFlow setup
-            fixture.Repository.MakeACommit();
-            fixture.ApplyTag("1.2.0");
-
-            // Branch to develop
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.2.1+1");
-
-            // Open Pull Request
-            fixture.BranchTo("pull/2/merge", "pr");
-            fixture.SequenceDiagram.Activate("pull/2/merge");
-            fixture.AssertFullSemver("1.2.1-PullRequest0002.1");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.2.1-PullRequest0002.2");
-
-            // Merge into main
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("pull/2/merge");
-            fixture.SequenceDiagram.Destroy("pull/2/merge");
-            fixture.SequenceDiagram.NoteOver("Feature branches/pr's should\r\n" +
-                                             "be deleted once merged", "pull/2/merge");
-            fixture.AssertFullSemver("1.2.1+3");
-        }
-
-        [Test]
-        public void GitHubFlowMajorRelease()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.SequenceDiagram.Participant(MainBranch);
-
-            fixture.Repository.MakeACommit();
-            fixture.ApplyTag("1.3.0");
-
-            // Create release branch
-            fixture.BranchTo("release/2.0.0", "release");
-            fixture.SequenceDiagram.Activate("release/2.0.0");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("2.0.0-beta.1+1");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("2.0.0-beta.1+2");
-
-            // Apply beta.1 tag should be exact tag
-            fixture.ApplyTag("2.0.0-beta.1");
-            fixture.AssertFullSemver("2.0.0-beta.1");
-
-            // test that the CommitsSinceVersionSource should still return commit count
-            var version = fixture.GetVersion();
-            version.CommitsSinceVersionSource.ShouldBe("2");
-
-            // Make a commit after a tag should bump up the beta
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("2.0.0-beta.2+3");
-
-            // Complete release
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("release/2.0.0");
-            fixture.SequenceDiagram.Destroy("release/2.0.0");
-            fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/2.0.0");
-
-            fixture.AssertFullSemver("2.0.0+0");
-            fixture.ApplyTag("2.0.0");
-            fixture.AssertFullSemver("2.0.0");
-            fixture.MakeACommit();
-            fixture.Repository.DumpGraph();
-            fixture.AssertFullSemver("2.0.1+1");
-        }
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.SequenceDiagram.Participant(MainBranch);
+
+        fixture.Repository.MakeACommit();
+        fixture.ApplyTag("1.3.0");
+
+        // Create release branch
+        fixture.BranchTo("release/2.0.0", "release");
+        fixture.SequenceDiagram.Activate("release/2.0.0");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("2.0.0-beta.1+1");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("2.0.0-beta.1+2");
+
+        // Apply beta.1 tag should be exact tag
+        fixture.ApplyTag("2.0.0-beta.1");
+        fixture.AssertFullSemver("2.0.0-beta.1");
+
+        // test that the CommitsSinceVersionSource should still return commit count
+        var version = fixture.GetVersion();
+        version.CommitsSinceVersionSource.ShouldBe("2");
+
+        // Make a commit after a tag should bump up the beta
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("2.0.0-beta.2+3");
+
+        // Complete release
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("release/2.0.0");
+        fixture.SequenceDiagram.Destroy("release/2.0.0");
+        fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/2.0.0");
+
+        fixture.AssertFullSemver("2.0.0+0");
+        fixture.ApplyTag("2.0.0");
+        fixture.AssertFullSemver("2.0.0");
+        fixture.MakeACommit();
+        fixture.Repository.DumpGraph();
+        fixture.AssertFullSemver("2.0.1+1");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs
index a9896ab368..d65f7280fb 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs
@@ -7,256 +7,365 @@
 using LibGit2Sharp;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class FeatureBranchScenarios : TestBase
 {
-    [TestFixture]
-    public class FeatureBranchScenarios : TestBase
+    [Test]
+    public void ShouldInheritIncrementCorrectlyWithMultiplePossibleParentsAndWeirdlyNamedDevelopBranch()
     {
-        [Test]
-        public void ShouldInheritIncrementCorrectlyWithMultiplePossibleParentsAndWeirdlyNamedDevelopBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.CreateBranch("development");
-            Commands.Checkout(fixture.Repository, "development");
-
-            //Create an initial feature branch
-            var feature123 = fixture.Repository.CreateBranch("feature/JIRA-123");
-            Commands.Checkout(fixture.Repository, "feature/JIRA-123");
-            fixture.Repository.MakeCommits(1);
-
-            //Merge it
-            Commands.Checkout(fixture.Repository, "development");
-            fixture.Repository.Merge(feature123, Generate.SignatureNow());
-
-            //Create a second feature branch
-            fixture.Repository.CreateBranch("feature/JIRA-124");
-            Commands.Checkout(fixture.Repository, "feature/JIRA-124");
-            fixture.Repository.MakeCommits(1);
-
-            fixture.AssertFullSemver("1.1.0-JIRA-124.1+2");
-        }
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.CreateBranch("development");
+        Commands.Checkout(fixture.Repository, "development");
+
+        //Create an initial feature branch
+        var feature123 = fixture.Repository.CreateBranch("feature/JIRA-123");
+        Commands.Checkout(fixture.Repository, "feature/JIRA-123");
+        fixture.Repository.MakeCommits(1);
+
+        //Merge it
+        Commands.Checkout(fixture.Repository, "development");
+        fixture.Repository.Merge(feature123, Generate.SignatureNow());
+
+        //Create a second feature branch
+        fixture.Repository.CreateBranch("feature/JIRA-124");
+        Commands.Checkout(fixture.Repository, "feature/JIRA-124");
+        fixture.Repository.MakeCommits(1);
+
+        fixture.AssertFullSemver("1.1.0-JIRA-124.1+2");
+    }
 
-        [Test]
-        public void BranchCreatedAfterFastForwardMergeShouldInheritCorrectly()
+    [Test]
+    public void BranchCreatedAfterFastForwardMergeShouldInheritCorrectly()
+    {
+        var config = new Config
         {
-            var config = new Config
+            Branches =
             {
-                Branches =
                 {
+                    "unstable",
+                    new BranchConfig
                     {
-                        "unstable",
-                        new BranchConfig
-                        {
-                            Increment = IncrementStrategy.Minor,
-                            Regex = "unstable",
-                            SourceBranches = new HashSet<string>(),
-                            IsSourceBranchFor = new HashSet<string> { "feature" }
-                        }
+                        Increment = IncrementStrategy.Minor,
+                        Regex = "unstable",
+                        SourceBranches = new HashSet<string>(),
+                        IsSourceBranchFor = new HashSet<string> { "feature" }
                     }
                 }
-            };
+            }
+        };
 
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.CreateBranch("unstable");
-            Commands.Checkout(fixture.Repository, "unstable");
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.CreateBranch("unstable");
+        Commands.Checkout(fixture.Repository, "unstable");
 
-            //Create an initial feature branch
-            var feature123 = fixture.Repository.CreateBranch("feature/JIRA-123");
-            Commands.Checkout(fixture.Repository, "feature/JIRA-123");
-            fixture.Repository.MakeCommits(1);
+        //Create an initial feature branch
+        var feature123 = fixture.Repository.CreateBranch("feature/JIRA-123");
+        Commands.Checkout(fixture.Repository, "feature/JIRA-123");
+        fixture.Repository.MakeCommits(1);
 
-            //Merge it
-            Commands.Checkout(fixture.Repository, "unstable");
-            fixture.Repository.Merge(feature123, Generate.SignatureNow());
+        //Merge it
+        Commands.Checkout(fixture.Repository, "unstable");
+        fixture.Repository.Merge(feature123, Generate.SignatureNow());
 
-            //Create a second feature branch
-            fixture.Repository.CreateBranch("feature/JIRA-124");
-            Commands.Checkout(fixture.Repository, "feature/JIRA-124");
-            fixture.Repository.MakeCommits(1);
+        //Create a second feature branch
+        fixture.Repository.CreateBranch("feature/JIRA-124");
+        Commands.Checkout(fixture.Repository, "feature/JIRA-124");
+        fixture.Repository.MakeCommits(1);
 
-            fixture.AssertFullSemver("1.1.0-JIRA-124.1+2", config);
-        }
+        fixture.AssertFullSemver("1.1.0-JIRA-124.1+2", config);
+    }
 
-        [Test]
-        public void ShouldNotUseNumberInFeatureBranchAsPreReleaseNumberOffDevelop()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.CreateBranch("develop");
-            Commands.Checkout(fixture.Repository, "develop");
-            fixture.Repository.CreateBranch("feature/JIRA-123");
-            Commands.Checkout(fixture.Repository, "feature/JIRA-123");
-            fixture.Repository.MakeCommits(5);
-
-            fixture.AssertFullSemver("1.1.0-JIRA-123.1+5");
-        }
+    [Test]
+    public void ShouldNotUseNumberInFeatureBranchAsPreReleaseNumberOffDevelop()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.CreateBranch("develop");
+        Commands.Checkout(fixture.Repository, "develop");
+        fixture.Repository.CreateBranch("feature/JIRA-123");
+        Commands.Checkout(fixture.Repository, "feature/JIRA-123");
+        fixture.Repository.MakeCommits(5);
+
+        fixture.AssertFullSemver("1.1.0-JIRA-123.1+5");
+    }
 
-        [Test]
-        public void ShouldNotUseNumberInFeatureBranchAsPreReleaseNumberOffMain()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.CreateBranch("feature/JIRA-123");
-            Commands.Checkout(fixture.Repository, "feature/JIRA-123");
-            fixture.Repository.MakeCommits(5);
+    [Test]
+    public void ShouldNotUseNumberInFeatureBranchAsPreReleaseNumberOffMain()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.CreateBranch("feature/JIRA-123");
+        Commands.Checkout(fixture.Repository, "feature/JIRA-123");
+        fixture.Repository.MakeCommits(5);
 
-            fixture.AssertFullSemver("1.0.1-JIRA-123.1+5");
-        }
+        fixture.AssertFullSemver("1.0.1-JIRA-123.1+5");
+    }
 
-        [Test]
-        public void TestFeatureBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.CreateBranch("feature-test");
-            Commands.Checkout(fixture.Repository, "feature-test");
-            fixture.Repository.MakeCommits(5);
+    [Test]
+    public void TestFeatureBranch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.CreateBranch("feature-test");
+        Commands.Checkout(fixture.Repository, "feature-test");
+        fixture.Repository.MakeCommits(5);
 
-            fixture.AssertFullSemver("1.0.1-test.1+5");
-        }
+        fixture.AssertFullSemver("1.0.1-test.1+5");
+    }
 
-        [Test]
-        public void TestFeaturesBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.CreateBranch("features/test");
-            Commands.Checkout(fixture.Repository, "features/test");
-            fixture.Repository.MakeCommits(5);
+    [Test]
+    public void TestFeaturesBranch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.CreateBranch("features/test");
+        Commands.Checkout(fixture.Repository, "features/test");
+        fixture.Repository.MakeCommits(5);
 
-            fixture.AssertFullSemver("1.0.1-test.1+5");
-        }
+        fixture.AssertFullSemver("1.0.1-test.1+5");
+    }
 
-        [Test]
-        public void WhenTwoFeatureBranchPointToTheSameCommit()
+    [Test]
+    public void WhenTwoFeatureBranchPointToTheSameCommit()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.CreateBranch("develop");
+        Commands.Checkout(fixture.Repository, "develop");
+        fixture.Repository.CreateBranch("feature/feature1");
+        Commands.Checkout(fixture.Repository, "feature/feature1");
+        fixture.Repository.MakeACommit();
+        fixture.Repository.CreateBranch("feature/feature2");
+        Commands.Checkout(fixture.Repository, "feature/feature2");
+
+        fixture.AssertFullSemver("0.1.0-feature2.1+1");
+    }
+
+    [Test]
+    public void ShouldBePossibleToMergeDevelopForALongRunningBranchWhereDevelopAndMainAreEqual()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("v1.0.0");
+
+        fixture.Repository.CreateBranch("develop");
+        Commands.Checkout(fixture.Repository, "develop");
+
+        fixture.Repository.CreateBranch("feature/longrunning");
+        Commands.Checkout(fixture.Repository, "feature/longrunning");
+        fixture.Repository.MakeACommit();
+
+        Commands.Checkout(fixture.Repository, "develop");
+        fixture.Repository.MakeACommit();
+
+        Commands.Checkout(fixture.Repository, MainBranch);
+        fixture.Repository.Merge(fixture.Repository.Branches["develop"], Generate.SignatureNow());
+        fixture.Repository.ApplyTag("v1.1.0");
+
+        Commands.Checkout(fixture.Repository, "feature/longrunning");
+        fixture.Repository.Merge(fixture.Repository.Branches["develop"], Generate.SignatureNow());
+
+        var configuration = new Config { VersioningMode = VersioningMode.ContinuousDeployment };
+        fixture.AssertFullSemver("1.2.0-longrunning.2", configuration);
+    }
+
+    [Test]
+    public void CanUseBranchNameOffAReleaseBranch()
+    {
+        var config = new Config
         {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.CreateBranch("develop");
-            Commands.Checkout(fixture.Repository, "develop");
-            fixture.Repository.CreateBranch("feature/feature1");
-            Commands.Checkout(fixture.Repository, "feature/feature1");
-            fixture.Repository.MakeACommit();
-            fixture.Repository.CreateBranch("feature/feature2");
-            Commands.Checkout(fixture.Repository, "feature/feature2");
-
-            fixture.AssertFullSemver("0.1.0-feature2.1+1");
-        }
+            Branches =
+            {
+                { "release", new BranchConfig { Tag = "build" } },
+                { "feature", new BranchConfig { Tag = "useBranchName" } }
+            }
+        };
 
-        [Test]
-        public void ShouldBePossibleToMergeDevelopForALongRunningBranchWhereDevelopAndMainAreEqual()
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.BranchTo("release/0.3.0");
+        fixture.MakeATaggedCommit("v0.3.0-build.1");
+        fixture.MakeACommit();
+        fixture.BranchTo("feature/PROJ-1");
+        fixture.MakeACommit();
+
+        fixture.AssertFullSemver("0.3.0-PROJ-1.1+2", config);
+    }
+
+    [TestCase("alpha", "JIRA-123", "alpha")]
+    [TestCase("useBranchName", "JIRA-123", "JIRA-123")]
+    [TestCase("alpha.{BranchName}", "JIRA-123", "alpha.JIRA-123")]
+    public void ShouldUseConfiguredTag(string tag, string featureName, string preReleaseTagName)
+    {
+        var config = new Config
         {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("v1.0.0");
+            Branches =
+            {
+                { "feature", new BranchConfig { Tag = tag } }
+            }
+        };
 
-            fixture.Repository.CreateBranch("develop");
-            Commands.Checkout(fixture.Repository, "develop");
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        var featureBranchName = $"feature/{featureName}";
+        fixture.Repository.CreateBranch(featureBranchName);
+        Commands.Checkout(fixture.Repository, featureBranchName);
+        fixture.Repository.MakeCommits(5);
 
-            fixture.Repository.CreateBranch("feature/longrunning");
-            Commands.Checkout(fixture.Repository, "feature/longrunning");
-            fixture.Repository.MakeACommit();
+        var expectedFullSemVer = $"1.0.1-{preReleaseTagName}.1+5";
+        fixture.AssertFullSemver(expectedFullSemVer, config);
+    }
 
-            Commands.Checkout(fixture.Repository, "develop");
-            fixture.Repository.MakeACommit();
+    [Test]
+    public void BranchCreatedAfterFinishReleaseShouldInheritAndIncrementFromLastMainCommitTag()
+    {
+        using var fixture = new BaseGitFlowRepositoryFixture("0.1.0");
+        //validate current version
+        fixture.AssertFullSemver("0.2.0-alpha.1");
+        fixture.Repository.CreateBranch("release/0.2.0");
+        Commands.Checkout(fixture.Repository, "release/0.2.0");
 
-            Commands.Checkout(fixture.Repository, MainBranch);
-            fixture.Repository.Merge(fixture.Repository.Branches["develop"], Generate.SignatureNow());
-            fixture.Repository.ApplyTag("v1.1.0");
+        //validate release version
+        fixture.AssertFullSemver("0.2.0-beta.1+0");
 
-            Commands.Checkout(fixture.Repository, "feature/longrunning");
-            fixture.Repository.Merge(fixture.Repository.Branches["develop"], Generate.SignatureNow());
+        fixture.Checkout(MainBranch);
+        fixture.Repository.MergeNoFF("release/0.2.0");
+        fixture.Repository.ApplyTag("0.2.0");
 
-            var configuration = new Config { VersioningMode = VersioningMode.ContinuousDeployment };
-            fixture.AssertFullSemver("1.2.0-longrunning.2", configuration);
-        }
+        //validate main branch version
+        fixture.AssertFullSemver("0.2.0");
+
+        fixture.Checkout("develop");
+        fixture.Repository.MergeNoFF("release/0.2.0");
+        fixture.Repository.Branches.Remove("release/2.0.0");
+
+        fixture.Repository.MakeACommit();
+
+        //validate develop branch version after merging release 0.2.0 to main and develop (finish release)
+        fixture.AssertFullSemver("0.3.0-alpha.1");
+
+        //create a feature branch from develop
+        fixture.BranchTo("feature/TEST-1");
+        fixture.Repository.MakeACommit();
+
+        //I'm not entirely sure what the + value should be but I know the semvar major/minor/patch should be 0.3.0
+        fixture.AssertFullSemver("0.3.0-TEST-1.1+2");
+    }
+
+    [Test]
+    public void ShouldPickUpVersionFromDevelopAfterReleaseBranchCreated()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        // Create develop and release branches
+        fixture.MakeACommit();
+        fixture.BranchTo("develop");
+        fixture.MakeACommit();
+        fixture.BranchTo("release/1.0");
+        fixture.MakeACommit();
+        fixture.Checkout("develop");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.1.0-alpha.1");
+
+        // create a feature branch from develop and verify the version
+        fixture.BranchTo("feature/test");
+        fixture.AssertFullSemver("1.1.0-test.1+1");
+    }
 
+    [Test]
+    public void ShouldPickUpVersionFromDevelopAfterReleaseBranchMergedBack()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        // Create develop and release branches
+        fixture.MakeACommit();
+        fixture.BranchTo("develop");
+        fixture.MakeACommit();
+        fixture.BranchTo("release/1.0");
+        fixture.MakeACommit();
+
+        // merge release into develop
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("release/1.0");
+        fixture.AssertFullSemver("1.1.0-alpha.2");
+
+        // create a feature branch from develop and verify the version
+        fixture.BranchTo("feature/test");
+        fixture.AssertFullSemver("1.1.0-test.1+2");
+    }
+
+    public class WhenMainAsIsDevelop
+    {
         [Test]
-        public void CanUseBranchNameOffAReleaseBranch()
+        public void ShouldPickUpVersionFromMainAfterReleaseBranchCreated()
         {
             var config = new Config
             {
-                Branches =
+                Branches = new Dictionary<string, BranchConfig>
                 {
-                    { "release", new BranchConfig { Tag = "build" } },
-                    { "feature", new BranchConfig { Tag = "useBranchName" } }
+                    {
+                        MainBranch, new BranchConfig
+                        {
+                            TracksReleaseBranches = true,
+                            Regex = MainBranch
+                        }
+                    }
                 }
             };
 
             using var fixture = new EmptyRepositoryFixture();
+            // Create release branch
             fixture.MakeACommit();
-            fixture.BranchTo("release/0.3.0");
-            fixture.MakeATaggedCommit("v0.3.0-build.1");
+            fixture.BranchTo("release/1.0");
             fixture.MakeACommit();
-            fixture.BranchTo("feature/PROJ-1");
+            fixture.Checkout(MainBranch);
             fixture.MakeACommit();
+            fixture.AssertFullSemver("1.0.1+1", config);
 
-            fixture.AssertFullSemver("0.3.0-PROJ-1.1+2", config);
+            // create a feature branch from main and verify the version
+            fixture.BranchTo("feature/test");
+            fixture.AssertFullSemver("1.0.1-test.1+1", config);
         }
 
-        [TestCase("alpha", "JIRA-123", "alpha")]
-        [TestCase("useBranchName", "JIRA-123", "JIRA-123")]
-        [TestCase("alpha.{BranchName}", "JIRA-123", "alpha.JIRA-123")]
-        public void ShouldUseConfiguredTag(string tag, string featureName, string preReleaseTagName)
+        [Test]
+        public void ShouldPickUpVersionFromMainAfterReleaseBranchMergedBack()
         {
             var config = new Config
             {
-                Branches =
+                Branches = new Dictionary<string, BranchConfig>
                 {
-                    { "feature", new BranchConfig { Tag = tag } }
+                    {
+                        MainBranch, new BranchConfig
+                        {
+                            TracksReleaseBranches = true,
+                            Regex = MainBranch
+                        }
+                    }
                 }
             };
 
             using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            var featureBranchName = $"feature/{featureName}";
-            fixture.Repository.CreateBranch(featureBranchName);
-            Commands.Checkout(fixture.Repository, featureBranchName);
-            fixture.Repository.MakeCommits(5);
-
-            var expectedFullSemVer = $"1.0.1-{preReleaseTagName}.1+5";
-            fixture.AssertFullSemver(expectedFullSemVer, config);
-        }
-
-        [Test]
-        public void BranchCreatedAfterFinishReleaseShouldInheritAndIncrementFromLastMainCommitTag()
-        {
-            using var fixture = new BaseGitFlowRepositoryFixture("0.1.0");
-            //validate current version
-            fixture.AssertFullSemver("0.2.0-alpha.1");
-            fixture.Repository.CreateBranch("release/0.2.0");
-            Commands.Checkout(fixture.Repository, "release/0.2.0");
-
-            //validate release version
-            fixture.AssertFullSemver("0.2.0-beta.1+0");
+            // Create release branch
+            fixture.MakeACommit();
+            fixture.BranchTo("release/1.0");
+            fixture.MakeACommit();
 
+            // merge release into main
             fixture.Checkout(MainBranch);
-            fixture.Repository.MergeNoFF("release/0.2.0");
-            fixture.Repository.ApplyTag("0.2.0");
-
-            //validate main branch version
-            fixture.AssertFullSemver("0.2.0");
-
-            fixture.Checkout("develop");
-            fixture.Repository.MergeNoFF("release/0.2.0");
-            fixture.Repository.Branches.Remove("release/2.0.0");
-
-            fixture.Repository.MakeACommit();
-
-            //validate develop branch version after merging release 0.2.0 to main and develop (finish release)
-            fixture.AssertFullSemver("0.3.0-alpha.1");
-
-            //create a feature branch from develop
-            fixture.BranchTo("feature/TEST-1");
-            fixture.Repository.MakeACommit();
+            fixture.MergeNoFF("release/1.0");
+            fixture.AssertFullSemver("1.0.1+2", config);
 
-            //I'm not entirely sure what the + value should be but I know the semvar major/minor/patch should be 0.3.0
-            fixture.AssertFullSemver("0.3.0-TEST-1.1+2");
+            // create a feature branch from main and verify the version
+            fixture.BranchTo("feature/test");
+            fixture.AssertFullSemver("1.0.1-test.1+2", config);
         }
+    }
 
+    public class WhenFeatureBranchHasNoConfig
+    {
         [Test]
-        public void ShouldPickUpVersionFromDevelopAfterReleaseBranchCreated()
+        public void ShouldPickUpVersionFromMainAfterReleaseBranchCreated()
         {
             using var fixture = new EmptyRepositoryFixture();
             // Create develop and release branches
@@ -269,9 +378,9 @@ public void ShouldPickUpVersionFromDevelopAfterReleaseBranchCreated()
             fixture.MakeACommit();
             fixture.AssertFullSemver("1.1.0-alpha.1");
 
-            // create a feature branch from develop and verify the version
-            fixture.BranchTo("feature/test");
-            fixture.AssertFullSemver("1.1.0-test.1+1");
+            // create a misnamed feature branch (i.e. it uses the default config) from develop and verify the version
+            fixture.BranchTo("misnamed");
+            fixture.AssertFullSemver("1.1.0-misnamed.1+1");
         }
 
         [Test]
@@ -290,12 +399,13 @@ public void ShouldPickUpVersionFromDevelopAfterReleaseBranchMergedBack()
             fixture.MergeNoFF("release/1.0");
             fixture.AssertFullSemver("1.1.0-alpha.2");
 
-            // create a feature branch from develop and verify the version
-            fixture.BranchTo("feature/test");
-            fixture.AssertFullSemver("1.1.0-test.1+2");
+            // create a misnamed feature branch (i.e. it uses the default config) from develop and verify the version
+            fixture.BranchTo("misnamed");
+            fixture.AssertFullSemver("1.1.0-misnamed.1+2");
         }
 
-        public class WhenMainAsIsDevelop
+        // ReSharper disable once MemberHidesStaticFromOuterClass
+        public class WhenMainMarkedAsIsDevelop
         {
             [Test]
             public void ShouldPickUpVersionFromMainAfterReleaseBranchCreated()
@@ -323,9 +433,9 @@ public void ShouldPickUpVersionFromMainAfterReleaseBranchCreated()
                 fixture.MakeACommit();
                 fixture.AssertFullSemver("1.0.1+1", config);
 
-                // create a feature branch from main and verify the version
-                fixture.BranchTo("feature/test");
-                fixture.AssertFullSemver("1.0.1-test.1+1", config);
+                // create a misnamed feature branch (i.e. it uses the default config) from main and verify the version
+                fixture.BranchTo("misnamed");
+                fixture.AssertFullSemver("1.0.1-misnamed.1+1", config);
             }
 
             [Test]
@@ -356,208 +466,97 @@ public void ShouldPickUpVersionFromMainAfterReleaseBranchMergedBack()
                 fixture.MergeNoFF("release/1.0");
                 fixture.AssertFullSemver("1.0.1+2", config);
 
-                // create a feature branch from main and verify the version
-                fixture.BranchTo("feature/test");
-                fixture.AssertFullSemver("1.0.1-test.1+2", config);
-            }
-        }
-
-        public class WhenFeatureBranchHasNoConfig
-        {
-            [Test]
-            public void ShouldPickUpVersionFromMainAfterReleaseBranchCreated()
-            {
-                using var fixture = new EmptyRepositoryFixture();
-                // Create develop and release branches
-                fixture.MakeACommit();
-                fixture.BranchTo("develop");
-                fixture.MakeACommit();
-                fixture.BranchTo("release/1.0");
-                fixture.MakeACommit();
-                fixture.Checkout("develop");
-                fixture.MakeACommit();
-                fixture.AssertFullSemver("1.1.0-alpha.1");
-
-                // create a misnamed feature branch (i.e. it uses the default config) from develop and verify the version
+                // create a misnamed feature branch (i.e. it uses the default config) from main and verify the version
                 fixture.BranchTo("misnamed");
-                fixture.AssertFullSemver("1.1.0-misnamed.1+1");
-            }
-
-            [Test]
-            public void ShouldPickUpVersionFromDevelopAfterReleaseBranchMergedBack()
-            {
-                using var fixture = new EmptyRepositoryFixture();
-                // Create develop and release branches
-                fixture.MakeACommit();
-                fixture.BranchTo("develop");
-                fixture.MakeACommit();
-                fixture.BranchTo("release/1.0");
-                fixture.MakeACommit();
-
-                // merge release into develop
-                fixture.Checkout("develop");
-                fixture.MergeNoFF("release/1.0");
-                fixture.AssertFullSemver("1.1.0-alpha.2");
-
-                // create a misnamed feature branch (i.e. it uses the default config) from develop and verify the version
-                fixture.BranchTo("misnamed");
-                fixture.AssertFullSemver("1.1.0-misnamed.1+2");
-            }
-
-            // ReSharper disable once MemberHidesStaticFromOuterClass
-            public class WhenMainMarkedAsIsDevelop
-            {
-                [Test]
-                public void ShouldPickUpVersionFromMainAfterReleaseBranchCreated()
-                {
-                    var config = new Config
-                    {
-                        Branches = new Dictionary<string, BranchConfig>
-                        {
-                            {
-                                MainBranch, new BranchConfig
-                                {
-                                    TracksReleaseBranches = true,
-                                    Regex = MainBranch
-                                }
-                            }
-                        }
-                    };
-
-                    using var fixture = new EmptyRepositoryFixture();
-                    // Create release branch
-                    fixture.MakeACommit();
-                    fixture.BranchTo("release/1.0");
-                    fixture.MakeACommit();
-                    fixture.Checkout(MainBranch);
-                    fixture.MakeACommit();
-                    fixture.AssertFullSemver("1.0.1+1", config);
-
-                    // create a misnamed feature branch (i.e. it uses the default config) from main and verify the version
-                    fixture.BranchTo("misnamed");
-                    fixture.AssertFullSemver("1.0.1-misnamed.1+1", config);
-                }
-
-                [Test]
-                public void ShouldPickUpVersionFromMainAfterReleaseBranchMergedBack()
-                {
-                    var config = new Config
-                    {
-                        Branches = new Dictionary<string, BranchConfig>
-                        {
-                            {
-                                MainBranch, new BranchConfig
-                                {
-                                    TracksReleaseBranches = true,
-                                    Regex = MainBranch
-                                }
-                            }
-                        }
-                    };
-
-                    using var fixture = new EmptyRepositoryFixture();
-                    // Create release branch
-                    fixture.MakeACommit();
-                    fixture.BranchTo("release/1.0");
-                    fixture.MakeACommit();
-
-                    // merge release into main
-                    fixture.Checkout(MainBranch);
-                    fixture.MergeNoFF("release/1.0");
-                    fixture.AssertFullSemver("1.0.1+2", config);
-
-                    // create a misnamed feature branch (i.e. it uses the default config) from main and verify the version
-                    fixture.BranchTo("misnamed");
-                    fixture.AssertFullSemver("1.0.1-misnamed.1+2", config);
-                }
+                fixture.AssertFullSemver("1.0.1-misnamed.1+2", config);
             }
         }
+    }
 
-        [Test]
-        public void PickUpVersionFromMainMarkedWithIsTracksReleaseBranches()
+    [Test]
+    public void PickUpVersionFromMainMarkedWithIsTracksReleaseBranches()
+    {
+        var config = new Config
         {
-            var config = new Config
+            VersioningMode = VersioningMode.ContinuousDelivery,
+            Branches = new Dictionary<string, BranchConfig>
             {
-                VersioningMode = VersioningMode.ContinuousDelivery,
-                Branches = new Dictionary<string, BranchConfig>
                 {
+                    MainBranch, new BranchConfig
                     {
-                        MainBranch, new BranchConfig
-                        {
-                            Tag = "pre",
-                            TracksReleaseBranches = true,
-                        }
-                    },
+                        Tag = "pre",
+                        TracksReleaseBranches = true,
+                    }
+                },
+                {
+                    "release", new BranchConfig
                     {
-                        "release", new BranchConfig
-                        {
-                            IsReleaseBranch = true,
-                            Tag = "rc",
-                        }
+                        IsReleaseBranch = true,
+                        Tag = "rc",
                     }
                 }
-            };
+            }
+        };
 
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit();
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
 
-            // create a release branch and tag a release
-            fixture.BranchTo("release/0.10.0");
-            fixture.MakeACommit();
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("0.10.0-rc.1+2", config);
+        // create a release branch and tag a release
+        fixture.BranchTo("release/0.10.0");
+        fixture.MakeACommit();
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("0.10.0-rc.1+2", config);
 
-            // switch to main and verify the version
-            fixture.Checkout(MainBranch);
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("0.10.1-pre.1+1", config);
+        // switch to main and verify the version
+        fixture.Checkout(MainBranch);
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("0.10.1-pre.1+1", config);
 
-            // create a feature branch from main and verify the version
-            fixture.BranchTo("MyFeatureD");
-            fixture.AssertFullSemver("0.10.1-MyFeatureD.1+1", config);
-        }
+        // create a feature branch from main and verify the version
+        fixture.BranchTo("MyFeatureD");
+        fixture.AssertFullSemver("0.10.1-MyFeatureD.1+1", config);
+    }
 
-        [Test]
-        public void ShouldHaveAGreaterSemVerAfterDevelopIsMergedIntoFeature()
+    [Test]
+    public void ShouldHaveAGreaterSemVerAfterDevelopIsMergedIntoFeature()
+    {
+        var config = new Config
         {
-            var config = new Config
+            VersioningMode = VersioningMode.ContinuousDeployment,
+            AssemblyVersioningScheme = AssemblyVersioningScheme.Major,
+            AssemblyFileVersioningFormat = "{MajorMinorPatch}.{env:WeightedPreReleaseNumber ?? 0}",
+            LegacySemVerPadding = 4,
+            BuildMetaDataPadding = 4,
+            CommitsSinceVersionSourcePadding = 4,
+            CommitMessageIncrementing = CommitMessageIncrementMode.Disabled,
+            Branches = new Dictionary<string, BranchConfig>
             {
-                VersioningMode = VersioningMode.ContinuousDeployment,
-                AssemblyVersioningScheme = AssemblyVersioningScheme.Major,
-                AssemblyFileVersioningFormat = "{MajorMinorPatch}.{env:WeightedPreReleaseNumber ?? 0}",
-                LegacySemVerPadding = 4,
-                BuildMetaDataPadding = 4,
-                CommitsSinceVersionSourcePadding = 4,
-                CommitMessageIncrementing = CommitMessageIncrementMode.Disabled,
-                Branches = new Dictionary<string, BranchConfig>
                 {
+                    "develop", new BranchConfig
                     {
-                        "develop", new BranchConfig
-                        {
-                            PreventIncrementOfMergedBranchVersion = true
-                        }
-                    },
+                        PreventIncrementOfMergedBranchVersion = true
+                    }
+                },
+                {
+                    "feature", new BranchConfig
                     {
-                        "feature", new BranchConfig
-                        {
-                            Tag = "feat-{BranchName}"
-                        }
+                        Tag = "feat-{BranchName}"
                     }
                 }
-            };
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit();
-            fixture.BranchTo("develop");
-            fixture.MakeACommit();
-            fixture.ApplyTag("16.23.0");
-            fixture.MakeACommit();
-            fixture.BranchTo("feature/featX");
-            fixture.MakeACommit();
-            fixture.Checkout("develop");
-            fixture.MakeACommit();
-            fixture.Checkout("feature/featX");
-            fixture.MergeNoFF("develop");
-            fixture.AssertFullSemver("16.24.0-feat-featX.4", config);
-        }
+            }
+        };
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.BranchTo("develop");
+        fixture.MakeACommit();
+        fixture.ApplyTag("16.23.0");
+        fixture.MakeACommit();
+        fixture.BranchTo("feature/featX");
+        fixture.MakeACommit();
+        fixture.Checkout("develop");
+        fixture.MakeACommit();
+        fixture.Checkout("feature/featX");
+        fixture.MergeNoFF("develop");
+        fixture.AssertFullSemver("16.24.0-feat-featX.4", config);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/FileSystemTests.cs b/src/GitVersion.Core.Tests/IntegrationTests/FileSystemTests.cs
index 34bf031aae..2f3533ea41 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/FileSystemTests.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/FileSystemTests.cs
@@ -4,55 +4,54 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class FileSystemTests : TestBase
 {
-    [TestFixture]
-    public class FileSystemTests : TestBase
-    {
-        public string TempFilePath { get; set; }
+    public string TempFilePath { get; set; }
 
-        [SetUp]
-        public void CreateTempFile() => TempFilePath = Path.GetTempFileName();
+    [SetUp]
+    public void CreateTempFile() => TempFilePath = Path.GetTempFileName();
 
-        [TearDown]
-        public void Cleanup() => File.Delete(TempFilePath);
+    [TearDown]
+    public void Cleanup() => File.Delete(TempFilePath);
 
-        [TestCase("utf-32")]
-        [TestCase("utf-32BE")]
-        [TestCase("utf-16")]
-        [TestCase("utf-16BE")]
-        [TestCase("utf-8")]
-        public void WhenFileExistsWithEncodingPreambleEncodingIsPreservedAfterWriteAll(string encodingName)
-        {
-            var encoding = Encoding.GetEncoding(encodingName);
+    [TestCase("utf-32")]
+    [TestCase("utf-32BE")]
+    [TestCase("utf-16")]
+    [TestCase("utf-16BE")]
+    [TestCase("utf-8")]
+    public void WhenFileExistsWithEncodingPreambleEncodingIsPreservedAfterWriteAll(string encodingName)
+    {
+        var encoding = Encoding.GetEncoding(encodingName);
 
-            File.WriteAllText(TempFilePath, "(－‸ლ)", encoding);
+        File.WriteAllText(TempFilePath, "(－‸ლ)", encoding);
 
-            var fileSystem = new FileSystem();
-            fileSystem.WriteAllText(TempFilePath, @"¯\(◉◡◔)/¯");
+        var fileSystem = new FileSystem();
+        fileSystem.WriteAllText(TempFilePath, @"¯\(◉◡◔)/¯");
 
-            using var stream = File.OpenRead(TempFilePath);
-            var preamble = encoding.GetPreamble();
-            var bytes = new byte[preamble.Length];
-            stream.Read(bytes, 0, preamble.Length);
+        using var stream = File.OpenRead(TempFilePath);
+        var preamble = encoding.GetPreamble();
+        var bytes = new byte[preamble.Length];
+        stream.Read(bytes, 0, preamble.Length);
 
-            bytes.ShouldBe(preamble);
-        }
+        bytes.ShouldBe(preamble);
+    }
 
-        [Test]
-        public void WhenFileDoesNotExistCreateWithUtf8WithPreamble()
-        {
-            var encoding = Encoding.UTF8;
+    [Test]
+    public void WhenFileDoesNotExistCreateWithUtf8WithPreamble()
+    {
+        var encoding = Encoding.UTF8;
 
-            var fileSystem = new FileSystem();
-            fileSystem.WriteAllText(TempFilePath, "╚(ಠ_ಠ)=┐");
+        var fileSystem = new FileSystem();
+        fileSystem.WriteAllText(TempFilePath, "╚(ಠ_ಠ)=┐");
 
-            using var stream = File.OpenRead(TempFilePath);
-            var preamble = encoding.GetPreamble();
-            var bytes = new byte[preamble.Length];
-            stream.Read(bytes, 0, preamble.Length);
+        using var stream = File.OpenRead(TempFilePath);
+        var preamble = encoding.GetPreamble();
+        var bytes = new byte[preamble.Length];
+        stream.Read(bytes, 0, preamble.Length);
 
-            bytes.ShouldBe(preamble);
-        }
+        bytes.ShouldBe(preamble);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs
index eab63072d9..fdd91f6b60 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs
@@ -7,225 +7,224 @@
 using LibGit2Sharp;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class HotfixBranchScenarios : TestBase
 {
-    [TestFixture]
-    public class HotfixBranchScenarios : TestBase
+    [Test]
+    // This test actually validates #465 as well
+    public void PatchLatestReleaseExample()
     {
-        [Test]
-        // This test actually validates #465 as well
-        public void PatchLatestReleaseExample()
-        {
-            using var fixture = new BaseGitFlowRepositoryFixture("1.2.0");
-            // create hotfix
-            Commands.Checkout(fixture.Repository, MainBranch);
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("hotfix-1.2.1"));
-            fixture.Repository.MakeACommit();
-
-            fixture.AssertFullSemver("1.2.1-beta.1+1");
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.2.1-beta.1+2");
-            fixture.Repository.ApplyTag("1.2.1-beta.1");
-            fixture.AssertFullSemver("1.2.1-beta.1");
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.2.1-beta.2+3");
-
-            // Merge hotfix branch to main
-            Commands.Checkout(fixture.Repository, MainBranch);
-
-            fixture.Repository.MergeNoFF("hotfix-1.2.1", Generate.SignatureNow());
-            fixture.AssertFullSemver("1.2.1+4");
-
-            fixture.Repository.ApplyTag("1.2.1");
-            fixture.AssertFullSemver("1.2.1");
-
-            // Verify develop version
-            Commands.Checkout(fixture.Repository, "develop");
-            fixture.AssertFullSemver("1.3.0-alpha.1");
-
-            fixture.Repository.MergeNoFF("hotfix-1.2.1", Generate.SignatureNow());
-            fixture.AssertFullSemver("1.3.0-alpha.5");
-        }
-
-        [Test]
-        public void CanTakeVersionFromHotfixesBranch()
-        {
-            using var fixture = new BaseGitFlowRepositoryFixture(r =>
-            {
-                r.MakeATaggedCommit("1.0.0");
-                r.MakeATaggedCommit("1.1.0");
-                r.MakeATaggedCommit("2.0.0");
-            });
-            // Merge hotfix branch to support
-            Commands.Checkout(fixture.Repository, MainBranch);
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("support-1.1", (Commit)fixture.Repository.Tags.Single(t => t.FriendlyName == "1.1.0").Target));
-            fixture.AssertFullSemver("1.1.0");
-
-            // create hotfix branch
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("hotfixes/1.1.1"));
-            fixture.AssertFullSemver("1.1.0"); // We are still on a tagged commit
-            fixture.Repository.MakeACommit();
-
-            fixture.AssertFullSemver("1.1.1-beta.1+1");
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.1.1-beta.1+2");
-        }
-
-        [Test]
-        public void PatchOlderReleaseExample()
+        using var fixture = new BaseGitFlowRepositoryFixture("1.2.0");
+        // create hotfix
+        Commands.Checkout(fixture.Repository, MainBranch);
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("hotfix-1.2.1"));
+        fixture.Repository.MakeACommit();
+
+        fixture.AssertFullSemver("1.2.1-beta.1+1");
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("1.2.1-beta.1+2");
+        fixture.Repository.ApplyTag("1.2.1-beta.1");
+        fixture.AssertFullSemver("1.2.1-beta.1");
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("1.2.1-beta.2+3");
+
+        // Merge hotfix branch to main
+        Commands.Checkout(fixture.Repository, MainBranch);
+
+        fixture.Repository.MergeNoFF("hotfix-1.2.1", Generate.SignatureNow());
+        fixture.AssertFullSemver("1.2.1+4");
+
+        fixture.Repository.ApplyTag("1.2.1");
+        fixture.AssertFullSemver("1.2.1");
+
+        // Verify develop version
+        Commands.Checkout(fixture.Repository, "develop");
+        fixture.AssertFullSemver("1.3.0-alpha.1");
+
+        fixture.Repository.MergeNoFF("hotfix-1.2.1", Generate.SignatureNow());
+        fixture.AssertFullSemver("1.3.0-alpha.5");
+    }
+
+    [Test]
+    public void CanTakeVersionFromHotfixesBranch()
+    {
+        using var fixture = new BaseGitFlowRepositoryFixture(r =>
         {
-            using var fixture = new BaseGitFlowRepositoryFixture(r =>
-            {
-                r.MakeATaggedCommit("1.0.0");
-                r.MakeATaggedCommit("1.1.0");
-                r.MakeATaggedCommit("2.0.0");
-            });
-            // Merge hotfix branch to support
-            Commands.Checkout(fixture.Repository, MainBranch);
-            var tag = fixture.Repository.Tags.Single(t => t.FriendlyName == "1.1.0");
-            var supportBranch = fixture.Repository.CreateBranch("support-1.1", (Commit)tag.Target);
-            Commands.Checkout(fixture.Repository, supportBranch);
-            fixture.AssertFullSemver("1.1.0");
-
-            // create hotfix branch
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("hotfix-1.1.1"));
-            fixture.AssertFullSemver("1.1.0"); // We are still on a tagged commit
-            fixture.Repository.MakeACommit();
-
-            fixture.AssertFullSemver("1.1.1-beta.1+1");
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.1.1-beta.1+2");
-
-            // Create feature branch off hotfix branch and complete
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/fix"));
-            fixture.AssertFullSemver("1.1.1-fix.1+2");
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.1.1-fix.1+3");
-
-            fixture.Repository.CreatePullRequestRef("feature/fix", "hotfix-1.1.1", normalise: true, prNumber: 8);
-            fixture.AssertFullSemver("1.1.1-PullRequest0008.4");
-            Commands.Checkout(fixture.Repository, "hotfix-1.1.1");
-            fixture.Repository.MergeNoFF("feature/fix", Generate.SignatureNow());
-            fixture.AssertFullSemver("1.1.1-beta.1+4");
-
-            // Merge hotfix into support branch to complete hotfix
-            Commands.Checkout(fixture.Repository, "support-1.1");
-            fixture.Repository.MergeNoFF("hotfix-1.1.1", Generate.SignatureNow());
-            fixture.AssertFullSemver("1.1.1+5");
-            fixture.Repository.ApplyTag("1.1.1");
-            fixture.AssertFullSemver("1.1.1");
-
-            // Verify develop version
-            Commands.Checkout(fixture.Repository, "develop");
-            fixture.AssertFullSemver("2.1.0-alpha.1");
-            fixture.Repository.MergeNoFF("support-1.1", Generate.SignatureNow());
-            fixture.AssertFullSemver("2.1.0-alpha.7");
-        }
-
-        /// <summary>
-        /// Create a feature branch from a hotfix branch, and merge back, then delete it
-        /// </summary>
-        [Test]
-        public void FeatureOnHotfixFeatureBranchDeleted()
+            r.MakeATaggedCommit("1.0.0");
+            r.MakeATaggedCommit("1.1.0");
+            r.MakeATaggedCommit("2.0.0");
+        });
+        // Merge hotfix branch to support
+        Commands.Checkout(fixture.Repository, MainBranch);
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("support-1.1", (Commit)fixture.Repository.Tags.Single(t => t.FriendlyName == "1.1.0").Target));
+        fixture.AssertFullSemver("1.1.0");
+
+        // create hotfix branch
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("hotfixes/1.1.1"));
+        fixture.AssertFullSemver("1.1.0"); // We are still on a tagged commit
+        fixture.Repository.MakeACommit();
+
+        fixture.AssertFullSemver("1.1.1-beta.1+1");
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("1.1.1-beta.1+2");
+    }
+
+    [Test]
+    public void PatchOlderReleaseExample()
+    {
+        using var fixture = new BaseGitFlowRepositoryFixture(r =>
         {
-            var config = new Config
-            {
-                AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
-                VersioningMode = VersioningMode.ContinuousDeployment
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            var release450 = "release/4.5.0";
-            var hotfix451 = "hotfix/4.5.1";
-            var support45 = "support/4.5";
-            var tag450 = "4.5.0";
-            var featureBranch = "feature/some-bug-fix";
-
-            fixture.Repository.MakeACommit("initial");
-            fixture.Repository.CreateBranch("develop");
-            Commands.Checkout(fixture.Repository, "develop");
-
-            // create release branch
-            fixture.Repository.CreateBranch(release450);
-            Commands.Checkout(fixture.Repository, release450);
-            fixture.AssertFullSemver("4.5.0-beta.0", config);
-            fixture.Repository.MakeACommit("blabla");
-            Commands.Checkout(fixture.Repository, "develop");
-            fixture.Repository.MergeNoFF(release450, Generate.SignatureNow());
-            Commands.Checkout(fixture.Repository, MainBranch);
-            fixture.Repository.MergeNoFF(release450, Generate.SignatureNow());
-
-            // create support branch
-            fixture.Repository.CreateBranch(support45);
-            Commands.Checkout(fixture.Repository, support45);
-            fixture.Repository.ApplyTag(tag450);
-            fixture.AssertFullSemver("4.5.0", config);
-
-            // create hotfix branch
-            fixture.Repository.CreateBranch(hotfix451);
-            Commands.Checkout(fixture.Repository, hotfix451);
-
-            // feature branch from hotfix
-            fixture.Repository.CreateBranch(featureBranch);
-            Commands.Checkout(fixture.Repository, featureBranch);
-            fixture.Repository.MakeACommit("blabla"); // commit 1
-            Commands.Checkout(fixture.Repository, hotfix451);
-            fixture.Repository.MergeNoFF(featureBranch, Generate.SignatureNow()); // commit 2
-            fixture.Repository.Branches.Remove(featureBranch);
-            fixture.AssertFullSemver("4.5.1-beta.2", config);
-        }
-
-        /// <summary>
-        /// Create a feature branch from a hotfix branch, and merge back, but don't delete it
-        /// </summary>
-        [Test]
-        public void FeatureOnHotfixFeatureBranchNotDeleted()
+            r.MakeATaggedCommit("1.0.0");
+            r.MakeATaggedCommit("1.1.0");
+            r.MakeATaggedCommit("2.0.0");
+        });
+        // Merge hotfix branch to support
+        Commands.Checkout(fixture.Repository, MainBranch);
+        var tag = fixture.Repository.Tags.Single(t => t.FriendlyName == "1.1.0");
+        var supportBranch = fixture.Repository.CreateBranch("support-1.1", (Commit)tag.Target);
+        Commands.Checkout(fixture.Repository, supportBranch);
+        fixture.AssertFullSemver("1.1.0");
+
+        // create hotfix branch
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("hotfix-1.1.1"));
+        fixture.AssertFullSemver("1.1.0"); // We are still on a tagged commit
+        fixture.Repository.MakeACommit();
+
+        fixture.AssertFullSemver("1.1.1-beta.1+1");
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("1.1.1-beta.1+2");
+
+        // Create feature branch off hotfix branch and complete
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/fix"));
+        fixture.AssertFullSemver("1.1.1-fix.1+2");
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("1.1.1-fix.1+3");
+
+        fixture.Repository.CreatePullRequestRef("feature/fix", "hotfix-1.1.1", normalise: true, prNumber: 8);
+        fixture.AssertFullSemver("1.1.1-PullRequest0008.4");
+        Commands.Checkout(fixture.Repository, "hotfix-1.1.1");
+        fixture.Repository.MergeNoFF("feature/fix", Generate.SignatureNow());
+        fixture.AssertFullSemver("1.1.1-beta.1+4");
+
+        // Merge hotfix into support branch to complete hotfix
+        Commands.Checkout(fixture.Repository, "support-1.1");
+        fixture.Repository.MergeNoFF("hotfix-1.1.1", Generate.SignatureNow());
+        fixture.AssertFullSemver("1.1.1+5");
+        fixture.Repository.ApplyTag("1.1.1");
+        fixture.AssertFullSemver("1.1.1");
+
+        // Verify develop version
+        Commands.Checkout(fixture.Repository, "develop");
+        fixture.AssertFullSemver("2.1.0-alpha.1");
+        fixture.Repository.MergeNoFF("support-1.1", Generate.SignatureNow());
+        fixture.AssertFullSemver("2.1.0-alpha.7");
+    }
+
+    /// <summary>
+    /// Create a feature branch from a hotfix branch, and merge back, then delete it
+    /// </summary>
+    [Test]
+    public void FeatureOnHotfixFeatureBranchDeleted()
+    {
+        var config = new Config
         {
-            var config = new Config
-            {
-                AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
-                VersioningMode = VersioningMode.ContinuousDeployment
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            var release450 = "release/4.5.0";
-            var hotfix451 = "hotfix/4.5.1";
-            var support45 = "support/4.5";
-            var tag450 = "4.5.0";
-            var featureBranch = "feature/some-bug-fix";
-
-            fixture.Repository.MakeACommit("initial");
-            fixture.Repository.CreateBranch("develop");
-            Commands.Checkout(fixture.Repository, "develop");
-
-            // create release branch
-            fixture.Repository.CreateBranch(release450);
-            Commands.Checkout(fixture.Repository, release450);
-            fixture.AssertFullSemver("4.5.0-beta.0", config);
-            fixture.Repository.MakeACommit("blabla");
-            Commands.Checkout(fixture.Repository, "develop");
-            fixture.Repository.MergeNoFF(release450, Generate.SignatureNow());
-            Commands.Checkout(fixture.Repository, MainBranch);
-            fixture.Repository.MergeNoFF(release450, Generate.SignatureNow());
-
-            // create support branch
-            fixture.Repository.CreateBranch(support45);
-            Commands.Checkout(fixture.Repository, support45);
-            fixture.Repository.ApplyTag(tag450);
-            fixture.AssertFullSemver("4.5.0", config);
-
-            // create hotfix branch
-            fixture.Repository.CreateBranch(hotfix451);
-            Commands.Checkout(fixture.Repository, hotfix451);
-
-            // feature branch from hotfix
-            fixture.Repository.CreateBranch(featureBranch);
-            Commands.Checkout(fixture.Repository, featureBranch);
-            fixture.Repository.MakeACommit("blabla"); // commit 1
-            Commands.Checkout(fixture.Repository, hotfix451);
-            fixture.Repository.MergeNoFF(featureBranch, Generate.SignatureNow()); // commit 2
-            fixture.AssertFullSemver("4.5.1-beta.2", config);
-        }
+            AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
+            VersioningMode = VersioningMode.ContinuousDeployment
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        var release450 = "release/4.5.0";
+        var hotfix451 = "hotfix/4.5.1";
+        var support45 = "support/4.5";
+        var tag450 = "4.5.0";
+        var featureBranch = "feature/some-bug-fix";
+
+        fixture.Repository.MakeACommit("initial");
+        fixture.Repository.CreateBranch("develop");
+        Commands.Checkout(fixture.Repository, "develop");
+
+        // create release branch
+        fixture.Repository.CreateBranch(release450);
+        Commands.Checkout(fixture.Repository, release450);
+        fixture.AssertFullSemver("4.5.0-beta.0", config);
+        fixture.Repository.MakeACommit("blabla");
+        Commands.Checkout(fixture.Repository, "develop");
+        fixture.Repository.MergeNoFF(release450, Generate.SignatureNow());
+        Commands.Checkout(fixture.Repository, MainBranch);
+        fixture.Repository.MergeNoFF(release450, Generate.SignatureNow());
+
+        // create support branch
+        fixture.Repository.CreateBranch(support45);
+        Commands.Checkout(fixture.Repository, support45);
+        fixture.Repository.ApplyTag(tag450);
+        fixture.AssertFullSemver("4.5.0", config);
+
+        // create hotfix branch
+        fixture.Repository.CreateBranch(hotfix451);
+        Commands.Checkout(fixture.Repository, hotfix451);
+
+        // feature branch from hotfix
+        fixture.Repository.CreateBranch(featureBranch);
+        Commands.Checkout(fixture.Repository, featureBranch);
+        fixture.Repository.MakeACommit("blabla"); // commit 1
+        Commands.Checkout(fixture.Repository, hotfix451);
+        fixture.Repository.MergeNoFF(featureBranch, Generate.SignatureNow()); // commit 2
+        fixture.Repository.Branches.Remove(featureBranch);
+        fixture.AssertFullSemver("4.5.1-beta.2", config);
+    }
 
+    /// <summary>
+    /// Create a feature branch from a hotfix branch, and merge back, but don't delete it
+    /// </summary>
+    [Test]
+    public void FeatureOnHotfixFeatureBranchNotDeleted()
+    {
+        var config = new Config
+        {
+            AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
+            VersioningMode = VersioningMode.ContinuousDeployment
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        var release450 = "release/4.5.0";
+        var hotfix451 = "hotfix/4.5.1";
+        var support45 = "support/4.5";
+        var tag450 = "4.5.0";
+        var featureBranch = "feature/some-bug-fix";
+
+        fixture.Repository.MakeACommit("initial");
+        fixture.Repository.CreateBranch("develop");
+        Commands.Checkout(fixture.Repository, "develop");
+
+        // create release branch
+        fixture.Repository.CreateBranch(release450);
+        Commands.Checkout(fixture.Repository, release450);
+        fixture.AssertFullSemver("4.5.0-beta.0", config);
+        fixture.Repository.MakeACommit("blabla");
+        Commands.Checkout(fixture.Repository, "develop");
+        fixture.Repository.MergeNoFF(release450, Generate.SignatureNow());
+        Commands.Checkout(fixture.Repository, MainBranch);
+        fixture.Repository.MergeNoFF(release450, Generate.SignatureNow());
+
+        // create support branch
+        fixture.Repository.CreateBranch(support45);
+        Commands.Checkout(fixture.Repository, support45);
+        fixture.Repository.ApplyTag(tag450);
+        fixture.AssertFullSemver("4.5.0", config);
+
+        // create hotfix branch
+        fixture.Repository.CreateBranch(hotfix451);
+        Commands.Checkout(fixture.Repository, hotfix451);
+
+        // feature branch from hotfix
+        fixture.Repository.CreateBranch(featureBranch);
+        Commands.Checkout(fixture.Repository, featureBranch);
+        fixture.Repository.MakeACommit("blabla"); // commit 1
+        Commands.Checkout(fixture.Repository, hotfix451);
+        fixture.Repository.MergeNoFF(featureBranch, Generate.SignatureNow()); // commit 2
+        fixture.AssertFullSemver("4.5.1-beta.2", config);
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/IgnoreBeforeScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/IgnoreBeforeScenarios.cs
index a5ca206c70..87a6499656 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/IgnoreBeforeScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/IgnoreBeforeScenarios.cs
@@ -6,30 +6,29 @@
 using NSubstitute;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class IgnoreBeforeScenarios : TestBase
 {
-    [TestFixture]
-    public class IgnoreBeforeScenarios : TestBase
+    [Test]
+    public void ShouldFallbackToBaseVersionWhenAllCommitsAreIgnored()
     {
-        [Test]
-        public void ShouldFallbackToBaseVersionWhenAllCommitsAreIgnored()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            var objectId = fixture.Repository.MakeACommit();
-            var commit = Substitute.For<ICommit>();
-            commit.Sha.Returns(objectId.Sha);
-            commit.When.Returns(DateTimeOffset.Now);
+        using var fixture = new EmptyRepositoryFixture();
+        var objectId = fixture.Repository.MakeACommit();
+        var commit = Substitute.For<ICommit>();
+        commit.Sha.Returns(objectId.Sha);
+        commit.When.Returns(DateTimeOffset.Now);
 
-            var config = new ConfigurationBuilder()
-                .Add(new Config
+        var config = new ConfigurationBuilder()
+            .Add(new Config
+            {
+                Ignore = new IgnoreConfig
                 {
-                    Ignore = new IgnoreConfig
-                    {
-                        Before = commit.When.AddMinutes(1)
-                    }
-                }).Build();
+                    Before = commit.When.AddMinutes(1)
+                }
+            }).Build();
 
-            fixture.AssertFullSemver("0.1.0+0", config);
-        }
+        fixture.AssertFullSemver("0.1.0+0", config);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs
index f8fe207d99..0739ac7d36 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs
@@ -5,206 +5,205 @@
 using LibGit2Sharp;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class MainScenarios : TestBase
 {
-    [TestFixture]
-    public class MainScenarios : TestBase
+    [Test]
+    public void CanHandleContinuousDelivery()
     {
-        [Test]
-        public void CanHandleContinuousDelivery()
+        var config = new Config
         {
-            var config = new Config
+            Branches =
             {
-                Branches =
                 {
+                    MainBranch, new BranchConfig
                     {
-                        MainBranch, new BranchConfig
-                        {
-                            VersioningMode = VersioningMode.ContinuousDelivery
-                        }
+                        VersioningMode = VersioningMode.ContinuousDelivery
                     }
                 }
-            };
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.MakeCommits(2);
-            fixture.AssertFullSemver("1.0.1+2", config);
-        }
-
-        [Test]
-        public void CanHandleContinuousDeployment()
+            }
+        };
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.MakeCommits(2);
+        fixture.AssertFullSemver("1.0.1+2", config);
+    }
+
+    [Test]
+    public void CanHandleContinuousDeployment()
+    {
+        var config = new Config
         {
-            var config = new Config
+            Branches =
             {
-                Branches =
                 {
+                    MainBranch, new BranchConfig
                     {
-                        MainBranch, new BranchConfig
-                        {
-                            VersioningMode = VersioningMode.ContinuousDeployment
-                        }
+                        VersioningMode = VersioningMode.ContinuousDeployment
                     }
                 }
-            };
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.MakeCommits(2);
-            fixture.AssertFullSemver("1.0.1-ci.2", config);
-        }
-
-        [Test]
-        public void GivenARepositoryWithCommitsButNoTagsVersionShouldBe01()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            // Given
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
-
-            // When
-            fixture.AssertFullSemver("0.1.0+2");
-        }
-
-        [Test]
-        public void GivenARepositoryWithCommitsButBadTagsVersionShouldBe01()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            // Given
-            fixture.Repository.MakeACommit();
-            fixture.Repository.ApplyTag("BadTag");
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
-
-            // When
-            fixture.AssertFullSemver("0.1.0+2");
-        }
-
-        [Test]
-        public void GivenARepositoryWithCommitsButNoTagsWithDetachedHeadVersionShouldBe01()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            // Given
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
-
-            var commit = fixture.Repository.Head.Tip;
-            fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, commit);
-
-            // When
-            fixture.AssertFullSemver("0.1.0+2", onlyTrackedBranches: false);
-        }
-
-        [Test]
-        public void GivenARepositoryWithTagAndNextVersionInConfigVersionShouldMatchVersionTxtFile()
-        {
-            const string expectedNextVersion = "1.1.0";
-            var config = new Config { NextVersion = expectedNextVersion };
-            using var fixture = new EmptyRepositoryFixture();
-            const string taggedVersion = "1.0.3";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
-            fixture.Repository.MakeCommits(5);
-
-            fixture.AssertFullSemver("1.1.0+5", config);
-        }
-
-        [Test]
-        public void GivenARepositoryWithTagAndANextVersionTxtFileAndNoCommitsVersionShouldBeTag()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            const string taggedVersion = "1.0.3";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
+            }
+        };
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.MakeCommits(2);
+        fixture.AssertFullSemver("1.0.1-ci.2", config);
+    }
 
-            fixture.AssertFullSemver("1.0.3", new Config { NextVersion = "1.1.0" });
-        }
+    [Test]
+    public void GivenARepositoryWithCommitsButNoTagsVersionShouldBe01()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        // Given
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
+
+        // When
+        fixture.AssertFullSemver("0.1.0+2");
+    }
 
-        [Test]
-        public void GivenARepositoryWithTagAndNoNextVersionTxtFileVersionShouldBeTagWithBumpedPatch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            const string taggedVersion = "1.0.3";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
-            fixture.Repository.MakeCommits(5);
+    [Test]
+    public void GivenARepositoryWithCommitsButBadTagsVersionShouldBe01()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        // Given
+        fixture.Repository.MakeACommit();
+        fixture.Repository.ApplyTag("BadTag");
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
+
+        // When
+        fixture.AssertFullSemver("0.1.0+2");
+    }
 
-            fixture.AssertFullSemver("1.0.4+5");
-        }
+    [Test]
+    public void GivenARepositoryWithCommitsButNoTagsWithDetachedHeadVersionShouldBe01()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        // Given
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
+
+        var commit = fixture.Repository.Head.Tip;
+        fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, commit);
+
+        // When
+        fixture.AssertFullSemver("0.1.0+2", onlyTrackedBranches: false);
+    }
 
-        [Test]
-        public void GivenARepositoryWithTagAndNoNextVersionTxtFileAndNoCommitsVersionShouldBeTag()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            const string taggedVersion = "1.0.3";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
+    [Test]
+    public void GivenARepositoryWithTagAndNextVersionInConfigVersionShouldMatchVersionTxtFile()
+    {
+        const string expectedNextVersion = "1.1.0";
+        var config = new Config { NextVersion = expectedNextVersion };
+        using var fixture = new EmptyRepositoryFixture();
+        const string taggedVersion = "1.0.3";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.Repository.MakeCommits(5);
+
+        fixture.AssertFullSemver("1.1.0+5", config);
+    }
 
-            fixture.AssertFullSemver("1.0.3");
-        }
+    [Test]
+    public void GivenARepositoryWithTagAndANextVersionTxtFileAndNoCommitsVersionShouldBeTag()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        const string taggedVersion = "1.0.3";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
 
-        [Test]
-        public void GivenARepositoryWithTagAndOldNextVersionConfigVersionShouldBeTagWithBumpedPatch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            const string taggedVersion = "1.1.0";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
-            fixture.Repository.MakeCommits(5);
+        fixture.AssertFullSemver("1.0.3", new Config { NextVersion = "1.1.0" });
+    }
 
-            fixture.AssertFullSemver("1.1.1+5", new Config { NextVersion = "1.0.0" });
-        }
+    [Test]
+    public void GivenARepositoryWithTagAndNoNextVersionTxtFileVersionShouldBeTagWithBumpedPatch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        const string taggedVersion = "1.0.3";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.Repository.MakeCommits(5);
 
-        [Test]
-        public void GivenARepositoryWithTagAndOldNextVersionConfigAndNoCommitsVersionShouldBeTag()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            const string taggedVersion = "1.1.0";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.AssertFullSemver("1.0.4+5");
+    }
 
-            fixture.AssertFullSemver("1.1.0", new Config { NextVersion = "1.0.0" });
-        }
+    [Test]
+    public void GivenARepositoryWithTagAndNoNextVersionTxtFileAndNoCommitsVersionShouldBeTag()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        const string taggedVersion = "1.0.3";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
 
-        [Test]
-        public void CanSpecifyTagPrefixes()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            const string taggedVersion = "version-1.0.3";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
-            fixture.Repository.MakeCommits(5);
+        fixture.AssertFullSemver("1.0.3");
+    }
 
-            fixture.AssertFullSemver("1.0.4+5", new Config { TagPrefix = "version-" });
-        }
+    [Test]
+    public void GivenARepositoryWithTagAndOldNextVersionConfigVersionShouldBeTagWithBumpedPatch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        const string taggedVersion = "1.1.0";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.Repository.MakeCommits(5);
 
-        [Test]
-        public void CanSpecifyTagPrefixesAsRegex()
-        {
-            var config = new Config { TagPrefix = "version-|[vV]" };
-            using var fixture = new EmptyRepositoryFixture();
-            var taggedVersion = "v1.0.3";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
-            fixture.Repository.MakeCommits(5);
+        fixture.AssertFullSemver("1.1.1+5", new Config { NextVersion = "1.0.0" });
+    }
+
+    [Test]
+    public void GivenARepositoryWithTagAndOldNextVersionConfigAndNoCommitsVersionShouldBeTag()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        const string taggedVersion = "1.1.0";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
 
-            fixture.AssertFullSemver("1.0.4+5", config);
+        fixture.AssertFullSemver("1.1.0", new Config { NextVersion = "1.0.0" });
+    }
+
+    [Test]
+    public void CanSpecifyTagPrefixes()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        const string taggedVersion = "version-1.0.3";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.Repository.MakeCommits(5);
 
-            taggedVersion = "version-1.0.5";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
-            fixture.Repository.MakeCommits(5);
+        fixture.AssertFullSemver("1.0.4+5", new Config { TagPrefix = "version-" });
+    }
 
-            fixture.AssertFullSemver("1.0.6+5", config);
-        }
+    [Test]
+    public void CanSpecifyTagPrefixesAsRegex()
+    {
+        var config = new Config { TagPrefix = "version-|[vV]" };
+        using var fixture = new EmptyRepositoryFixture();
+        var taggedVersion = "v1.0.3";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.Repository.MakeCommits(5);
 
-        [Test]
-        public void AreTagsNotAdheringToTagPrefixIgnored()
-        {
-            var config = new Config { TagPrefix = "" };
-            using var fixture = new EmptyRepositoryFixture();
-            var taggedVersion = "version-1.0.3";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
-            fixture.Repository.MakeCommits(5);
+        fixture.AssertFullSemver("1.0.4+5", config);
+
+        taggedVersion = "version-1.0.5";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.Repository.MakeCommits(5);
+
+        fixture.AssertFullSemver("1.0.6+5", config);
+    }
+
+    [Test]
+    public void AreTagsNotAdheringToTagPrefixIgnored()
+    {
+        var config = new Config { TagPrefix = "" };
+        using var fixture = new EmptyRepositoryFixture();
+        var taggedVersion = "version-1.0.3";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.Repository.MakeCommits(5);
 
-            fixture.AssertFullSemver("0.1.0+5", config);    //Fallback version + 5 commits since tag
+        fixture.AssertFullSemver("0.1.0+5", config);    //Fallback version + 5 commits since tag
 
-            taggedVersion = "bad/1.0.3";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
+        taggedVersion = "bad/1.0.3";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
 
-            fixture.AssertFullSemver("0.1.0+6", config);   //Fallback version + 6 commits since tag
-        }
+        fixture.AssertFullSemver("0.1.0+6", config);   //Fallback version + 6 commits since tag
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentMode.cs b/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentMode.cs
index 147fe2aae0..13c2932511 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentMode.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentMode.cs
@@ -10,537 +10,536 @@
 using LibGit2Sharp;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+public class MainlineDevelopmentMode : TestBase
 {
-    public class MainlineDevelopmentMode : TestBase
+    private readonly Config config = new()
     {
-        private readonly Config config = new()
-        {
-            VersioningMode = VersioningMode.Mainline
-        };
+        VersioningMode = VersioningMode.Mainline
+    };
 
-        [Test]
-        public void VerifyNonMainMainlineVersionIdenticalAsMain()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit("1");
+    [Test]
+    public void VerifyNonMainMainlineVersionIdenticalAsMain()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit("1");
 
-            fixture.BranchTo("feature/foo", "foo");
-            fixture.MakeACommit("2 +semver: major");
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo");
+        fixture.BranchTo("feature/foo", "foo");
+        fixture.MakeACommit("2 +semver: major");
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo");
 
-            fixture.AssertFullSemver("1.0.0", this.config);
+        fixture.AssertFullSemver("1.0.0", this.config);
 
-            fixture.BranchTo("support/1.0", "support");
+        fixture.BranchTo("support/1.0", "support");
 
-            fixture.AssertFullSemver("1.0.0", this.config);
-        }
+        fixture.AssertFullSemver("1.0.0", this.config);
+    }
 
-        [Test]
-        public void MergedFeatureBranchesToMainImpliesRelease()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit("1");
-            fixture.MakeATaggedCommit("1.0.0");
-
-            fixture.BranchTo("feature/foo", "foo");
-            fixture.MakeACommit("2");
-            fixture.AssertFullSemver("1.0.1-foo.1", this.config);
-            fixture.MakeACommit("2.1");
-            fixture.AssertFullSemver("1.0.1-foo.2", this.config);
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo");
-
-            fixture.AssertFullSemver("1.0.1", this.config);
-
-            fixture.BranchTo("feature/foo2", "foo2");
-            fixture.MakeACommit("3 +semver: minor");
-            fixture.AssertFullSemver("1.1.0-foo2.1", this.config);
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo2");
-            fixture.AssertFullSemver("1.1.0", this.config);
-
-            fixture.BranchTo("feature/foo3", "foo3");
-            fixture.MakeACommit("4");
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo3");
-            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.AssertFullSemver("1.2.0", this.config);
-
-            fixture.BranchTo("feature/foo4", "foo4");
-            fixture.MakeACommit("5 +semver: major");
-            fixture.AssertFullSemver("2.0.0-foo4.1", this.config);
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo4");
-            fixture.AssertFullSemver("2.0.0", this.config);
-
-            // We should evaluate any commits not included in merge commit calculations for direct commit/push or squash to merge commits
-            fixture.MakeACommit("6 +semver: major");
-            fixture.AssertFullSemver("3.0.0", this.config);
-            fixture.MakeACommit("7 +semver: minor");
-            fixture.AssertFullSemver("3.1.0", this.config);
-            fixture.MakeACommit("8");
-            fixture.AssertFullSemver("3.1.1", this.config);
-
-            // Finally verify that the merge commits still function properly
-            fixture.BranchTo("feature/foo5", "foo5");
-            fixture.MakeACommit("9 +semver: minor");
-            fixture.AssertFullSemver("3.2.0-foo5.1", this.config);
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo5");
-            fixture.AssertFullSemver("3.2.0", this.config);
-
-            // One more direct commit for good measure
-            fixture.MakeACommit("10 +semver: minor");
-            fixture.AssertFullSemver("3.3.0", this.config);
-            // And we can commit without bumping semver
-            fixture.MakeACommit("11 +semver: none");
-            fixture.AssertFullSemver("3.3.0", this.config);
-            Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
-        }
-
-        [Test]
-        public void VerifyPullRequestsActLikeContinuousDelivery()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit("1");
-            fixture.MakeATaggedCommit("1.0.0");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.0.1", this.config);
-
-            fixture.BranchTo("feature/foo", "foo");
-            fixture.AssertFullSemver("1.0.2-foo.0", this.config);
-            fixture.MakeACommit();
-            fixture.MakeACommit();
-            fixture.Repository.CreatePullRequestRef("feature/foo", MainBranch, normalise: true, prNumber: 8);
-            fixture.AssertFullSemver("1.0.2-PullRequest0008.3", this.config);
-        }
-
-        [Test]
-        public void SupportBranches()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit("1");
-            fixture.MakeATaggedCommit("1.0.0");
-            fixture.MakeACommit(); // 1.0.1
-            fixture.MakeACommit(); // 1.0.2
-            fixture.AssertFullSemver("1.0.2", this.config);
-
-            fixture.BranchTo("support/1.0", "support10");
-            fixture.AssertFullSemver("1.0.2", this.config);
-
-            // Move main on
-            fixture.Checkout(MainBranch);
-            fixture.MakeACommit("+semver: major"); // 2.0.0 (on main)
-            fixture.AssertFullSemver("2.0.0", this.config);
-
-            // Continue on support/1.0
-            fixture.Checkout("support/1.0");
-            fixture.MakeACommit(); // 1.0.3
-            fixture.MakeACommit(); // 1.0.4
-            fixture.AssertFullSemver("1.0.4", this.config);
-            fixture.BranchTo("feature/foo", "foo");
-            fixture.AssertFullSemver("1.0.5-foo.0", this.config);
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.0.5-foo.1", this.config);
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.0.5-foo.2", this.config);
-            fixture.Repository.CreatePullRequestRef("feature/foo", "support/1.0", normalise: true, prNumber: 7);
-            fixture.AssertFullSemver("1.0.5-PullRequest0007.3", this.config);
-        }
-
-        [Test]
-        public void VerifyForwardMerge()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit("1");
-            fixture.MakeATaggedCommit("1.0.0");
-            fixture.MakeACommit(); // 1.0.1
-
-            fixture.BranchTo("feature/foo", "foo");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.0.2-foo.1", this.config);
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.0.2-foo.2", this.config);
-
-            fixture.Checkout(MainBranch);
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.0.2", this.config);
-            fixture.Checkout("feature/foo");
-            // This may seem surprising, but this happens because we branched off mainline
-            // and incremented. Mainline has then moved on. We do not follow mainline
-            // in feature branches, you need to merge mainline in to get the mainline version
-            fixture.AssertFullSemver("1.0.2-foo.2", this.config);
-            fixture.MergeNoFF(MainBranch);
-            fixture.AssertFullSemver("1.0.3-foo.3", this.config);
-        }
-
-        [Test]
-        public void VerifySupportForwardMerge()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit("1");
-            fixture.MakeATaggedCommit("1.0.0");
-            fixture.MakeACommit(); // 1.0.1
-
-            fixture.BranchTo("support/1.0", "support10");
-            fixture.MakeACommit();
-            fixture.MakeACommit();
-
-            fixture.Checkout(MainBranch);
-            fixture.MakeACommit("+semver: minor");
-            fixture.AssertFullSemver("1.1.0", this.config);
-            fixture.MergeNoFF("support/1.0");
-            fixture.AssertFullSemver("1.1.1", this.config);
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.1.2", this.config);
-            fixture.Checkout("support/1.0");
-            fixture.AssertFullSemver("1.0.3", this.config);
-
-            fixture.BranchTo("feature/foo", "foo");
-            fixture.MakeACommit();
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.0.4-foo.2", this.config); // TODO This probably should be 1.0.5
-        }
-
-        [Test]
-        public void VerifyDevelopTracksMainVersion()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit("1");
-            fixture.MakeATaggedCommit("1.0.0");
-            fixture.MakeACommit();
-
-            // branching increments the version
-            fixture.BranchTo("develop");
-            fixture.AssertFullSemver("1.1.0-alpha.0", this.config);
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.1.0-alpha.1", this.config);
-
-            // merging develop into main increments minor version on main
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("develop");
-            fixture.AssertFullSemver("1.1.0", this.config);
-
-            // a commit on develop before the merge still has the same version number
-            fixture.Checkout("develop");
-            fixture.AssertFullSemver("1.1.0-alpha.1", this.config);
-
-            // moving on to further work on develop tracks main's version from the merge
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.2.0-alpha.1", this.config);
-
-            // adding a commit to main increments patch
-            fixture.Checkout(MainBranch);
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.1.1", this.config);
-
-            // adding a commit to main doesn't change develop's version
-            fixture.Checkout("develop");
-            fixture.AssertFullSemver("1.2.0-alpha.1", this.config);
-        }
-
-        [Test]
-        public void VerifyDevelopFeatureTracksMainVersion()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit("1");
-            fixture.MakeATaggedCommit("1.0.0");
-            fixture.MakeACommit();
-
-            // branching increments the version
-            fixture.BranchTo("develop");
-            fixture.AssertFullSemver("1.1.0-alpha.0", this.config);
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.1.0-alpha.1", this.config);
-
-            // merging develop into main increments minor version on main
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("develop");
-            fixture.AssertFullSemver("1.1.0", this.config);
-
-            // a commit on develop before the merge still has the same version number
-            fixture.Checkout("develop");
-            fixture.AssertFullSemver("1.1.0-alpha.1", this.config);
-
-            // a branch from develop before the merge tracks the pre-merge version from main
-            // (note: the commit on develop looks like a commit to this branch, thus the .1)
-            fixture.BranchTo("feature/foo");
-            fixture.AssertFullSemver("1.0.2-foo.1", this.config);
-
-            // further work on the branch tracks the merged version from main
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.1.1-foo.1", this.config);
-
-            // adding a commit to main increments patch
-            fixture.Checkout(MainBranch);
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.1.1", this.config);
-
-            // adding a commit to main doesn't change the feature's version
-            fixture.Checkout("feature/foo");
-            fixture.AssertFullSemver("1.1.1-foo.1", this.config);
-
-            // merging the feature to develop increments develop
-            fixture.Checkout("develop");
-            fixture.MergeNoFF("feature/foo");
-            fixture.AssertFullSemver("1.2.0-alpha.2", this.config);
-        }
-
-        [Test]
-        public void VerifyMergingMainToFeatureDoesNotCauseBranchCommitsToIncrementVersion()
+    [Test]
+    public void MergedFeatureBranchesToMainImpliesRelease()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit("1");
+        fixture.MakeATaggedCommit("1.0.0");
+
+        fixture.BranchTo("feature/foo", "foo");
+        fixture.MakeACommit("2");
+        fixture.AssertFullSemver("1.0.1-foo.1", this.config);
+        fixture.MakeACommit("2.1");
+        fixture.AssertFullSemver("1.0.1-foo.2", this.config);
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo");
+
+        fixture.AssertFullSemver("1.0.1", this.config);
+
+        fixture.BranchTo("feature/foo2", "foo2");
+        fixture.MakeACommit("3 +semver: minor");
+        fixture.AssertFullSemver("1.1.0-foo2.1", this.config);
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo2");
+        fixture.AssertFullSemver("1.1.0", this.config);
+
+        fixture.BranchTo("feature/foo3", "foo3");
+        fixture.MakeACommit("4");
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo3");
+        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
         {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit($"first in {MainBranch}");
+            AmendPreviousCommit = true
+        });
+        fixture.AssertFullSemver("1.2.0", this.config);
+
+        fixture.BranchTo("feature/foo4", "foo4");
+        fixture.MakeACommit("5 +semver: major");
+        fixture.AssertFullSemver("2.0.0-foo4.1", this.config);
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo4");
+        fixture.AssertFullSemver("2.0.0", this.config);
+
+        // We should evaluate any commits not included in merge commit calculations for direct commit/push or squash to merge commits
+        fixture.MakeACommit("6 +semver: major");
+        fixture.AssertFullSemver("3.0.0", this.config);
+        fixture.MakeACommit("7 +semver: minor");
+        fixture.AssertFullSemver("3.1.0", this.config);
+        fixture.MakeACommit("8");
+        fixture.AssertFullSemver("3.1.1", this.config);
+
+        // Finally verify that the merge commits still function properly
+        fixture.BranchTo("feature/foo5", "foo5");
+        fixture.MakeACommit("9 +semver: minor");
+        fixture.AssertFullSemver("3.2.0-foo5.1", this.config);
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo5");
+        fixture.AssertFullSemver("3.2.0", this.config);
+
+        // One more direct commit for good measure
+        fixture.MakeACommit("10 +semver: minor");
+        fixture.AssertFullSemver("3.3.0", this.config);
+        // And we can commit without bumping semver
+        fixture.MakeACommit("11 +semver: none");
+        fixture.AssertFullSemver("3.3.0", this.config);
+        Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
+    }
 
-            fixture.BranchTo("feature/foo", "foo");
-            fixture.MakeACommit("first in foo");
+    [Test]
+    public void VerifyPullRequestsActLikeContinuousDelivery()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit("1");
+        fixture.MakeATaggedCommit("1.0.0");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.0.1", this.config);
+
+        fixture.BranchTo("feature/foo", "foo");
+        fixture.AssertFullSemver("1.0.2-foo.0", this.config);
+        fixture.MakeACommit();
+        fixture.MakeACommit();
+        fixture.Repository.CreatePullRequestRef("feature/foo", MainBranch, normalise: true, prNumber: 8);
+        fixture.AssertFullSemver("1.0.2-PullRequest0008.3", this.config);
+    }
 
-            fixture.Checkout(MainBranch);
-            fixture.MakeACommit($"second in {MainBranch}");
+    [Test]
+    public void SupportBranches()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit("1");
+        fixture.MakeATaggedCommit("1.0.0");
+        fixture.MakeACommit(); // 1.0.1
+        fixture.MakeACommit(); // 1.0.2
+        fixture.AssertFullSemver("1.0.2", this.config);
+
+        fixture.BranchTo("support/1.0", "support10");
+        fixture.AssertFullSemver("1.0.2", this.config);
+
+        // Move main on
+        fixture.Checkout(MainBranch);
+        fixture.MakeACommit("+semver: major"); // 2.0.0 (on main)
+        fixture.AssertFullSemver("2.0.0", this.config);
+
+        // Continue on support/1.0
+        fixture.Checkout("support/1.0");
+        fixture.MakeACommit(); // 1.0.3
+        fixture.MakeACommit(); // 1.0.4
+        fixture.AssertFullSemver("1.0.4", this.config);
+        fixture.BranchTo("feature/foo", "foo");
+        fixture.AssertFullSemver("1.0.5-foo.0", this.config);
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.0.5-foo.1", this.config);
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.0.5-foo.2", this.config);
+        fixture.Repository.CreatePullRequestRef("feature/foo", "support/1.0", normalise: true, prNumber: 7);
+        fixture.AssertFullSemver("1.0.5-PullRequest0007.3", this.config);
+    }
 
-            fixture.Checkout("feature/foo");
-            fixture.MergeNoFF(MainBranch);
-            fixture.MakeACommit("second in foo");
+    [Test]
+    public void VerifyForwardMerge()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit("1");
+        fixture.MakeATaggedCommit("1.0.0");
+        fixture.MakeACommit(); // 1.0.1
+
+        fixture.BranchTo("feature/foo", "foo");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.0.2-foo.1", this.config);
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.0.2-foo.2", this.config);
+
+        fixture.Checkout(MainBranch);
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.0.2", this.config);
+        fixture.Checkout("feature/foo");
+        // This may seem surprising, but this happens because we branched off mainline
+        // and incremented. Mainline has then moved on. We do not follow mainline
+        // in feature branches, you need to merge mainline in to get the mainline version
+        fixture.AssertFullSemver("1.0.2-foo.2", this.config);
+        fixture.MergeNoFF(MainBranch);
+        fixture.AssertFullSemver("1.0.3-foo.3", this.config);
+    }
 
-            fixture.Checkout(MainBranch);
-            fixture.MakeATaggedCommit("1.0.0");
+    [Test]
+    public void VerifySupportForwardMerge()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit("1");
+        fixture.MakeATaggedCommit("1.0.0");
+        fixture.MakeACommit(); // 1.0.1
+
+        fixture.BranchTo("support/1.0", "support10");
+        fixture.MakeACommit();
+        fixture.MakeACommit();
+
+        fixture.Checkout(MainBranch);
+        fixture.MakeACommit("+semver: minor");
+        fixture.AssertFullSemver("1.1.0", this.config);
+        fixture.MergeNoFF("support/1.0");
+        fixture.AssertFullSemver("1.1.1", this.config);
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.1.2", this.config);
+        fixture.Checkout("support/1.0");
+        fixture.AssertFullSemver("1.0.3", this.config);
+
+        fixture.BranchTo("feature/foo", "foo");
+        fixture.MakeACommit();
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.0.4-foo.2", this.config); // TODO This probably should be 1.0.5
+    }
 
-            fixture.MergeNoFF("feature/foo");
-            fixture.AssertFullSemver("1.0.1", this.config);
-        }
+    [Test]
+    public void VerifyDevelopTracksMainVersion()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit("1");
+        fixture.MakeATaggedCommit("1.0.0");
+        fixture.MakeACommit();
+
+        // branching increments the version
+        fixture.BranchTo("develop");
+        fixture.AssertFullSemver("1.1.0-alpha.0", this.config);
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.1.0-alpha.1", this.config);
+
+        // merging develop into main increments minor version on main
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("develop");
+        fixture.AssertFullSemver("1.1.0", this.config);
+
+        // a commit on develop before the merge still has the same version number
+        fixture.Checkout("develop");
+        fixture.AssertFullSemver("1.1.0-alpha.1", this.config);
+
+        // moving on to further work on develop tracks main's version from the merge
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.2.0-alpha.1", this.config);
+
+        // adding a commit to main increments patch
+        fixture.Checkout(MainBranch);
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.1.1", this.config);
+
+        // adding a commit to main doesn't change develop's version
+        fixture.Checkout("develop");
+        fixture.AssertFullSemver("1.2.0-alpha.1", this.config);
+    }
 
-        [Test]
-        public void VerifyMergingMainToFeatureDoesNotStopMainCommitsIncrementingVersion()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit($"first in {MainBranch}");
+    [Test]
+    public void VerifyDevelopFeatureTracksMainVersion()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit("1");
+        fixture.MakeATaggedCommit("1.0.0");
+        fixture.MakeACommit();
+
+        // branching increments the version
+        fixture.BranchTo("develop");
+        fixture.AssertFullSemver("1.1.0-alpha.0", this.config);
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.1.0-alpha.1", this.config);
+
+        // merging develop into main increments minor version on main
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("develop");
+        fixture.AssertFullSemver("1.1.0", this.config);
+
+        // a commit on develop before the merge still has the same version number
+        fixture.Checkout("develop");
+        fixture.AssertFullSemver("1.1.0-alpha.1", this.config);
+
+        // a branch from develop before the merge tracks the pre-merge version from main
+        // (note: the commit on develop looks like a commit to this branch, thus the .1)
+        fixture.BranchTo("feature/foo");
+        fixture.AssertFullSemver("1.0.2-foo.1", this.config);
+
+        // further work on the branch tracks the merged version from main
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.1.1-foo.1", this.config);
+
+        // adding a commit to main increments patch
+        fixture.Checkout(MainBranch);
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.1.1", this.config);
+
+        // adding a commit to main doesn't change the feature's version
+        fixture.Checkout("feature/foo");
+        fixture.AssertFullSemver("1.1.1-foo.1", this.config);
+
+        // merging the feature to develop increments develop
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("feature/foo");
+        fixture.AssertFullSemver("1.2.0-alpha.2", this.config);
+    }
 
-            fixture.BranchTo("feature/foo", "foo");
-            fixture.MakeACommit("first in foo");
+    [Test]
+    public void VerifyMergingMainToFeatureDoesNotCauseBranchCommitsToIncrementVersion()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit($"first in {MainBranch}");
 
-            fixture.Checkout(MainBranch);
-            fixture.MakeATaggedCommit("1.0.0");
-            fixture.MakeACommit($"third in {MainBranch}");
+        fixture.BranchTo("feature/foo", "foo");
+        fixture.MakeACommit("first in foo");
 
-            fixture.Checkout("feature/foo");
-            fixture.MergeNoFF(MainBranch);
-            fixture.MakeACommit("second in foo");
+        fixture.Checkout(MainBranch);
+        fixture.MakeACommit($"second in {MainBranch}");
 
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo");
-            fixture.AssertFullSemver("1.0.2", this.config);
-        }
+        fixture.Checkout("feature/foo");
+        fixture.MergeNoFF(MainBranch);
+        fixture.MakeACommit("second in foo");
 
-        [Test]
-        public void VerifyIssue1154CanForwardMergeMainToFeatureBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit();
-            fixture.BranchTo("feature/branch2");
-            fixture.BranchTo("feature/branch1");
-            fixture.MakeACommit();
-            fixture.MakeACommit();
-
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/branch1");
-            fixture.AssertFullSemver("0.1.1", this.config);
-
-            fixture.Checkout("feature/branch2");
-            fixture.MakeACommit();
-            fixture.MakeACommit();
-            fixture.MakeACommit();
-            fixture.MergeNoFF(MainBranch);
-
-            fixture.AssertFullSemver("0.1.2-branch2.4", this.config);
-        }
-
-        [Test]
-        public void VerifyMergingMainIntoAFeatureBranchWorksWithMultipleBranches()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit($"first in {MainBranch}");
+        fixture.Checkout(MainBranch);
+        fixture.MakeATaggedCommit("1.0.0");
 
-            fixture.BranchTo("feature/foo", "foo");
-            fixture.MakeACommit("first in foo");
+        fixture.MergeNoFF("feature/foo");
+        fixture.AssertFullSemver("1.0.1", this.config);
+    }
+
+    [Test]
+    public void VerifyMergingMainToFeatureDoesNotStopMainCommitsIncrementingVersion()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit($"first in {MainBranch}");
+
+        fixture.BranchTo("feature/foo", "foo");
+        fixture.MakeACommit("first in foo");
+
+        fixture.Checkout(MainBranch);
+        fixture.MakeATaggedCommit("1.0.0");
+        fixture.MakeACommit($"third in {MainBranch}");
+
+        fixture.Checkout("feature/foo");
+        fixture.MergeNoFF(MainBranch);
+        fixture.MakeACommit("second in foo");
+
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo");
+        fixture.AssertFullSemver("1.0.2", this.config);
+    }
 
-            fixture.BranchTo("feature/bar", "bar");
-            fixture.MakeACommit("first in bar");
+    [Test]
+    public void VerifyIssue1154CanForwardMergeMainToFeatureBranch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.BranchTo("feature/branch2");
+        fixture.BranchTo("feature/branch1");
+        fixture.MakeACommit();
+        fixture.MakeACommit();
+
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/branch1");
+        fixture.AssertFullSemver("0.1.1", this.config);
+
+        fixture.Checkout("feature/branch2");
+        fixture.MakeACommit();
+        fixture.MakeACommit();
+        fixture.MakeACommit();
+        fixture.MergeNoFF(MainBranch);
+
+        fixture.AssertFullSemver("0.1.2-branch2.4", this.config);
+    }
+
+    [Test]
+    public void VerifyMergingMainIntoAFeatureBranchWorksWithMultipleBranches()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit($"first in {MainBranch}");
 
-            fixture.Checkout(MainBranch);
-            fixture.MakeACommit($"second in {MainBranch}");
+        fixture.BranchTo("feature/foo", "foo");
+        fixture.MakeACommit("first in foo");
 
-            fixture.Checkout("feature/foo");
-            fixture.MergeNoFF(MainBranch);
-            fixture.MakeACommit("second in foo");
+        fixture.BranchTo("feature/bar", "bar");
+        fixture.MakeACommit("first in bar");
 
-            fixture.Checkout("feature/bar");
-            fixture.MergeNoFF(MainBranch);
-            fixture.MakeACommit("second in bar");
+        fixture.Checkout(MainBranch);
+        fixture.MakeACommit($"second in {MainBranch}");
 
-            fixture.Checkout(MainBranch);
-            fixture.MakeATaggedCommit("1.0.0");
+        fixture.Checkout("feature/foo");
+        fixture.MergeNoFF(MainBranch);
+        fixture.MakeACommit("second in foo");
 
-            fixture.MergeNoFF("feature/foo");
-            fixture.MergeNoFF("feature/bar");
-            fixture.AssertFullSemver("1.0.2", this.config);
-        }
+        fixture.Checkout("feature/bar");
+        fixture.MergeNoFF(MainBranch);
+        fixture.MakeACommit("second in bar");
 
-        [Test]
-        public void MergingFeatureBranchThatIncrementsMinorNumberIncrementsMinorVersionOfMain()
+        fixture.Checkout(MainBranch);
+        fixture.MakeATaggedCommit("1.0.0");
+
+        fixture.MergeNoFF("feature/foo");
+        fixture.MergeNoFF("feature/bar");
+        fixture.AssertFullSemver("1.0.2", this.config);
+    }
+
+    [Test]
+    public void MergingFeatureBranchThatIncrementsMinorNumberIncrementsMinorVersionOfMain()
+    {
+        var currentConfig = new Config
         {
-            var currentConfig = new Config
+            VersioningMode = VersioningMode.Mainline,
+            Branches = new Dictionary<string, BranchConfig>
             {
-                VersioningMode = VersioningMode.Mainline,
-                Branches = new Dictionary<string, BranchConfig>
                 {
+                    "feature", new BranchConfig
                     {
-                        "feature", new BranchConfig
-                        {
-                            VersioningMode = VersioningMode.ContinuousDeployment,
-                            Increment = IncrementStrategy.Minor
-                        }
+                        VersioningMode = VersioningMode.ContinuousDeployment,
+                        Increment = IncrementStrategy.Minor
                     }
                 }
-            };
+            }
+        };
 
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit($"first in {MainBranch}");
-            fixture.MakeATaggedCommit("1.0.0");
-            fixture.AssertFullSemver("1.0.0", currentConfig);
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit($"first in {MainBranch}");
+        fixture.MakeATaggedCommit("1.0.0");
+        fixture.AssertFullSemver("1.0.0", currentConfig);
 
-            fixture.BranchTo("feature/foo", "foo");
-            fixture.MakeACommit("first in foo");
-            fixture.MakeACommit("second in foo");
-            fixture.AssertFullSemver("1.1.0-foo.2", currentConfig);
+        fixture.BranchTo("feature/foo", "foo");
+        fixture.MakeACommit("first in foo");
+        fixture.MakeACommit("second in foo");
+        fixture.AssertFullSemver("1.1.0-foo.2", currentConfig);
 
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo");
-            fixture.AssertFullSemver("1.1.0", currentConfig);
-        }
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo");
+        fixture.AssertFullSemver("1.1.0", currentConfig);
+    }
 
-        [Test]
-        public void VerifyIncrementConfigIsHonoured()
+    [Test]
+    public void VerifyIncrementConfigIsHonoured()
+    {
+        var minorIncrementConfig = new Config
         {
-            var minorIncrementConfig = new Config
+            VersioningMode = VersioningMode.Mainline,
+            Increment = IncrementStrategy.Minor,
+            Branches = new Dictionary<string, BranchConfig>
             {
-                VersioningMode = VersioningMode.Mainline,
-                Increment = IncrementStrategy.Minor,
-                Branches = new Dictionary<string, BranchConfig>
                 {
+                    MainBranch,
+                    new BranchConfig
                     {
-                        MainBranch,
-                        new BranchConfig
-                        {
-                            Increment = IncrementStrategy.Minor,
-                            Name = MainBranch,
-                            Regex = MainBranch
-                        }
-                    },
+                        Increment = IncrementStrategy.Minor,
+                        Name = MainBranch,
+                        Regex = MainBranch
+                    }
+                },
+                {
+                    "feature",
+                    new BranchConfig
                     {
-                        "feature",
-                        new BranchConfig
-                        {
-                            Increment = IncrementStrategy.Minor,
-                            Name = "feature",
-                            Regex = "features?[/-]"
-                        }
+                        Increment = IncrementStrategy.Minor,
+                        Name = "feature",
+                        Regex = "features?[/-]"
                     }
                 }
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit("1");
-            fixture.MakeATaggedCommit("1.0.0");
-
-            fixture.BranchTo("feature/foo", "foo");
-            fixture.MakeACommit("2");
-            fixture.AssertFullSemver("1.1.0-foo.1", minorIncrementConfig);
-            fixture.MakeACommit("2.1");
-            fixture.AssertFullSemver("1.1.0-foo.2", minorIncrementConfig);
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo");
-
-            fixture.AssertFullSemver("1.1.0", minorIncrementConfig);
-
-            fixture.BranchTo("feature/foo2", "foo2");
-            fixture.MakeACommit("3 +semver: patch");
-            fixture.AssertFullSemver("1.1.1-foo2.1", minorIncrementConfig);
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo2");
-            fixture.AssertFullSemver("1.1.1", minorIncrementConfig);
-
-            fixture.BranchTo("feature/foo3", "foo3");
-            fixture.MakeACommit("4");
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo3");
-            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.AssertFullSemver("1.1.2", minorIncrementConfig);
-
-            fixture.BranchTo("feature/foo4", "foo4");
-            fixture.MakeACommit("5 +semver: major");
-            fixture.AssertFullSemver("2.0.0-foo4.1", minorIncrementConfig);
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo4");
-            fixture.AssertFullSemver("2.0.0", this.config);
-
-            // We should evaluate any commits not included in merge commit calculations for direct commit/push or squash to merge commits
-            fixture.MakeACommit("6 +semver: major");
-            fixture.AssertFullSemver("3.0.0", minorIncrementConfig);
-            fixture.MakeACommit("7");
-            fixture.AssertFullSemver("3.1.0", minorIncrementConfig);
-            fixture.MakeACommit("8 +semver: patch");
-            fixture.AssertFullSemver("3.1.1", minorIncrementConfig);
-
-            // Finally verify that the merge commits still function properly
-            fixture.BranchTo("feature/foo5", "foo5");
-            fixture.MakeACommit("9 +semver: patch");
-            fixture.AssertFullSemver("3.1.2-foo5.1", minorIncrementConfig);
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo5");
-            fixture.AssertFullSemver("3.1.2", minorIncrementConfig);
-
-            // One more direct commit for good measure
-            fixture.MakeACommit("10 +semver: patch");
-            fixture.AssertFullSemver("3.1.3", minorIncrementConfig);
-            // And we can commit without bumping semver
-            fixture.MakeACommit("11 +semver: none");
-            fixture.AssertFullSemver("3.1.3", minorIncrementConfig);
-            Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
-        }
+            }
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit("1");
+        fixture.MakeATaggedCommit("1.0.0");
+
+        fixture.BranchTo("feature/foo", "foo");
+        fixture.MakeACommit("2");
+        fixture.AssertFullSemver("1.1.0-foo.1", minorIncrementConfig);
+        fixture.MakeACommit("2.1");
+        fixture.AssertFullSemver("1.1.0-foo.2", minorIncrementConfig);
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo");
+
+        fixture.AssertFullSemver("1.1.0", minorIncrementConfig);
+
+        fixture.BranchTo("feature/foo2", "foo2");
+        fixture.MakeACommit("3 +semver: patch");
+        fixture.AssertFullSemver("1.1.1-foo2.1", minorIncrementConfig);
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo2");
+        fixture.AssertFullSemver("1.1.1", minorIncrementConfig);
+
+        fixture.BranchTo("feature/foo3", "foo3");
+        fixture.MakeACommit("4");
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo3");
+        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.AssertFullSemver("1.1.2", minorIncrementConfig);
+
+        fixture.BranchTo("feature/foo4", "foo4");
+        fixture.MakeACommit("5 +semver: major");
+        fixture.AssertFullSemver("2.0.0-foo4.1", minorIncrementConfig);
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo4");
+        fixture.AssertFullSemver("2.0.0", this.config);
+
+        // We should evaluate any commits not included in merge commit calculations for direct commit/push or squash to merge commits
+        fixture.MakeACommit("6 +semver: major");
+        fixture.AssertFullSemver("3.0.0", minorIncrementConfig);
+        fixture.MakeACommit("7");
+        fixture.AssertFullSemver("3.1.0", minorIncrementConfig);
+        fixture.MakeACommit("8 +semver: patch");
+        fixture.AssertFullSemver("3.1.1", minorIncrementConfig);
+
+        // Finally verify that the merge commits still function properly
+        fixture.BranchTo("feature/foo5", "foo5");
+        fixture.MakeACommit("9 +semver: patch");
+        fixture.AssertFullSemver("3.1.2-foo5.1", minorIncrementConfig);
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo5");
+        fixture.AssertFullSemver("3.1.2", minorIncrementConfig);
+
+        // One more direct commit for good measure
+        fixture.MakeACommit("10 +semver: patch");
+        fixture.AssertFullSemver("3.1.3", minorIncrementConfig);
+        // And we can commit without bumping semver
+        fixture.MakeACommit("11 +semver: none");
+        fixture.AssertFullSemver("3.1.3", minorIncrementConfig);
+        Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
     }
+}
 
-    internal static class CommitExtensions
+internal static class CommitExtensions
+{
+    public static void MakeACommit(this RepositoryFixtureBase fixture, string commitMsg)
     {
-        public static void MakeACommit(this RepositoryFixtureBase fixture, string commitMsg)
-        {
-            fixture.Repository.MakeACommit(commitMsg);
-            var diagramBuilder = (StringBuilder)typeof(SequenceDiagram)
-                .GetField("diagramBuilder", BindingFlags.Instance | BindingFlags.NonPublic)
-                ?.GetValue(fixture.SequenceDiagram);
-
-            string GetParticipant(string participant) =>
-                (string)typeof(SequenceDiagram).GetMethod("GetParticipant", BindingFlags.Instance | BindingFlags.NonPublic)
-                    ?.Invoke(fixture.SequenceDiagram, new object[]
-                    {
-                        participant
-                    });
+        fixture.Repository.MakeACommit(commitMsg);
+        var diagramBuilder = (StringBuilder)typeof(SequenceDiagram)
+            .GetField("diagramBuilder", BindingFlags.Instance | BindingFlags.NonPublic)
+            ?.GetValue(fixture.SequenceDiagram);
+
+        string GetParticipant(string participant) =>
+            (string)typeof(SequenceDiagram).GetMethod("GetParticipant", BindingFlags.Instance | BindingFlags.NonPublic)
+                ?.Invoke(fixture.SequenceDiagram, new object[]
+                {
+                    participant
+                });
 
-            diagramBuilder.AppendLineFormat("{0} -> {0}: Commit '{1}'", GetParticipant(fixture.Repository.Head.FriendlyName),
-                commitMsg);
-        }
+        diagramBuilder.AppendLineFormat("{0} -> {0}: Commit '{1}'", GetParticipant(fixture.Repository.Head.FriendlyName),
+            commitMsg);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/OtherBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/OtherBranchScenarios.cs
index ba6a499978..226b790049 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/OtherBranchScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/OtherBranchScenarios.cs
@@ -6,86 +6,85 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class OtherBranchScenarios : TestBase
 {
-    [TestFixture]
-    public class OtherBranchScenarios : TestBase
+    [Test]
+    public void CanTakeVersionFromReleaseBranch()
     {
-        [Test]
-        public void CanTakeVersionFromReleaseBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            const string taggedVersion = "1.0.3";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
-            fixture.Repository.MakeCommits(5);
-            fixture.Repository.CreateBranch("release/beta-2.0.0");
-            Commands.Checkout(fixture.Repository, "release/beta-2.0.0");
+        using var fixture = new EmptyRepositoryFixture();
+        const string taggedVersion = "1.0.3";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.Repository.MakeCommits(5);
+        fixture.Repository.CreateBranch("release/beta-2.0.0");
+        Commands.Checkout(fixture.Repository, "release/beta-2.0.0");
 
-            fixture.AssertFullSemver("2.0.0-beta.1+0");
-        }
+        fixture.AssertFullSemver("2.0.0-beta.1+0");
+    }
 
-        [Test]
-        public void BranchesWithIllegalCharsShouldNotBeUsedInVersionNames()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            const string taggedVersion = "1.0.3";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
-            fixture.Repository.MakeCommits(5);
-            fixture.Repository.CreateBranch("issue/m/github-569");
-            Commands.Checkout(fixture.Repository, "issue/m/github-569");
+    [Test]
+    public void BranchesWithIllegalCharsShouldNotBeUsedInVersionNames()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        const string taggedVersion = "1.0.3";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.Repository.MakeCommits(5);
+        fixture.Repository.CreateBranch("issue/m/github-569");
+        Commands.Checkout(fixture.Repository, "issue/m/github-569");
 
-            fixture.AssertFullSemver("1.0.4-issue-m-github-569.1+5");
-        }
+        fixture.AssertFullSemver("1.0.4-issue-m-github-569.1+5");
+    }
 
-        [Test]
-        public void ShouldNotGetVersionFromFeatureBranchIfNotMerged()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0-unstable.0"); // initial commit in main
+    [Test]
+    public void ShouldNotGetVersionFromFeatureBranchIfNotMerged()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0-unstable.0"); // initial commit in main
 
-            fixture.Repository.CreateBranch("feature");
-            Commands.Checkout(fixture.Repository, "feature");
-            fixture.Repository.MakeATaggedCommit("1.0.1-feature.1");
+        fixture.Repository.CreateBranch("feature");
+        Commands.Checkout(fixture.Repository, "feature");
+        fixture.Repository.MakeATaggedCommit("1.0.1-feature.1");
 
-            Commands.Checkout(fixture.Repository, MainBranch);
-            fixture.Repository.CreateBranch("develop");
-            Commands.Checkout(fixture.Repository, "develop");
-            fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, MainBranch);
+        fixture.Repository.CreateBranch("develop");
+        Commands.Checkout(fixture.Repository, "develop");
+        fixture.Repository.MakeACommit();
 
-            var version = fixture.GetVersion();
-            version.SemVer.ShouldBe("1.0.0-alpha.1");
-        }
+        var version = fixture.GetVersion();
+        version.SemVer.ShouldBe("1.0.0-alpha.1");
+    }
 
-        [TestCase("alpha", "JIRA-123", "alpha")]
-        [TestCase("useBranchName", "JIRA-123", "JIRA-123")]
-        [TestCase("alpha.{BranchName}", "JIRA-123", "alpha.JIRA-123")]
-        public void TagIsBranchNameForBranchesWithoutPrefixedBranchName(string tag, string branchName, string preReleaseTagName)
+    [TestCase("alpha", "JIRA-123", "alpha")]
+    [TestCase("useBranchName", "JIRA-123", "JIRA-123")]
+    [TestCase("alpha.{BranchName}", "JIRA-123", "alpha.JIRA-123")]
+    public void TagIsBranchNameForBranchesWithoutPrefixedBranchName(string tag, string branchName, string preReleaseTagName)
+    {
+        var config = new Config
         {
-            var config = new Config
+            Branches =
             {
-                Branches =
                 {
+                    "other",
+                    new BranchConfig
                     {
-                        "other",
-                        new BranchConfig
-                        {
-                            Increment = IncrementStrategy.Patch,
-                            Regex = ".*",
-                            SourceBranches = new HashSet<string>(),
-                            Tag = tag
-                        }
+                        Increment = IncrementStrategy.Patch,
+                        Regex = ".*",
+                        SourceBranches = new HashSet<string>(),
+                        Tag = tag
                     }
                 }
-            };
+            }
+        };
 
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.CreateBranch(branchName);
-            Commands.Checkout(fixture.Repository, branchName);
-            fixture.Repository.MakeCommits(5);
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.CreateBranch(branchName);
+        Commands.Checkout(fixture.Repository, branchName);
+        fixture.Repository.MakeCommits(5);
 
-            var expectedFullSemVer = $"1.0.1-{preReleaseTagName}.1+5";
-            fixture.AssertFullSemver(expectedFullSemVer, config);
-        }
+        var expectedFullSemVer = $"1.0.1-{preReleaseTagName}.1+5";
+        fixture.AssertFullSemver(expectedFullSemVer, config);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs
index bfc43fbec5..b1c2b35c49 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs
@@ -7,130 +7,129 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class OtherScenarios : TestBase
 {
-    [TestFixture]
-    public class OtherScenarios : TestBase
+    // This is an attempt to automatically resolve the issue where you cannot build
+    // when multiple branches point at the same commit
+    // Current implementation favors main, then branches without - or / in their name
+    [Test]
+    public void DoNotBlowUpWhenMainAndDevelopPointAtSameCommit()
     {
-        // This is an attempt to automatically resolve the issue where you cannot build
-        // when multiple branches point at the same commit
-        // Current implementation favors main, then branches without - or / in their name
-        [Test]
-        public void DoNotBlowUpWhenMainAndDevelopPointAtSameCommit()
-        {
-            using var fixture = new RemoteRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.MakeACommit();
-            fixture.Repository.CreateBranch("develop");
-
-            Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
-            Commands.Checkout(fixture.LocalRepositoryFixture.Repository, fixture.Repository.Head.Tip);
-            fixture.LocalRepositoryFixture.Repository.Branches.Remove(MainBranch);
-            fixture.InitializeRepo();
-            fixture.AssertFullSemver("1.0.1+1");
-        }
+        using var fixture = new RemoteRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.MakeACommit();
+        fixture.Repository.CreateBranch("develop");
+
+        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
+        Commands.Checkout(fixture.LocalRepositoryFixture.Repository, fixture.Repository.Head.Tip);
+        fixture.LocalRepositoryFixture.Repository.Branches.Remove(MainBranch);
+        fixture.InitializeRepo();
+        fixture.AssertFullSemver("1.0.1+1");
+    }
 
-        [Test]
-        public void AllowNotHavingMain()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            fixture.Repository.Branches.Remove(fixture.Repository.Branches[MainBranch]);
-
-            fixture.AssertFullSemver("1.1.0-alpha.1");
-        }
+    [Test]
+    public void AllowNotHavingMain()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        fixture.Repository.Branches.Remove(fixture.Repository.Branches[MainBranch]);
+
+        fixture.AssertFullSemver("1.1.0-alpha.1");
+    }
 
-        [Test]
-        public void AllowHavingVariantsStartingWithMaster()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("masterfix"));
+    [Test]
+    public void AllowHavingVariantsStartingWithMaster()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("masterfix"));
 
-            fixture.AssertFullSemver("1.0.1-masterfix.1+1");
-        }
+        fixture.AssertFullSemver("1.0.1-masterfix.1+1");
+    }
 
-        [Test]
-        public void AllowHavingMasterInsteadOfMain()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("master"));
-            fixture.Repository.Branches.Remove(fixture.Repository.Branches["main"]);
+    [Test]
+    public void AllowHavingMasterInsteadOfMain()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("master"));
+        fixture.Repository.Branches.Remove(fixture.Repository.Branches["main"]);
 
-            fixture.AssertFullSemver("0.1.0+0");
-        }
+        fixture.AssertFullSemver("0.1.0+0");
+    }
 
-        [Test]
-        public void AllowHavingVariantsStartingWithMain()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("mainfix"));
+    [Test]
+    public void AllowHavingVariantsStartingWithMain()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("mainfix"));
 
-            fixture.AssertFullSemver("1.0.1-mainfix.1+1");
-        }
+        fixture.AssertFullSemver("1.0.1-mainfix.1+1");
+    }
 
-        [Test]
-        public void DoNotBlowUpWhenDevelopAndFeatureBranchPointAtSameCommit()
-        {
-            using var fixture = new RemoteRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.MakeACommit();
-            fixture.Repository.CreateBranch("feature/someFeature");
-
-            Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
-            Commands.Checkout(fixture.LocalRepositoryFixture.Repository, fixture.Repository.Head.Tip);
-            fixture.LocalRepositoryFixture.Repository.Branches.Remove(MainBranch);
-            fixture.InitializeRepo();
-            fixture.AssertFullSemver("1.1.0-alpha.1");
-        }
+    [Test]
+    public void DoNotBlowUpWhenDevelopAndFeatureBranchPointAtSameCommit()
+    {
+        using var fixture = new RemoteRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.MakeACommit();
+        fixture.Repository.CreateBranch("feature/someFeature");
+
+        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
+        Commands.Checkout(fixture.LocalRepositoryFixture.Repository, fixture.Repository.Head.Tip);
+        fixture.LocalRepositoryFixture.Repository.Branches.Remove(MainBranch);
+        fixture.InitializeRepo();
+        fixture.AssertFullSemver("1.1.0-alpha.1");
+    }
 
-        [TestCase(true, 1)]
-        [TestCase(false, 1)]
-        [TestCase(true, 5)]
-        [TestCase(false, 5)]
-        public void HasDirtyFlagWhenUncommittedChangesAreInRepo(bool stageFile, int numberOfFiles)
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-
-            for (int i = 0; i < numberOfFiles; i++)
-            {
-                var tempFile = Path.GetTempFileName();
-                var repoFile = Path.Combine(fixture.RepositoryPath, Path.GetFileNameWithoutExtension(tempFile) + ".txt");
-                File.Move(tempFile, repoFile);
-                File.WriteAllText(repoFile, $"Hello world / testfile {i}");
-
-                if (stageFile)
-                    Commands.Stage(fixture.Repository, repoFile);
-            }
-
-            var version = fixture.GetVersion();
-            version.UncommittedChanges.ShouldBe(numberOfFiles.ToString(CultureInfo.InvariantCulture));
-        }
+    [TestCase(true, 1)]
+    [TestCase(false, 1)]
+    [TestCase(true, 5)]
+    [TestCase(false, 5)]
+    public void HasDirtyFlagWhenUncommittedChangesAreInRepo(bool stageFile, int numberOfFiles)
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
 
-        [Test]
-        public void NoDirtyFlagInCleanRepository()
+        for (int i = 0; i < numberOfFiles; i++)
         {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
+            var tempFile = Path.GetTempFileName();
+            var repoFile = Path.Combine(fixture.RepositoryPath, Path.GetFileNameWithoutExtension(tempFile) + ".txt");
+            File.Move(tempFile, repoFile);
+            File.WriteAllText(repoFile, $"Hello world / testfile {i}");
 
-            var version = fixture.GetVersion();
-            var zero = 0;
-            version.UncommittedChanges.ShouldBe(zero.ToString(CultureInfo.InvariantCulture));
+            if (stageFile)
+                Commands.Stage(fixture.Repository, repoFile);
         }
+
+        var version = fixture.GetVersion();
+        version.UncommittedChanges.ShouldBe(numberOfFiles.ToString(CultureInfo.InvariantCulture));
+    }
+
+    [Test]
+    public void NoDirtyFlagInCleanRepository()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+
+        var version = fixture.GetVersion();
+        var zero = 0;
+        version.UncommittedChanges.ShouldBe(zero.ToString(CultureInfo.InvariantCulture));
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs
index 3a183e92ab..850f4c91ae 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs
@@ -3,100 +3,99 @@
 using LibGit2Sharp;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class PullRequestScenarios : TestBase
 {
-    [TestFixture]
-    public class PullRequestScenarios : TestBase
+    [Test]
+    public void CanCalculatePullRequestChanges()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("0.1.0");
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/Foo"));
+        fixture.Repository.MakeACommit();
+
+        fixture.Repository.CreatePullRequestRef("feature/Foo", MainBranch, normalise: true);
+
+        fixture.Repository.DumpGraph();
+        fixture.AssertFullSemver("0.1.1-PullRequest0002.2");
+    }
+
+    [Test]
+    public void CanCalculatePullRequestChangesInheritingConfig()
     {
-        [Test]
-        public void CanCalculatePullRequestChanges()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("0.1.0");
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/Foo"));
-            fixture.Repository.MakeACommit();
-
-            fixture.Repository.CreatePullRequestRef("feature/Foo", MainBranch, normalise: true);
-
-            fixture.Repository.DumpGraph();
-            fixture.AssertFullSemver("0.1.1-PullRequest0002.2");
-        }
-
-        [Test]
-        public void CanCalculatePullRequestChangesInheritingConfig()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("0.1.0");
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/Foo"));
-            fixture.Repository.MakeACommit();
-
-            fixture.Repository.CreatePullRequestRef("feature/Foo", "develop", 44, normalise: true);
-
-            fixture.Repository.DumpGraph();
-            fixture.AssertFullSemver("0.2.0-PullRequest0044.3");
-        }
-
-        [Test]
-        public void CanCalculatePullRequestChangesFromRemoteRepo()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("0.1.0");
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/Foo"));
-            fixture.Repository.MakeACommit();
-
-
-            fixture.Repository.CreatePullRequestRef("feature/Foo", MainBranch, normalise: true);
-
-            fixture.Repository.DumpGraph();
-            fixture.AssertFullSemver("0.1.1-PullRequest0002.2");
-        }
-
-        [Test]
-        public void CanCalculatePullRequestChangesInheritingConfigFromRemoteRepo()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("0.1.0");
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/Foo"));
-            fixture.Repository.MakeACommit();
-
-            fixture.Repository.CreatePullRequestRef("feature/Foo", "develop", normalise: true);
-
-            fixture.AssertFullSemver("0.2.0-PullRequest0002.3");
-        }
-
-        [Test]
-        public void CanCalculatePullRequestChangesWhenThereAreMultipleMergeCandidates()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("0.1.0");
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("copyOfDevelop"));
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/Foo"));
-            fixture.Repository.MakeACommit();
-
-            fixture.Repository.CreatePullRequestRef("feature/Foo", "develop", normalise: true);
-
-            fixture.AssertFullSemver("0.2.0-PullRequest0002.3");
-        }
-
-        [Test]
-        public void CalculatesCorrectVersionAfterReleaseBranchMergedToMain()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("release/2.0.0"));
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
-
-            fixture.Repository.CreatePullRequestRef("release/2.0.0", MainBranch, normalise: true);
-
-            fixture.AssertFullSemver("2.0.0-PullRequest0002.0");
-        }
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("0.1.0");
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/Foo"));
+        fixture.Repository.MakeACommit();
+
+        fixture.Repository.CreatePullRequestRef("feature/Foo", "develop", 44, normalise: true);
+
+        fixture.Repository.DumpGraph();
+        fixture.AssertFullSemver("0.2.0-PullRequest0044.3");
+    }
+
+    [Test]
+    public void CanCalculatePullRequestChangesFromRemoteRepo()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("0.1.0");
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/Foo"));
+        fixture.Repository.MakeACommit();
+
+
+        fixture.Repository.CreatePullRequestRef("feature/Foo", MainBranch, normalise: true);
+
+        fixture.Repository.DumpGraph();
+        fixture.AssertFullSemver("0.1.1-PullRequest0002.2");
+    }
+
+    [Test]
+    public void CanCalculatePullRequestChangesInheritingConfigFromRemoteRepo()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("0.1.0");
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/Foo"));
+        fixture.Repository.MakeACommit();
+
+        fixture.Repository.CreatePullRequestRef("feature/Foo", "develop", normalise: true);
+
+        fixture.AssertFullSemver("0.2.0-PullRequest0002.3");
+    }
+
+    [Test]
+    public void CanCalculatePullRequestChangesWhenThereAreMultipleMergeCandidates()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("0.1.0");
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("copyOfDevelop"));
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("feature/Foo"));
+        fixture.Repository.MakeACommit();
+
+        fixture.Repository.CreatePullRequestRef("feature/Foo", "develop", normalise: true);
+
+        fixture.AssertFullSemver("0.2.0-PullRequest0002.3");
+    }
+
+    [Test]
+    public void CalculatesCorrectVersionAfterReleaseBranchMergedToMain()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("release/2.0.0"));
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
+
+        fixture.Repository.CreatePullRequestRef("release/2.0.0", MainBranch, normalise: true);
+
+        fixture.AssertFullSemver("2.0.0-PullRequest0002.0");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/ReleaseBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/ReleaseBranchScenarios.cs
index 5393864ef2..4137dbb7e3 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/ReleaseBranchScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/ReleaseBranchScenarios.cs
@@ -7,668 +7,667 @@
 using LibGit2Sharp;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class ReleaseBranchScenarios : TestBase
 {
-    [TestFixture]
-    public class ReleaseBranchScenarios : TestBase
+    [Test]
+    public void NoMergeBacksToDevelopInCaseThereAreNoChangesInReleaseBranch()
     {
-        [Test]
-        public void NoMergeBacksToDevelopInCaseThereAreNoChangesInReleaseBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.BranchTo("develop");
-            fixture.Repository.MakeCommits(3);
-            var releaseBranch = fixture.Repository.CreateBranch("release/1.0.0");
-            fixture.Checkout(MainBranch);
-            fixture.Repository.MergeNoFF("release/1.0.0");
-            fixture.Repository.ApplyTag("1.0.0");
-            fixture.Checkout("develop");
-
-            fixture.Repository.Branches.Remove(releaseBranch);
-
-            fixture.AssertFullSemver("1.1.0-alpha.0");
-        }
-
-        [Test]
-        public void NoMergeBacksToDevelopInCaseThereAreChangesInReleaseBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.BranchTo("develop");
-            fixture.Repository.MakeCommits(3);
-            fixture.BranchTo("release/1.0.0");
-            fixture.Repository.MakeACommit();
-
-            // Merge to main
-            fixture.Checkout(MainBranch);
-            fixture.Repository.MergeNoFF("release/1.0.0");
-            fixture.Repository.ApplyTag("1.0.0");
-
-            // Merge to develop
-            fixture.Checkout("develop");
-            fixture.Repository.MergeNoFF("release/1.0.0");
-            fixture.AssertFullSemver("1.1.0-alpha.2");
-
-            fixture.Repository.MakeACommit();
-            fixture.Repository.Branches.Remove("release/1.0.0");
-
-            fixture.AssertFullSemver("1.1.0-alpha.3");
-        }
-
-        [Test]
-        public void CanTakeVersionFromReleaseBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.3");
-            fixture.Repository.MakeCommits(5);
-            fixture.Repository.CreateBranch("release-2.0.0");
-            fixture.Checkout("release-2.0.0");
-
-            fixture.AssertFullSemver("2.0.0-beta.1+0");
-            fixture.Repository.MakeCommits(2);
-            fixture.AssertFullSemver("2.0.0-beta.1+2");
-        }
-
-        [Test]
-        public void CanTakeVersionFromReleasesBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.3");
-            fixture.Repository.MakeCommits(5);
-            fixture.Repository.CreateBranch("releases/2.0.0");
-            fixture.Checkout("releases/2.0.0");
-
-            fixture.AssertFullSemver("2.0.0-beta.1+0");
-            fixture.Repository.MakeCommits(2);
-            fixture.AssertFullSemver("2.0.0-beta.1+2");
-        }
-
-        [Test]
-        public void CanTakePreReleaseVersionFromReleasesBranchWithNumericPreReleaseTag()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeCommits(5);
-            fixture.Repository.CreateBranch("releases/2.0.0");
-            fixture.Checkout("releases/2.0.0");
-            fixture.Repository.ApplyTag("v2.0.0-1");
-
-            var variables = fixture.GetVersion();
-            Assert.AreEqual("2.0.0-1", variables.FullSemVer);
-        }
-
-        [Test]
-        public void ReleaseBranchWithNextVersionSetInConfig()
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.BranchTo("develop");
+        fixture.Repository.MakeCommits(3);
+        var releaseBranch = fixture.Repository.CreateBranch("release/1.0.0");
+        fixture.Checkout(MainBranch);
+        fixture.Repository.MergeNoFF("release/1.0.0");
+        fixture.Repository.ApplyTag("1.0.0");
+        fixture.Checkout("develop");
+
+        fixture.Repository.Branches.Remove(releaseBranch);
+
+        fixture.AssertFullSemver("1.1.0-alpha.0");
+    }
+
+    [Test]
+    public void NoMergeBacksToDevelopInCaseThereAreChangesInReleaseBranch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.BranchTo("develop");
+        fixture.Repository.MakeCommits(3);
+        fixture.BranchTo("release/1.0.0");
+        fixture.Repository.MakeACommit();
+
+        // Merge to main
+        fixture.Checkout(MainBranch);
+        fixture.Repository.MergeNoFF("release/1.0.0");
+        fixture.Repository.ApplyTag("1.0.0");
+
+        // Merge to develop
+        fixture.Checkout("develop");
+        fixture.Repository.MergeNoFF("release/1.0.0");
+        fixture.AssertFullSemver("1.1.0-alpha.2");
+
+        fixture.Repository.MakeACommit();
+        fixture.Repository.Branches.Remove("release/1.0.0");
+
+        fixture.AssertFullSemver("1.1.0-alpha.3");
+    }
+
+    [Test]
+    public void CanTakeVersionFromReleaseBranch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.3");
+        fixture.Repository.MakeCommits(5);
+        fixture.Repository.CreateBranch("release-2.0.0");
+        fixture.Checkout("release-2.0.0");
+
+        fixture.AssertFullSemver("2.0.0-beta.1+0");
+        fixture.Repository.MakeCommits(2);
+        fixture.AssertFullSemver("2.0.0-beta.1+2");
+    }
+
+    [Test]
+    public void CanTakeVersionFromReleasesBranch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.3");
+        fixture.Repository.MakeCommits(5);
+        fixture.Repository.CreateBranch("releases/2.0.0");
+        fixture.Checkout("releases/2.0.0");
+
+        fixture.AssertFullSemver("2.0.0-beta.1+0");
+        fixture.Repository.MakeCommits(2);
+        fixture.AssertFullSemver("2.0.0-beta.1+2");
+    }
+
+    [Test]
+    public void CanTakePreReleaseVersionFromReleasesBranchWithNumericPreReleaseTag()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeCommits(5);
+        fixture.Repository.CreateBranch("releases/2.0.0");
+        fixture.Checkout("releases/2.0.0");
+        fixture.Repository.ApplyTag("v2.0.0-1");
+
+        var variables = fixture.GetVersion();
+        Assert.AreEqual("2.0.0-1", variables.FullSemVer);
+    }
+
+    [Test]
+    public void ReleaseBranchWithNextVersionSetInConfig()
+    {
+        var config = new Config
         {
-            var config = new Config
-            {
-                NextVersion = "2.0.0"
-            };
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeCommits(5);
-            fixture.BranchTo("release-2.0.0");
-
-            fixture.AssertFullSemver("2.0.0-beta.1+0", config);
-            fixture.Repository.MakeCommits(2);
-            fixture.AssertFullSemver("2.0.0-beta.1+2", config);
-        }
-
-        [Test]
-        public void CanTakeVersionFromReleaseBranchWithTagOverridden()
+            NextVersion = "2.0.0"
+        };
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeCommits(5);
+        fixture.BranchTo("release-2.0.0");
+
+        fixture.AssertFullSemver("2.0.0-beta.1+0", config);
+        fixture.Repository.MakeCommits(2);
+        fixture.AssertFullSemver("2.0.0-beta.1+2", config);
+    }
+
+    [Test]
+    public void CanTakeVersionFromReleaseBranchWithTagOverridden()
+    {
+        var config = new Config
         {
-            var config = new Config
+            Branches =
             {
-                Branches =
-                {
-                    { "release", new BranchConfig { Tag = "rc" } }
-                }
-            };
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.3");
-            fixture.Repository.MakeCommits(5);
-            fixture.Repository.CreateBranch("release-2.0.0");
-            fixture.Checkout("release-2.0.0");
-
-            fixture.AssertFullSemver("2.0.0-rc.1+0", config);
-            fixture.Repository.MakeCommits(2);
-            fixture.AssertFullSemver("2.0.0-rc.1+2", config);
-        }
-
-        [Test]
-        public void CanHandleReleaseBranchWithStability()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.3");
-            fixture.Repository.CreateBranch("develop");
-            fixture.Repository.MakeCommits(5);
-            fixture.Repository.CreateBranch("release-2.0.0-Final");
-            fixture.Checkout("release-2.0.0-Final");
-
-            fixture.AssertFullSemver("2.0.0-beta.1+0");
-            fixture.Repository.MakeCommits(2);
-            fixture.AssertFullSemver("2.0.0-beta.1+2");
-        }
-
-        [Test]
-        public void WhenReleaseBranchOffDevelopIsMergedIntoMainAndDevelopVersionIsTakenWithIt()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.3");
-            fixture.Repository.CreateBranch("develop");
-            fixture.Repository.MakeCommits(1);
-
-            fixture.Repository.CreateBranch("release-2.0.0");
-            fixture.Checkout("release-2.0.0");
-            fixture.Repository.MakeCommits(4);
-            fixture.Checkout(MainBranch);
-            fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
-
-            fixture.AssertFullSemver("2.0.0+0");
-            fixture.Repository.MakeCommits(2);
-            fixture.AssertFullSemver("2.0.0+2");
-        }
-
-        [Test]
-        public void WhenReleaseBranchOffMainIsMergedIntoMainVersionIsTakenWithIt()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.3");
-            fixture.Repository.MakeCommits(1);
-            fixture.Repository.CreateBranch("release-2.0.0");
-            fixture.Checkout("release-2.0.0");
-            fixture.Repository.MakeCommits(4);
-            fixture.Checkout(MainBranch);
-            fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
-
-            fixture.AssertFullSemver("2.0.0+0");
-        }
-
-        [Test]
-        public void MainVersioningContinuousCorrectlyAfterMergingReleaseBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.3");
-            fixture.Repository.MakeCommits(1);
-            fixture.Repository.CreateBranch("release-2.0.0");
-            fixture.Checkout("release-2.0.0");
-            fixture.Repository.MakeCommits(4);
-            fixture.Checkout(MainBranch);
-            fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
-
-            fixture.AssertFullSemver("2.0.0+0");
-            fixture.Repository.ApplyTag("2.0.0");
-            fixture.Repository.MakeCommits(1);
-            fixture.AssertFullSemver("2.0.1+1");
-        }
-
-        [Test]
-        public void WhenReleaseBranchIsMergedIntoDevelopHighestVersionIsTakenWithIt()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.3");
-            fixture.Repository.CreateBranch("develop");
-            fixture.Repository.MakeCommits(1);
-
-            fixture.Repository.CreateBranch("release-2.0.0");
-            fixture.Checkout("release-2.0.0");
-            fixture.Repository.MakeCommits(4);
-            fixture.Checkout("develop");
-            fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
-
-            fixture.Repository.CreateBranch("release-1.0.0");
-            fixture.Checkout("release-1.0.0");
-            fixture.Repository.MakeCommits(4);
-            fixture.Checkout("develop");
-            fixture.Repository.MergeNoFF("release-1.0.0", Generate.SignatureNow());
-
-            fixture.AssertFullSemver("2.1.0-alpha.11");
-        }
-
-        [Test]
-        public void WhenReleaseBranchIsMergedIntoMainHighestVersionIsTakenWithIt()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.3");
-            fixture.Repository.MakeCommits(1);
-
-            fixture.Repository.CreateBranch("release-2.0.0");
-            fixture.Checkout("release-2.0.0");
-            fixture.Repository.MakeCommits(4);
-            fixture.Checkout(MainBranch);
-            fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
-
-            fixture.Repository.CreateBranch("release-1.0.0");
-            fixture.Checkout("release-1.0.0");
-            fixture.Repository.MakeCommits(4);
-            fixture.Checkout(MainBranch);
-            fixture.Repository.MergeNoFF("release-1.0.0", Generate.SignatureNow());
-
-            fixture.AssertFullSemver("2.0.0+5");
-        }
-
-        [Test]
-        public void WhenReleaseBranchIsMergedIntoMainHighestVersionIsTakenWithItEvenWithMoreThanTwoActiveBranches()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.3");
-            fixture.Repository.MakeCommits(1);
-
-            fixture.Repository.CreateBranch("release-3.0.0");
-            fixture.Checkout("release-3.0.0");
-            fixture.Repository.MakeCommits(4);
-            fixture.Checkout(MainBranch);
-            fixture.Repository.MergeNoFF("release-3.0.0", Generate.SignatureNow());
-
-            fixture.Repository.CreateBranch("release-2.0.0");
-            fixture.Checkout("release-2.0.0");
-            fixture.Repository.MakeCommits(4);
-            fixture.Checkout(MainBranch);
-            fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
-
-            fixture.Repository.CreateBranch("release-1.0.0");
-            fixture.Checkout("release-1.0.0");
-            fixture.Repository.MakeCommits(4);
-            fixture.Checkout(MainBranch);
-            fixture.Repository.MergeNoFF("release-1.0.0", Generate.SignatureNow());
-
-            fixture.AssertFullSemver("3.0.0+10");
-        }
-
-        [Test]
-        public void WhenMergingReleaseBackToDevShouldNotResetBetaVersion()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            const string taggedVersion = "1.0.3";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
-            fixture.Repository.CreateBranch("develop");
-            fixture.Checkout("develop");
+                { "release", new BranchConfig { Tag = "rc" } }
+            }
+        };
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.3");
+        fixture.Repository.MakeCommits(5);
+        fixture.Repository.CreateBranch("release-2.0.0");
+        fixture.Checkout("release-2.0.0");
+
+        fixture.AssertFullSemver("2.0.0-rc.1+0", config);
+        fixture.Repository.MakeCommits(2);
+        fixture.AssertFullSemver("2.0.0-rc.1+2", config);
+    }
 
-            fixture.Repository.MakeCommits(1);
-            fixture.AssertFullSemver("1.1.0-alpha.1");
+    [Test]
+    public void CanHandleReleaseBranchWithStability()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.3");
+        fixture.Repository.CreateBranch("develop");
+        fixture.Repository.MakeCommits(5);
+        fixture.Repository.CreateBranch("release-2.0.0-Final");
+        fixture.Checkout("release-2.0.0-Final");
+
+        fixture.AssertFullSemver("2.0.0-beta.1+0");
+        fixture.Repository.MakeCommits(2);
+        fixture.AssertFullSemver("2.0.0-beta.1+2");
+    }
 
-            fixture.Repository.CreateBranch("release-2.0.0");
-            fixture.Checkout("release-2.0.0");
-            fixture.Repository.MakeCommits(1);
+    [Test]
+    public void WhenReleaseBranchOffDevelopIsMergedIntoMainAndDevelopVersionIsTakenWithIt()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.3");
+        fixture.Repository.CreateBranch("develop");
+        fixture.Repository.MakeCommits(1);
+
+        fixture.Repository.CreateBranch("release-2.0.0");
+        fixture.Checkout("release-2.0.0");
+        fixture.Repository.MakeCommits(4);
+        fixture.Checkout(MainBranch);
+        fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
+
+        fixture.AssertFullSemver("2.0.0+0");
+        fixture.Repository.MakeCommits(2);
+        fixture.AssertFullSemver("2.0.0+2");
+    }
 
-            fixture.AssertFullSemver("2.0.0-beta.1+1");
+    [Test]
+    public void WhenReleaseBranchOffMainIsMergedIntoMainVersionIsTakenWithIt()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.3");
+        fixture.Repository.MakeCommits(1);
+        fixture.Repository.CreateBranch("release-2.0.0");
+        fixture.Checkout("release-2.0.0");
+        fixture.Repository.MakeCommits(4);
+        fixture.Checkout(MainBranch);
+        fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
+
+        fixture.AssertFullSemver("2.0.0+0");
+    }
 
-            //tag it to bump to beta 2
-            fixture.Repository.ApplyTag("2.0.0-beta1");
+    [Test]
+    public void MainVersioningContinuousCorrectlyAfterMergingReleaseBranch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.3");
+        fixture.Repository.MakeCommits(1);
+        fixture.Repository.CreateBranch("release-2.0.0");
+        fixture.Checkout("release-2.0.0");
+        fixture.Repository.MakeCommits(4);
+        fixture.Checkout(MainBranch);
+        fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
+
+        fixture.AssertFullSemver("2.0.0+0");
+        fixture.Repository.ApplyTag("2.0.0");
+        fixture.Repository.MakeCommits(1);
+        fixture.AssertFullSemver("2.0.1+1");
+    }
 
-            fixture.Repository.MakeCommits(1);
+    [Test]
+    public void WhenReleaseBranchIsMergedIntoDevelopHighestVersionIsTakenWithIt()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.3");
+        fixture.Repository.CreateBranch("develop");
+        fixture.Repository.MakeCommits(1);
+
+        fixture.Repository.CreateBranch("release-2.0.0");
+        fixture.Checkout("release-2.0.0");
+        fixture.Repository.MakeCommits(4);
+        fixture.Checkout("develop");
+        fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
+
+        fixture.Repository.CreateBranch("release-1.0.0");
+        fixture.Checkout("release-1.0.0");
+        fixture.Repository.MakeCommits(4);
+        fixture.Checkout("develop");
+        fixture.Repository.MergeNoFF("release-1.0.0", Generate.SignatureNow());
+
+        fixture.AssertFullSemver("2.1.0-alpha.11");
+    }
 
-            fixture.AssertFullSemver("2.0.0-beta.2+2");
+    [Test]
+    public void WhenReleaseBranchIsMergedIntoMainHighestVersionIsTakenWithIt()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.3");
+        fixture.Repository.MakeCommits(1);
+
+        fixture.Repository.CreateBranch("release-2.0.0");
+        fixture.Checkout("release-2.0.0");
+        fixture.Repository.MakeCommits(4);
+        fixture.Checkout(MainBranch);
+        fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
+
+        fixture.Repository.CreateBranch("release-1.0.0");
+        fixture.Checkout("release-1.0.0");
+        fixture.Repository.MakeCommits(4);
+        fixture.Checkout(MainBranch);
+        fixture.Repository.MergeNoFF("release-1.0.0", Generate.SignatureNow());
+
+        fixture.AssertFullSemver("2.0.0+5");
+    }
 
-            //merge down to develop
-            fixture.Checkout("develop");
-            fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
+    [Test]
+    public void WhenReleaseBranchIsMergedIntoMainHighestVersionIsTakenWithItEvenWithMoreThanTwoActiveBranches()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.3");
+        fixture.Repository.MakeCommits(1);
+
+        fixture.Repository.CreateBranch("release-3.0.0");
+        fixture.Checkout("release-3.0.0");
+        fixture.Repository.MakeCommits(4);
+        fixture.Checkout(MainBranch);
+        fixture.Repository.MergeNoFF("release-3.0.0", Generate.SignatureNow());
+
+        fixture.Repository.CreateBranch("release-2.0.0");
+        fixture.Checkout("release-2.0.0");
+        fixture.Repository.MakeCommits(4);
+        fixture.Checkout(MainBranch);
+        fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
+
+        fixture.Repository.CreateBranch("release-1.0.0");
+        fixture.Checkout("release-1.0.0");
+        fixture.Repository.MakeCommits(4);
+        fixture.Checkout(MainBranch);
+        fixture.Repository.MergeNoFF("release-1.0.0", Generate.SignatureNow());
+
+        fixture.AssertFullSemver("3.0.0+10");
+    }
 
-            //but keep working on the release
-            fixture.Checkout("release-2.0.0");
-            fixture.AssertFullSemver("2.0.0-beta.2+2");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("2.0.0-beta.2+3");
-        }
+    [Test]
+    public void WhenMergingReleaseBackToDevShouldNotResetBetaVersion()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        const string taggedVersion = "1.0.3";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.Repository.CreateBranch("develop");
+        fixture.Checkout("develop");
 
-        [Test]
-        public void HotfixOffReleaseBranchShouldNotResetCount()
-        {
-            var config = new Config
-            {
-                VersioningMode = VersioningMode.ContinuousDeployment
-            };
-            using var fixture = new EmptyRepositoryFixture();
-            const string taggedVersion = "1.0.3";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
-            fixture.Repository.CreateBranch("develop");
-            fixture.Checkout("develop");
+        fixture.Repository.MakeCommits(1);
+        fixture.AssertFullSemver("1.1.0-alpha.1");
 
-            fixture.Repository.MakeCommits(1);
+        fixture.Repository.CreateBranch("release-2.0.0");
+        fixture.Checkout("release-2.0.0");
+        fixture.Repository.MakeCommits(1);
 
-            fixture.Repository.CreateBranch("release-2.0.0");
-            fixture.Checkout("release-2.0.0");
-            fixture.Repository.MakeCommits(1);
+        fixture.AssertFullSemver("2.0.0-beta.1+1");
 
-            fixture.AssertFullSemver("2.0.0-beta.1", config);
+        //tag it to bump to beta 2
+        fixture.Repository.ApplyTag("2.0.0-beta1");
 
-            //tag it to bump to beta 2
-            fixture.Repository.MakeCommits(4);
+        fixture.Repository.MakeCommits(1);
 
-            fixture.AssertFullSemver("2.0.0-beta.5", config);
+        fixture.AssertFullSemver("2.0.0-beta.2+2");
 
-            //merge down to develop
-            fixture.Repository.CreateBranch("hotfix-2.0.0");
-            fixture.Repository.MakeCommits(2);
+        //merge down to develop
+        fixture.Checkout("develop");
+        fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
 
-            //but keep working on the release
-            fixture.Checkout("release-2.0.0");
-            fixture.Repository.MergeNoFF("hotfix-2.0.0", Generate.SignatureNow());
-            fixture.Repository.Branches.Remove(fixture.Repository.Branches["hotfix-2.0.0"]);
-            fixture.AssertFullSemver("2.0.0-beta.7", config);
-        }
+        //but keep working on the release
+        fixture.Checkout("release-2.0.0");
+        fixture.AssertFullSemver("2.0.0-beta.2+2");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("2.0.0-beta.2+3");
+    }
 
-        [Test]
-        public void MergeOnReleaseBranchShouldNotResetCount()
+    [Test]
+    public void HotfixOffReleaseBranchShouldNotResetCount()
+    {
+        var config = new Config
         {
-            var config = new Config
-            {
-                AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
-                VersioningMode = VersioningMode.ContinuousDeployment,
-            };
-            using var fixture = new EmptyRepositoryFixture();
-            const string taggedVersion = "1.0.3";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
-            fixture.Repository.CreateBranch("develop");
-            fixture.Checkout("develop");
-            fixture.Repository.MakeACommit();
-
-            fixture.Repository.CreateBranch("release/2.0.0");
-
-            fixture.Repository.CreateBranch("release/2.0.0-xxx");
-            fixture.Checkout("release/2.0.0-xxx");
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("2.0.0-beta.1", config);
-
-            fixture.Checkout("release/2.0.0");
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("2.0.0-beta.1", config);
-
-            fixture.Repository.MergeNoFF("release/2.0.0-xxx");
-            fixture.AssertFullSemver("2.0.0-beta.2", config);
-        }
-
-        [Test]
-        public void CommitOnDevelopAfterReleaseBranchMergeToDevelopShouldNotResetCount()
+            VersioningMode = VersioningMode.ContinuousDeployment
+        };
+        using var fixture = new EmptyRepositoryFixture();
+        const string taggedVersion = "1.0.3";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.Repository.CreateBranch("develop");
+        fixture.Checkout("develop");
+
+        fixture.Repository.MakeCommits(1);
+
+        fixture.Repository.CreateBranch("release-2.0.0");
+        fixture.Checkout("release-2.0.0");
+        fixture.Repository.MakeCommits(1);
+
+        fixture.AssertFullSemver("2.0.0-beta.1", config);
+
+        //tag it to bump to beta 2
+        fixture.Repository.MakeCommits(4);
+
+        fixture.AssertFullSemver("2.0.0-beta.5", config);
+
+        //merge down to develop
+        fixture.Repository.CreateBranch("hotfix-2.0.0");
+        fixture.Repository.MakeCommits(2);
+
+        //but keep working on the release
+        fixture.Checkout("release-2.0.0");
+        fixture.Repository.MergeNoFF("hotfix-2.0.0", Generate.SignatureNow());
+        fixture.Repository.Branches.Remove(fixture.Repository.Branches["hotfix-2.0.0"]);
+        fixture.AssertFullSemver("2.0.0-beta.7", config);
+    }
+
+    [Test]
+    public void MergeOnReleaseBranchShouldNotResetCount()
+    {
+        var config = new Config
         {
-            var config = new Config
-            {
-                VersioningMode = VersioningMode.ContinuousDeployment
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit("initial");
-            fixture.BranchTo("develop");
-
-            // Create release from develop
-            fixture.BranchTo("release-2.0.0");
-            fixture.AssertFullSemver("2.0.0-beta.0", config);
-
-            // Make some commits on release
-            fixture.MakeACommit("release 1");
-            fixture.MakeACommit("release 2");
-            fixture.AssertFullSemver("2.0.0-beta.2", config);
-
-            // First forward merge release to develop
-            fixture.Checkout("develop");
-            fixture.MergeNoFF("release-2.0.0");
-
-            // Make some new commit on release
-            fixture.Checkout("release-2.0.0");
-            fixture.Repository.MakeACommit("release 3 - after first merge");
-            fixture.AssertFullSemver("2.0.0-beta.3", config);
-
-            // Make new commit on develop
-            fixture.Checkout("develop");
-            // Checkout to release (no new commits)
-            fixture.Checkout("release-2.0.0");
-            fixture.AssertFullSemver("2.0.0-beta.3", config);
-            fixture.Checkout("develop");
-            fixture.Repository.MakeACommit("develop after merge");
-
-            // Checkout to release (no new commits)
-            fixture.Checkout("release-2.0.0");
-            fixture.AssertFullSemver("2.0.0-beta.3", config);
-
-            // Make some new commit on release
-            fixture.Repository.MakeACommit("release 4");
-            fixture.Repository.MakeACommit("release 5");
-            fixture.AssertFullSemver("2.0.0-beta.5", config);
-
-            // Second merge release to develop
-            fixture.Checkout("develop");
-            fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
-
-            // Checkout to release (no new commits)
-            fixture.Checkout("release-2.0.0");
-            fixture.AssertFullSemver("2.0.0-beta.5", config);
-        }
-
-        [Test]
-        public void CommitBeetweenMergeReleaseToDevelopShouldNotResetCount()
+            AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
+            VersioningMode = VersioningMode.ContinuousDeployment,
+        };
+        using var fixture = new EmptyRepositoryFixture();
+        const string taggedVersion = "1.0.3";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.Repository.CreateBranch("develop");
+        fixture.Checkout("develop");
+        fixture.Repository.MakeACommit();
+
+        fixture.Repository.CreateBranch("release/2.0.0");
+
+        fixture.Repository.CreateBranch("release/2.0.0-xxx");
+        fixture.Checkout("release/2.0.0-xxx");
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("2.0.0-beta.1", config);
+
+        fixture.Checkout("release/2.0.0");
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("2.0.0-beta.1", config);
+
+        fixture.Repository.MergeNoFF("release/2.0.0-xxx");
+        fixture.AssertFullSemver("2.0.0-beta.2", config);
+    }
+
+    [Test]
+    public void CommitOnDevelopAfterReleaseBranchMergeToDevelopShouldNotResetCount()
+    {
+        var config = new Config
         {
-            var config = new Config
-            {
-                VersioningMode = VersioningMode.ContinuousDeployment
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit("initial");
-            fixture.Repository.CreateBranch("develop");
-            Commands.Checkout(fixture.Repository, "develop");
-            fixture.Repository.CreateBranch("release-2.0.0");
-            Commands.Checkout(fixture.Repository, "release-2.0.0");
-            fixture.AssertFullSemver("2.0.0-beta.0", config);
-
-            // Make some commits on release
-            var commit1 = fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("2.0.0-beta.2", config);
-
-            // 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.MergeNoFF("release-2.0.0", Generate.SignatureNow());
-
-            // Check version on release after merge to develop
-            Commands.Checkout(fixture.Repository, "release-2.0.0");
-            fixture.AssertFullSemver("2.0.0-beta.2", config);
-
-            // Check version on release after making some new commits
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("2.0.0-beta.4", config);
-        }
-
-        public static void ReleaseBranchShouldUseBranchNameVersionDespiteBumpInPreviousCommit()
+            VersioningMode = VersioningMode.ContinuousDeployment
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit("initial");
+        fixture.BranchTo("develop");
+
+        // Create release from develop
+        fixture.BranchTo("release-2.0.0");
+        fixture.AssertFullSemver("2.0.0-beta.0", config);
+
+        // Make some commits on release
+        fixture.MakeACommit("release 1");
+        fixture.MakeACommit("release 2");
+        fixture.AssertFullSemver("2.0.0-beta.2", config);
+
+        // First forward merge release to develop
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("release-2.0.0");
+
+        // Make some new commit on release
+        fixture.Checkout("release-2.0.0");
+        fixture.Repository.MakeACommit("release 3 - after first merge");
+        fixture.AssertFullSemver("2.0.0-beta.3", config);
+
+        // Make new commit on develop
+        fixture.Checkout("develop");
+        // Checkout to release (no new commits)
+        fixture.Checkout("release-2.0.0");
+        fixture.AssertFullSemver("2.0.0-beta.3", config);
+        fixture.Checkout("develop");
+        fixture.Repository.MakeACommit("develop after merge");
+
+        // Checkout to release (no new commits)
+        fixture.Checkout("release-2.0.0");
+        fixture.AssertFullSemver("2.0.0-beta.3", config);
+
+        // Make some new commit on release
+        fixture.Repository.MakeACommit("release 4");
+        fixture.Repository.MakeACommit("release 5");
+        fixture.AssertFullSemver("2.0.0-beta.5", config);
+
+        // Second merge release to develop
+        fixture.Checkout("develop");
+        fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
+
+        // Checkout to release (no new commits)
+        fixture.Checkout("release-2.0.0");
+        fixture.AssertFullSemver("2.0.0-beta.5", config);
+    }
+
+    [Test]
+    public void CommitBeetweenMergeReleaseToDevelopShouldNotResetCount()
+    {
+        var config = new Config
         {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0");
-            fixture.Repository.MakeACommit("+semver:major");
-            fixture.Repository.MakeACommit();
+            VersioningMode = VersioningMode.ContinuousDeployment
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit("initial");
+        fixture.Repository.CreateBranch("develop");
+        Commands.Checkout(fixture.Repository, "develop");
+        fixture.Repository.CreateBranch("release-2.0.0");
+        Commands.Checkout(fixture.Repository, "release-2.0.0");
+        fixture.AssertFullSemver("2.0.0-beta.0", config);
+
+        // Make some commits on release
+        var commit1 = fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("2.0.0-beta.2", config);
+
+        // 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.MergeNoFF("release-2.0.0", Generate.SignatureNow());
+
+        // Check version on release after merge to develop
+        Commands.Checkout(fixture.Repository, "release-2.0.0");
+        fixture.AssertFullSemver("2.0.0-beta.2", config);
+
+        // Check version on release after making some new commits
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("2.0.0-beta.4", config);
+    }
 
-            fixture.BranchTo("release/2.0");
+    public static void ReleaseBranchShouldUseBranchNameVersionDespiteBumpInPreviousCommit()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0");
+        fixture.Repository.MakeACommit("+semver:major");
+        fixture.Repository.MakeACommit();
 
-            fixture.AssertFullSemver("2.0.0-beta.1+2");
-        }
+        fixture.BranchTo("release/2.0");
 
-        [Test]
-        public void ReleaseBranchWithACommitShouldUseBranchNameVersionDespiteBumpInPreviousCommit()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0");
-            fixture.Repository.MakeACommit("+semver:major");
-            fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("2.0.0-beta.1+2");
+    }
 
-            fixture.BranchTo("release/2.0");
+    [Test]
+    public void ReleaseBranchWithACommitShouldUseBranchNameVersionDespiteBumpInPreviousCommit()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0");
+        fixture.Repository.MakeACommit("+semver:major");
+        fixture.Repository.MakeACommit();
 
-            fixture.Repository.MakeACommit();
+        fixture.BranchTo("release/2.0");
 
-            fixture.AssertFullSemver("2.0.0-beta.1+3");
-        }
+        fixture.Repository.MakeACommit();
 
-        [Test]
-        public void ReleaseBranchedAtCommitWithSemverMessageShouldUseBranchNameVersion()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0");
-            fixture.Repository.MakeACommit("+semver:major");
+        fixture.AssertFullSemver("2.0.0-beta.1+3");
+    }
 
-            fixture.BranchTo("release/2.0");
+    [Test]
+    public void ReleaseBranchedAtCommitWithSemverMessageShouldUseBranchNameVersion()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0");
+        fixture.Repository.MakeACommit("+semver:major");
 
-            fixture.AssertFullSemver("2.0.0-beta.1+1");
-        }
+        fixture.BranchTo("release/2.0");
 
-        [Test]
-        public void FeatureFromReleaseBranchShouldNotResetCount()
+        fixture.AssertFullSemver("2.0.0-beta.1+1");
+    }
+
+    [Test]
+    public void FeatureFromReleaseBranchShouldNotResetCount()
+    {
+        var config = new Config
         {
-            var config = new Config
+            VersioningMode = VersioningMode.ContinuousDeployment
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit("initial");
+        fixture.Repository.CreateBranch("develop");
+        Commands.Checkout(fixture.Repository, "develop");
+        fixture.Repository.CreateBranch("release-2.0.0");
+        Commands.Checkout(fixture.Repository, "release-2.0.0");
+        fixture.AssertFullSemver("2.0.0-beta.0", config);
+
+        // Make some commits on release
+        fixture.Repository.MakeCommits(10);
+        fixture.AssertFullSemver("2.0.0-beta.10", config);
+
+        // Create feature from release
+        fixture.BranchTo("feature/xxx");
+        fixture.Repository.MakeACommit("feature 1");
+        fixture.Repository.MakeACommit("feature 2");
+
+        // Check version on release
+        Commands.Checkout(fixture.Repository, "release-2.0.0");
+        fixture.AssertFullSemver("2.0.0-beta.10", config);
+        fixture.Repository.MakeACommit("release 11");
+        fixture.AssertFullSemver("2.0.0-beta.11", config);
+
+        // Make new commit on feature
+        Commands.Checkout(fixture.Repository, "feature/xxx");
+        fixture.Repository.MakeACommit("feature 3");
+
+        // Checkout to release (no new commits)
+        Commands.Checkout(fixture.Repository, "release-2.0.0");
+        fixture.AssertFullSemver("2.0.0-beta.11", config);
+
+        // Merge feature to release
+        fixture.Repository.MergeNoFF("feature/xxx", Generate.SignatureNow());
+        fixture.AssertFullSemver("2.0.0-beta.15", config);
+
+        fixture.Repository.MakeACommit("release 13 - after feature merge");
+        fixture.AssertFullSemver("2.0.0-beta.16", config);
+    }
+
+    [Test]
+    public void AssemblySemFileVerShouldBeWeightedByPreReleaseWeight()
+    {
+        var config = new ConfigurationBuilder()
+            .Add(new Config
             {
-                VersioningMode = VersioningMode.ContinuousDeployment
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit("initial");
-            fixture.Repository.CreateBranch("develop");
-            Commands.Checkout(fixture.Repository, "develop");
-            fixture.Repository.CreateBranch("release-2.0.0");
-            Commands.Checkout(fixture.Repository, "release-2.0.0");
-            fixture.AssertFullSemver("2.0.0-beta.0", config);
-
-            // Make some commits on release
-            fixture.Repository.MakeCommits(10);
-            fixture.AssertFullSemver("2.0.0-beta.10", config);
-
-            // Create feature from release
-            fixture.BranchTo("feature/xxx");
-            fixture.Repository.MakeACommit("feature 1");
-            fixture.Repository.MakeACommit("feature 2");
-
-            // Check version on release
-            Commands.Checkout(fixture.Repository, "release-2.0.0");
-            fixture.AssertFullSemver("2.0.0-beta.10", config);
-            fixture.Repository.MakeACommit("release 11");
-            fixture.AssertFullSemver("2.0.0-beta.11", config);
-
-            // Make new commit on feature
-            Commands.Checkout(fixture.Repository, "feature/xxx");
-            fixture.Repository.MakeACommit("feature 3");
-
-            // Checkout to release (no new commits)
-            Commands.Checkout(fixture.Repository, "release-2.0.0");
-            fixture.AssertFullSemver("2.0.0-beta.11", config);
-
-            // Merge feature to release
-            fixture.Repository.MergeNoFF("feature/xxx", Generate.SignatureNow());
-            fixture.AssertFullSemver("2.0.0-beta.15", config);
-
-            fixture.Repository.MakeACommit("release 13 - after feature merge");
-            fixture.AssertFullSemver("2.0.0-beta.16", config);
-        }
-
-        [Test]
-        public void AssemblySemFileVerShouldBeWeightedByPreReleaseWeight()
-        {
-            var config = new ConfigurationBuilder()
-                         .Add(new Config
-                         {
-                             AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber}",
-                             Branches =
-                                    {
-                                        {
-                                            "release", new BranchConfig
-                                                       {
-                                                           PreReleaseWeight = 1000
-                                                       }
-                                        }
-                                    }
-                         })
-                         .Build();
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.3");
-            fixture.Repository.MakeCommits(5);
-            fixture.Repository.CreateBranch("release-2.0.0");
-            fixture.Checkout("release-2.0.0");
-
-            var variables = fixture.GetVersion(config);
-            Assert.AreEqual("2.0.0.1001", variables.AssemblySemFileVer);
-        }
-
-        [Test]
-        public void AssemblySemFileVerShouldBeWeightedByDefaultPreReleaseWeight()
-        {
-            var config = new ConfigurationBuilder()
-                         .Add(new Config
-                         {
-                             AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber}",
-                         })
-                         .Build();
-
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeATaggedCommit("1.0.3");
-            fixture.Repository.MakeCommits(5);
-            fixture.Repository.CreateBranch("release-2.0.0");
-            fixture.Checkout("release-2.0.0");
-            var variables = fixture.GetVersion(config);
-            Assert.AreEqual("2.0.0.30001", variables.AssemblySemFileVer);
-        }
-
-        /// <summary>
-        /// Create a feature branch from a release branch, and merge back, then delete it
-        /// </summary>
-        [Test]
-        public void FeatureOnReleaseFeatureBranchDeleted()
-        {
-            var config = new Config
+                AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber}",
+                Branches =
+                {
+                    {
+                        "release", new BranchConfig
+                        {
+                            PreReleaseWeight = 1000
+                        }
+                    }
+                }
+            })
+            .Build();
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.3");
+        fixture.Repository.MakeCommits(5);
+        fixture.Repository.CreateBranch("release-2.0.0");
+        fixture.Checkout("release-2.0.0");
+
+        var variables = fixture.GetVersion(config);
+        Assert.AreEqual("2.0.0.1001", variables.AssemblySemFileVer);
+    }
+
+    [Test]
+    public void AssemblySemFileVerShouldBeWeightedByDefaultPreReleaseWeight()
+    {
+        var config = new ConfigurationBuilder()
+            .Add(new Config
             {
-                AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
-                VersioningMode = VersioningMode.ContinuousDeployment
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            var release450 = "release/4.5.0";
-            var featureBranch = "feature/some-bug-fix";
-
-            fixture.Repository.MakeACommit("initial");
-            fixture.Repository.CreateBranch("develop");
-            Commands.Checkout(fixture.Repository, "develop");
-
-            // begin the release branch
-            fixture.Repository.CreateBranch(release450);
-            Commands.Checkout(fixture.Repository, release450);
-            fixture.AssertFullSemver("4.5.0-beta.0", config);
-
-            fixture.Repository.CreateBranch(featureBranch);
-            Commands.Checkout(fixture.Repository, featureBranch);
-            fixture.Repository.MakeACommit("blabla"); // commit 1
-            Commands.Checkout(fixture.Repository, release450);
-            fixture.Repository.MergeNoFF(featureBranch, Generate.SignatureNow()); // commit 2
-            fixture.Repository.Branches.Remove(featureBranch);
-
-            fixture.AssertFullSemver("4.5.0-beta.2", config);
-        }
-
-        /// <summary>
-        /// Create a feature branch from a release branch, and merge back, but don't delete it
-        /// </summary>
-        [Test]
-        public void FeatureOnReleaseFeatureBranchNotDeleted()
+                AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber}",
+            })
+            .Build();
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeATaggedCommit("1.0.3");
+        fixture.Repository.MakeCommits(5);
+        fixture.Repository.CreateBranch("release-2.0.0");
+        fixture.Checkout("release-2.0.0");
+        var variables = fixture.GetVersion(config);
+        Assert.AreEqual("2.0.0.30001", variables.AssemblySemFileVer);
+    }
+
+    /// <summary>
+    /// Create a feature branch from a release branch, and merge back, then delete it
+    /// </summary>
+    [Test]
+    public void FeatureOnReleaseFeatureBranchDeleted()
+    {
+        var config = new Config
         {
-            var config = new Config
-            {
-                AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
-                VersioningMode = VersioningMode.ContinuousDeployment
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            var release450 = "release/4.5.0";
-            var featureBranch = "feature/some-bug-fix";
-
-            fixture.Repository.MakeACommit("initial");
-            fixture.Repository.CreateBranch("develop");
-            Commands.Checkout(fixture.Repository, "develop");
-
-            // begin the release branch
-            fixture.Repository.CreateBranch(release450);
-            Commands.Checkout(fixture.Repository, release450);
-            fixture.AssertFullSemver("4.5.0-beta.0", config);
-
-            fixture.Repository.CreateBranch(featureBranch);
-            Commands.Checkout(fixture.Repository, featureBranch);
-            fixture.Repository.MakeACommit("blabla"); // commit 1
-            Commands.Checkout(fixture.Repository, release450);
-            fixture.Repository.MergeNoFF(featureBranch, Generate.SignatureNow()); // commit 2
-
-            fixture.AssertFullSemver("4.5.0-beta.2", config);
-        }
+            AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
+            VersioningMode = VersioningMode.ContinuousDeployment
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        var release450 = "release/4.5.0";
+        var featureBranch = "feature/some-bug-fix";
+
+        fixture.Repository.MakeACommit("initial");
+        fixture.Repository.CreateBranch("develop");
+        Commands.Checkout(fixture.Repository, "develop");
+
+        // begin the release branch
+        fixture.Repository.CreateBranch(release450);
+        Commands.Checkout(fixture.Repository, release450);
+        fixture.AssertFullSemver("4.5.0-beta.0", config);
+
+        fixture.Repository.CreateBranch(featureBranch);
+        Commands.Checkout(fixture.Repository, featureBranch);
+        fixture.Repository.MakeACommit("blabla"); // commit 1
+        Commands.Checkout(fixture.Repository, release450);
+        fixture.Repository.MergeNoFF(featureBranch, Generate.SignatureNow()); // commit 2
+        fixture.Repository.Branches.Remove(featureBranch);
+
+        fixture.AssertFullSemver("4.5.0-beta.2", config);
+    }
+
+    /// <summary>
+    /// Create a feature branch from a release branch, and merge back, but don't delete it
+    /// </summary>
+    [Test]
+    public void FeatureOnReleaseFeatureBranchNotDeleted()
+    {
+        var config = new Config
+        {
+            AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
+            VersioningMode = VersioningMode.ContinuousDeployment
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        var release450 = "release/4.5.0";
+        var featureBranch = "feature/some-bug-fix";
+
+        fixture.Repository.MakeACommit("initial");
+        fixture.Repository.CreateBranch("develop");
+        Commands.Checkout(fixture.Repository, "develop");
+
+        // begin the release branch
+        fixture.Repository.CreateBranch(release450);
+        Commands.Checkout(fixture.Repository, release450);
+        fixture.AssertFullSemver("4.5.0-beta.0", config);
+
+        fixture.Repository.CreateBranch(featureBranch);
+        Commands.Checkout(fixture.Repository, featureBranch);
+        fixture.Repository.MakeACommit("blabla"); // commit 1
+        Commands.Checkout(fixture.Repository, release450);
+        fixture.Repository.MergeNoFF(featureBranch, Generate.SignatureNow()); // commit 2
+
+        fixture.AssertFullSemver("4.5.0-beta.2", config);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/RemoteRepositoryScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/RemoteRepositoryScenarios.cs
index e543b27aa2..be73c0bea2 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/RemoteRepositoryScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/RemoteRepositoryScenarios.cs
@@ -8,137 +8,136 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class RemoteRepositoryScenarios : TestBase
 {
-    [TestFixture]
-    public class RemoteRepositoryScenarios : TestBase
+    [Test]
+    public void GivenARemoteGitRepositoryWithCommitsThenClonedLocalShouldMatchRemoteVersion()
     {
-        [Test]
-        public void GivenARemoteGitRepositoryWithCommitsThenClonedLocalShouldMatchRemoteVersion()
-        {
-            using var fixture = new RemoteRepositoryFixture();
-            fixture.AssertFullSemver("0.1.0+4");
-            fixture.AssertFullSemver("0.1.0+4", repository: fixture.LocalRepositoryFixture.Repository);
-        }
+        using var fixture = new RemoteRepositoryFixture();
+        fixture.AssertFullSemver("0.1.0+4");
+        fixture.AssertFullSemver("0.1.0+4", repository: fixture.LocalRepositoryFixture.Repository);
+    }
 
-        [Test]
-        public void GivenARemoteGitRepositoryWithCommitsAndBranchesThenClonedLocalShouldMatchRemoteVersion()
-        {
-            var targetBranch = "release-1.0";
-            using var fixture = new RemoteRepositoryFixture(
-                path =>
-                {
-                    Repository.Init(path);
-                    Console.WriteLine("Created git repository at '{0}'", path);
+    [Test]
+    public void GivenARemoteGitRepositoryWithCommitsAndBranchesThenClonedLocalShouldMatchRemoteVersion()
+    {
+        var targetBranch = "release-1.0";
+        using var fixture = new RemoteRepositoryFixture(
+            path =>
+            {
+                Repository.Init(path);
+                Console.WriteLine("Created git repository at '{0}'", path);
 
-                    var repo = new Repository(path);
-                    repo.MakeCommits(5);
+                var repo = new Repository(path);
+                repo.MakeCommits(5);
 
-                    repo.CreateBranch("develop");
-                    repo.CreateBranch(targetBranch);
+                repo.CreateBranch("develop");
+                repo.CreateBranch(targetBranch);
 
-                    Commands.Checkout(repo, targetBranch);
-                    repo.MakeCommits(5);
+                Commands.Checkout(repo, targetBranch);
+                repo.MakeCommits(5);
 
-                    return repo;
-                });
+                return repo;
+            });
 
-            var gitVersionOptions = new GitVersionOptions
+        var gitVersionOptions = new GitVersionOptions
+        {
+            WorkingDirectory = fixture.LocalRepositoryFixture.RepositoryPath,
+            RepositoryInfo =
             {
-                WorkingDirectory = fixture.LocalRepositoryFixture.RepositoryPath,
-                RepositoryInfo =
-                {
-                    TargetBranch = targetBranch
-                },
+                TargetBranch = targetBranch
+            },
 
-                Settings =
-                {
-                    NoNormalize = false,
-                    NoFetch = false
-                }
-            };
-            var options = Options.Create(gitVersionOptions);
-            var environment = new TestEnvironment();
-            environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, "true");
-
-            var sp = ConfigureServices(services =>
+            Settings =
             {
-                services.AddSingleton(options);
-                services.AddSingleton<IEnvironment>(environment);
-            });
+                NoNormalize = false,
+                NoFetch = false
+            }
+        };
+        var options = Options.Create(gitVersionOptions);
+        var environment = new TestEnvironment();
+        environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, "true");
 
-            var gitPreparer = sp.GetService<IGitPreparer>();
+        var sp = ConfigureServices(services =>
+        {
+            services.AddSingleton(options);
+            services.AddSingleton<IEnvironment>(environment);
+        });
 
-            gitPreparer.Prepare();
+        var gitPreparer = sp.GetService<IGitPreparer>();
 
-            fixture.AssertFullSemver("1.0.0-beta.1+5");
-            fixture.AssertFullSemver("1.0.0-beta.1+5", repository: fixture.LocalRepositoryFixture.Repository);
-        }
+        gitPreparer.Prepare();
 
-        [Test]
-        public void GivenARemoteGitRepositoryAheadOfLocalRepositoryThenChangesShouldPull()
-        {
-            using var fixture = new RemoteRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("0.1.0+5");
-            fixture.AssertFullSemver("0.1.0+4", repository: fixture.LocalRepositoryFixture.Repository);
-            var buildSignature = fixture.LocalRepositoryFixture.Repository.Config.BuildSignature(new DateTimeOffset(DateTime.Now));
-            Commands.Pull((Repository)fixture.LocalRepositoryFixture.Repository, buildSignature, new PullOptions());
-            fixture.AssertFullSemver("0.1.0+5", repository: fixture.LocalRepositoryFixture.Repository);
-        }
+        fixture.AssertFullSemver("1.0.0-beta.1+5");
+        fixture.AssertFullSemver("1.0.0-beta.1+5", repository: fixture.LocalRepositoryFixture.Repository);
+    }
 
-        [Test]
-        public void GivenARemoteGitRepositoryWhenCheckingOutDetachedheadUsingExistingImplementationThrowsException()
-        {
-            using var fixture = new RemoteRepositoryFixture();
-            Commands.Checkout(
-                fixture.LocalRepositoryFixture.Repository,
-                fixture.LocalRepositoryFixture.Repository.Head.Tip);
+    [Test]
+    public void GivenARemoteGitRepositoryAheadOfLocalRepositoryThenChangesShouldPull()
+    {
+        using var fixture = new RemoteRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("0.1.0+5");
+        fixture.AssertFullSemver("0.1.0+4", repository: fixture.LocalRepositoryFixture.Repository);
+        var buildSignature = fixture.LocalRepositoryFixture.Repository.Config.BuildSignature(new DateTimeOffset(DateTime.Now));
+        Commands.Pull((Repository)fixture.LocalRepositoryFixture.Repository, buildSignature, new PullOptions());
+        fixture.AssertFullSemver("0.1.0+5", repository: fixture.LocalRepositoryFixture.Repository);
+    }
 
-            Should.Throw<WarningException>(() => fixture.AssertFullSemver("0.1.0+4", repository: fixture.LocalRepositoryFixture.Repository, onlyTrackedBranches: false),
-                $"It looks like the branch being examined is a detached Head pointing to commit '{fixture.LocalRepositoryFixture.Repository.Head.Tip.Id.ToString(7)}'. Without a proper branch name GitVersion cannot determine the build version.");
-        }
+    [Test]
+    public void GivenARemoteGitRepositoryWhenCheckingOutDetachedheadUsingExistingImplementationThrowsException()
+    {
+        using var fixture = new RemoteRepositoryFixture();
+        Commands.Checkout(
+            fixture.LocalRepositoryFixture.Repository,
+            fixture.LocalRepositoryFixture.Repository.Head.Tip);
 
-        [Test]
-        public void GivenARemoteGitRepositoryWhenCheckingOutDetachedheadUsingTrackingBranchOnlyBehaviourShouldReturnVersion014Plus5()
-        {
-            using var fixture = new RemoteRepositoryFixture();
-            Commands.Checkout(fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Head.Tip);
+        Should.Throw<WarningException>(() => fixture.AssertFullSemver("0.1.0+4", repository: fixture.LocalRepositoryFixture.Repository, onlyTrackedBranches: false),
+            $"It looks like the branch being examined is a detached Head pointing to commit '{fixture.LocalRepositoryFixture.Repository.Head.Tip.Id.ToString(7)}'. Without a proper branch name GitVersion cannot determine the build version.");
+    }
 
-            fixture.AssertFullSemver("0.1.0+4", repository: fixture.LocalRepositoryFixture.Repository);
-        }
+    [Test]
+    public void GivenARemoteGitRepositoryWhenCheckingOutDetachedheadUsingTrackingBranchOnlyBehaviourShouldReturnVersion014Plus5()
+    {
+        using var fixture = new RemoteRepositoryFixture();
+        Commands.Checkout(fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Head.Tip);
 
-        [Test]
-        public void GivenARemoteGitRepositoryTheLocalAndRemoteBranchAreTreatedAsSameParentWhenInheritingConfiguration()
-        {
-            using var remote = new EmptyRepositoryFixture();
-            remote.MakeATaggedCommit("1.0");
-            remote.BranchTo("develop");
-            remote.MakeACommit();
-            remote.Checkout("main");
-            remote.BranchTo("support/1.0.x");
-            remote.MakeATaggedCommit("1.0.1");
-
-            using var local = remote.CloneRepository();
-            CopyRemoteBranchesToHeads(local.Repository);
-            local.BranchTo("bug/hotfix");
-            local.MakeACommit();
-            local.AssertFullSemver("1.0.2-bug-hotfix.1+1");
-        }
+        fixture.AssertFullSemver("0.1.0+4", repository: fixture.LocalRepositoryFixture.Repository);
+    }
 
-        private static void CopyRemoteBranchesToHeads(IRepository repository)
+    [Test]
+    public void GivenARemoteGitRepositoryTheLocalAndRemoteBranchAreTreatedAsSameParentWhenInheritingConfiguration()
+    {
+        using var remote = new EmptyRepositoryFixture();
+        remote.MakeATaggedCommit("1.0");
+        remote.BranchTo("develop");
+        remote.MakeACommit();
+        remote.Checkout("main");
+        remote.BranchTo("support/1.0.x");
+        remote.MakeATaggedCommit("1.0.1");
+
+        using var local = remote.CloneRepository();
+        CopyRemoteBranchesToHeads(local.Repository);
+        local.BranchTo("bug/hotfix");
+        local.MakeACommit();
+        local.AssertFullSemver("1.0.2-bug-hotfix.1+1");
+    }
+
+    private static void CopyRemoteBranchesToHeads(IRepository repository)
+    {
+        foreach (var branch in repository.Branches)
         {
-            foreach (var branch in repository.Branches)
+            if (branch.IsRemote)
             {
-                if (branch.IsRemote)
+                var localName = branch.FriendlyName.Replace($"{branch.RemoteName}/", "");
+                if (repository.Branches[localName] == null)
                 {
-                    var localName = branch.FriendlyName.Replace($"{branch.RemoteName}/", "");
-                    if (repository.Branches[localName] == null)
-                    {
-                        repository.CreateBranch(localName, branch.FriendlyName);
-                    }
+                    repository.CreateBranch(localName, branch.FriendlyName);
                 }
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/SupportBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/SupportBranchScenarios.cs
index a5ec35e7c7..3fe0392472 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/SupportBranchScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/SupportBranchScenarios.cs
@@ -3,73 +3,72 @@
 using LibGit2Sharp;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class SupportBranchScenarios : TestBase
 {
-    [TestFixture]
-    public class SupportBranchScenarios : TestBase
+    [Test]
+    public void SupportIsCalculatedCorrectly()
     {
-        [Test]
-        public void SupportIsCalculatedCorrectly()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            // Start at 1.0.0
-            fixture.Repository.MakeACommit();
-            fixture.Repository.ApplyTag("1.1.0");
+        using var fixture = new EmptyRepositoryFixture();
+        // Start at 1.0.0
+        fixture.Repository.MakeACommit();
+        fixture.Repository.ApplyTag("1.1.0");
 
-            // Create 2.0.0 release
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("release-2.0.0"));
-            fixture.Repository.MakeCommits(2);
+        // Create 2.0.0 release
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("release-2.0.0"));
+        fixture.Repository.MakeCommits(2);
 
-            // Merge into develop and main
-            Commands.Checkout(fixture.Repository, MainBranch);
-            fixture.Repository.MergeNoFF("release-2.0.0");
-            fixture.Repository.ApplyTag("2.0.0");
-            fixture.AssertFullSemver("2.0.0");
+        // Merge into develop and main
+        Commands.Checkout(fixture.Repository, MainBranch);
+        fixture.Repository.MergeNoFF("release-2.0.0");
+        fixture.Repository.ApplyTag("2.0.0");
+        fixture.AssertFullSemver("2.0.0");
 
-            // Now lets support 1.x release
-            Commands.Checkout(fixture.Repository, "1.1.0");
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("support/1.0.0"));
-            fixture.AssertFullSemver("1.1.0");
+        // Now lets support 1.x release
+        Commands.Checkout(fixture.Repository, "1.1.0");
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("support/1.0.0"));
+        fixture.AssertFullSemver("1.1.0");
 
-            // Create release branch from support branch
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("release/1.2.0"));
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.2.0-beta.1+1");
+        // Create release branch from support branch
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("release/1.2.0"));
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("1.2.0-beta.1+1");
 
-            // Create 1.2.0 release
-            Commands.Checkout(fixture.Repository, "support/1.0.0");
-            fixture.Repository.MergeNoFF("release/1.2.0");
-            fixture.AssertFullSemver("1.2.0+0");
-            fixture.Repository.ApplyTag("1.2.0");
+        // Create 1.2.0 release
+        Commands.Checkout(fixture.Repository, "support/1.0.0");
+        fixture.Repository.MergeNoFF("release/1.2.0");
+        fixture.AssertFullSemver("1.2.0+0");
+        fixture.Repository.ApplyTag("1.2.0");
 
-            // Create 1.2.1 hotfix
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("hotfix/1.2.1"));
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.2.1-beta.1+1");
-            Commands.Checkout(fixture.Repository, "support/1.0.0");
-            fixture.Repository.MergeNoFF("hotfix/1.2.1");
-            fixture.AssertFullSemver("1.2.1+2");
-        }
+        // Create 1.2.1 hotfix
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("hotfix/1.2.1"));
+        fixture.Repository.MakeACommit();
+        fixture.AssertFullSemver("1.2.1-beta.1+1");
+        Commands.Checkout(fixture.Repository, "support/1.0.0");
+        fixture.Repository.MergeNoFF("hotfix/1.2.1");
+        fixture.AssertFullSemver("1.2.1+2");
+    }
 
-        [Test]
-        public void WhenSupportIsBranchedAndTaggedFromAnotherSupportEnsureNewMinorIsUsed()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.CreateBranch("Support-1.2.0");
-            Commands.Checkout(fixture.Repository, "Support-1.2.0");
-            fixture.Repository.MakeACommit();
-            fixture.Repository.ApplyTag("1.2.0");
+    [Test]
+    public void WhenSupportIsBranchedAndTaggedFromAnotherSupportEnsureNewMinorIsUsed()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.CreateBranch("Support-1.2.0");
+        Commands.Checkout(fixture.Repository, "Support-1.2.0");
+        fixture.Repository.MakeACommit();
+        fixture.Repository.ApplyTag("1.2.0");
 
-            fixture.Repository.CreateBranch("Support-1.3.0");
-            Commands.Checkout(fixture.Repository, "Support-1.3.0");
-            fixture.Repository.ApplyTag("1.3.0");
+        fixture.Repository.CreateBranch("Support-1.3.0");
+        Commands.Checkout(fixture.Repository, "Support-1.3.0");
+        fixture.Repository.ApplyTag("1.3.0");
 
-            //Move On
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeACommit();
+        //Move On
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeACommit();
 
-            fixture.AssertFullSemver("1.3.1+2");
-        }
+        fixture.AssertFullSemver("1.3.1+2");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs
index cde0afee88..2e9b5ac459 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs
@@ -3,20 +3,19 @@
 using LibGit2Sharp;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class SwitchingToGitFlowScenarios : TestBase
 {
-    [TestFixture]
-    public class SwitchingToGitFlowScenarios : TestBase
+    [Test]
+    public void WhenDevelopBranchedFromMainWithLegacyVersionTagsDevelopCanUseReachableTag()
     {
-        [Test]
-        public void WhenDevelopBranchedFromMainWithLegacyVersionTagsDevelopCanUseReachableTag()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeCommits(5);
-            fixture.Repository.MakeATaggedCommit("1.0.0.0");
-            fixture.Repository.MakeCommits(2);
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            fixture.AssertFullSemver("1.1.0-alpha.2");
-        }
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeCommits(5);
+        fixture.Repository.MakeATaggedCommit("1.0.0.0");
+        fixture.Repository.MakeCommits(2);
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        fixture.AssertFullSemver("1.1.0-alpha.2");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/TagCheckoutScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/TagCheckoutScenarios.cs
index 9b63a94460..f4388e0e76 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/TagCheckoutScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/TagCheckoutScenarios.cs
@@ -2,51 +2,50 @@
 using GitVersion.Core.Tests.Helpers;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class TagCheckoutScenarios
 {
-    [TestFixture]
-    public class TagCheckoutScenarios
+    [Test]
+    public void GivenARepositoryWithSingleCommit()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        const string taggedVersion = "1.0.3";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.Checkout(taggedVersion);
+
+        fixture.AssertFullSemver(taggedVersion);
+    }
+
+    [Test]
+    public void GivenARepositoryWithSingleCommitAndSingleBranch()
     {
-        [Test]
-        public void GivenARepositoryWithSingleCommit()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            const string taggedVersion = "1.0.3";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
-            fixture.Checkout(taggedVersion);
-
-            fixture.AssertFullSemver(taggedVersion);
-        }
-
-        [Test]
-        public void GivenARepositoryWithSingleCommitAndSingleBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            const string taggedVersion = "1.0.3";
-            fixture.Repository.MakeATaggedCommit(taggedVersion);
-            fixture.BranchTo("task1");
-            fixture.Checkout(taggedVersion);
-
-            fixture.AssertFullSemver(taggedVersion);
-        }
-
-        [Test]
-        public void GivenARepositoryWithTwoTagsAndADevelopBranch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            const string firstVersion = "1.0";
-            const string hotfixVersion = "1.0.1";
-
-            fixture.MakeACommit($"init {TestBase.MainBranch}");
-            fixture.ApplyTag(firstVersion);
-            fixture.MakeACommit("hotfix");
-            fixture.ApplyTag(hotfixVersion);
-            fixture.BranchTo("develop");
-            fixture.MakeACommit("new feature");
-            fixture.Checkout(hotfixVersion);
-            fixture.BranchTo("tags/1.0.1");
-
-            fixture.AssertFullSemver(hotfixVersion);
-        }
+        using var fixture = new EmptyRepositoryFixture();
+        const string taggedVersion = "1.0.3";
+        fixture.Repository.MakeATaggedCommit(taggedVersion);
+        fixture.BranchTo("task1");
+        fixture.Checkout(taggedVersion);
+
+        fixture.AssertFullSemver(taggedVersion);
+    }
+
+    [Test]
+    public void GivenARepositoryWithTwoTagsAndADevelopBranch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        const string firstVersion = "1.0";
+        const string hotfixVersion = "1.0.1";
+
+        fixture.MakeACommit($"init {TestBase.MainBranch}");
+        fixture.ApplyTag(firstVersion);
+        fixture.MakeACommit("hotfix");
+        fixture.ApplyTag(hotfixVersion);
+        fixture.BranchTo("develop");
+        fixture.MakeACommit("new feature");
+        fixture.Checkout(hotfixVersion);
+        fixture.BranchTo("tags/1.0.1");
+
+        fixture.AssertFullSemver(hotfixVersion);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs
index d5eb3703e9..25ff8c37a4 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs
@@ -4,111 +4,110 @@
 using GitVersion.Model.Configuration;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class VersionBumpingScenarios : TestBase
 {
-    [TestFixture]
-    public class VersionBumpingScenarios : TestBase
+    [Test]
+    public void AppliedPrereleaseTagCausesBump()
     {
-        [Test]
-        public void AppliedPrereleaseTagCausesBump()
+        var configuration = new Config
         {
-            var configuration = new Config
+            Branches =
             {
-                Branches =
                 {
+                    MainBranch, new BranchConfig
                     {
-                        MainBranch, new BranchConfig
-                        {
-                            Tag = "pre",
-                            SourceBranches = new HashSet<string>()
-                        }
+                        Tag = "pre",
+                        SourceBranches = new HashSet<string>()
                     }
                 }
-            };
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeATaggedCommit("1.0.0-pre.1");
-            fixture.Repository.MakeACommit();
+            }
+        };
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeATaggedCommit("1.0.0-pre.1");
+        fixture.Repository.MakeACommit();
+
+        fixture.AssertFullSemver("1.0.0-pre.2+1", configuration);
+    }
 
-            fixture.AssertFullSemver("1.0.0-pre.2+1", configuration);
-        }
+    [Test]
+    public void CanUseCommitMessagesToBumpVersion()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.MakeATaggedCommit("1.0.0");
+        fixture.Repository.MakeACommit("+semver:minor");
 
-        [Test]
-        public void CanUseCommitMessagesToBumpVersion()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.MakeATaggedCommit("1.0.0");
-            fixture.Repository.MakeACommit("+semver:minor");
-
-            fixture.AssertFullSemver("1.1.0+1");
-
-            fixture.Repository.MakeACommit("+semver:major");
-
-            fixture.AssertFullSemver("2.0.0+2");
-        }
-
-        [Theory]
-        [TestCase("build: Cleaned up various things", "1.0.1")]
-        [TestCase("build: Cleaned up various things\n\nSome descriptive text", "1.0.1")]
-        [TestCase("build: Cleaned up various things\n\nSome descriptive text\nWith a second line", "1.0.1")]
-        [TestCase("build(ref): Cleaned up various things", "1.0.1")]
-        [TestCase("build(ref)!: Major update", "2.0.0")]
-        [TestCase("chore: Cleaned up various things", "1.0.1")]
-        [TestCase("ci: Cleaned up various things", "1.0.1")]
-        [TestCase("docs: Cleaned up various things", "1.0.1")]
-        [TestCase("fix: Cleaned up various things", "1.0.1")]
-        [TestCase("perf: Cleaned up various things", "1.0.1")]
-        [TestCase("refactor: Cleaned up various things", "1.0.1")]
-        [TestCase("revert: Cleaned up various things", "1.0.1")]
-        [TestCase("style: Cleaned up various things", "1.0.1")]
-        [TestCase("test: Cleaned up various things", "1.0.1")]
-        [TestCase("feat(ref): Simple feature", "1.1.0")]
-        [TestCase("feat(ref)!: Major update", "2.0.0")]
-        [TestCase("feat: Major update\n\nSome descriptive text\n\nBREAKING CHANGE: A reason", "2.0.0")]
-        [TestCase("feat: Major update\n\nSome descriptive text\n\nBREAKING CHANGE Missing colon", "1.1.0")]
-        [TestCase("feat: Major update\n\nForgot to describe the change\n\nBREAKING CHANGE: ", "1.1.0")]
-        [TestCase("feat: Major update\n\nBREAKING CHANGE: A reason", "2.0.0")]
-        [TestCase("feat: Major update\n\nSome descriptive text\nWith a second line\n\nBREAKING CHANGE: A reason", "2.0.0")]
-        public void CanUseConventionalCommitsToBumpVersion(string commitMessage, string expectedVersion)
+        fixture.AssertFullSemver("1.1.0+1");
+
+        fixture.Repository.MakeACommit("+semver:major");
+
+        fixture.AssertFullSemver("2.0.0+2");
+    }
+
+    [Theory]
+    [TestCase("build: Cleaned up various things", "1.0.1")]
+    [TestCase("build: Cleaned up various things\n\nSome descriptive text", "1.0.1")]
+    [TestCase("build: Cleaned up various things\n\nSome descriptive text\nWith a second line", "1.0.1")]
+    [TestCase("build(ref): Cleaned up various things", "1.0.1")]
+    [TestCase("build(ref)!: Major update", "2.0.0")]
+    [TestCase("chore: Cleaned up various things", "1.0.1")]
+    [TestCase("ci: Cleaned up various things", "1.0.1")]
+    [TestCase("docs: Cleaned up various things", "1.0.1")]
+    [TestCase("fix: Cleaned up various things", "1.0.1")]
+    [TestCase("perf: Cleaned up various things", "1.0.1")]
+    [TestCase("refactor: Cleaned up various things", "1.0.1")]
+    [TestCase("revert: Cleaned up various things", "1.0.1")]
+    [TestCase("style: Cleaned up various things", "1.0.1")]
+    [TestCase("test: Cleaned up various things", "1.0.1")]
+    [TestCase("feat(ref): Simple feature", "1.1.0")]
+    [TestCase("feat(ref)!: Major update", "2.0.0")]
+    [TestCase("feat: Major update\n\nSome descriptive text\n\nBREAKING CHANGE: A reason", "2.0.0")]
+    [TestCase("feat: Major update\n\nSome descriptive text\n\nBREAKING CHANGE Missing colon", "1.1.0")]
+    [TestCase("feat: Major update\n\nForgot to describe the change\n\nBREAKING CHANGE: ", "1.1.0")]
+    [TestCase("feat: Major update\n\nBREAKING CHANGE: A reason", "2.0.0")]
+    [TestCase("feat: Major update\n\nSome descriptive text\nWith a second line\n\nBREAKING CHANGE: A reason", "2.0.0")]
+    public void CanUseConventionalCommitsToBumpVersion(string commitMessage, string expectedVersion)
+    {
+        var configuration = new Config
         {
-            var configuration = new Config
-            {
-                VersioningMode = GitVersion.VersionCalculation.VersioningMode.Mainline,
+            VersioningMode = GitVersion.VersionCalculation.VersioningMode.Mainline,
 
-                // For future debugging of this regex: https://regex101.com/r/CRoBol/1
-                MajorVersionBumpMessage = "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\\([\\w\\s]*\\))?(!:|:.*\\n\\n((.+\\n)+\\n)?BREAKING CHANGE:\\s.+)",
+            // For future debugging of this regex: https://regex101.com/r/CRoBol/1
+            MajorVersionBumpMessage = "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\\([\\w\\s]*\\))?(!:|:.*\\n\\n((.+\\n)+\\n)?BREAKING CHANGE:\\s.+)",
 
-                // For future debugging of this regex: https://regex101.com/r/9ccNam/1
-                MinorVersionBumpMessage = "^(feat)(\\([\\w\\s]*\\))?:",
+            // For future debugging of this regex: https://regex101.com/r/9ccNam/1
+            MinorVersionBumpMessage = "^(feat)(\\([\\w\\s]*\\))?:",
 
-                // For future debugging of this regex: https://regex101.com/r/oFpqxA/1
-                PatchVersionBumpMessage = "^(build|chore|ci|docs|fix|perf|refactor|revert|style|test)(\\([\\w\\s]*\\))?:"
-            };
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.MakeATaggedCommit("1.0.0");
+            // For future debugging of this regex: https://regex101.com/r/oFpqxA/1
+            PatchVersionBumpMessage = "^(build|chore|ci|docs|fix|perf|refactor|revert|style|test)(\\([\\w\\s]*\\))?:"
+        };
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.MakeATaggedCommit("1.0.0");
 
-            fixture.Repository.MakeACommit(commitMessage);
-            fixture.AssertFullSemver(expectedVersion, configuration);
-        }
+        fixture.Repository.MakeACommit(commitMessage);
+        fixture.AssertFullSemver(expectedVersion, configuration);
+    }
 
-        [Test]
-        public void CanUseCommitMessagesToBumpVersionBaseVersionTagIsAppliedToSameCommit()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.MakeATaggedCommit("1.0.0");
-            fixture.Repository.MakeACommit("+semver:minor");
-            fixture.AssertFullSemver("1.1.0+1");
+    [Test]
+    public void CanUseCommitMessagesToBumpVersionBaseVersionTagIsAppliedToSameCommit()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.MakeATaggedCommit("1.0.0");
+        fixture.Repository.MakeACommit("+semver:minor");
+        fixture.AssertFullSemver("1.1.0+1");
 
-            fixture.ApplyTag("2.0.0");
+        fixture.ApplyTag("2.0.0");
 
-            fixture.Repository.MakeACommit("Hello");
+        fixture.Repository.MakeACommit("Hello");
 
-            // Default bump is patch
+        // Default bump is patch
 
-            fixture.AssertFullSemver("2.0.1+1");
-        }
+        fixture.AssertFullSemver("2.0.1+1");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs
index cad3920368..beb492a7a4 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs
@@ -6,68 +6,67 @@
 using LibGit2Sharp;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class VersionInCurrentBranchNameScenarios : TestBase
 {
-    [TestFixture]
-    public class VersionInCurrentBranchNameScenarios : TestBase
+    [Test]
+    public void TakesVersionFromNameOfReleaseBranch()
     {
-        [Test]
-        public void TakesVersionFromNameOfReleaseBranch()
-        {
-            using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
-            fixture.BranchTo("release/2.0.0");
+        using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
+        fixture.BranchTo("release/2.0.0");
 
-            fixture.AssertFullSemver("2.0.0-beta.1+0");
-        }
+        fixture.AssertFullSemver("2.0.0-beta.1+0");
+    }
 
-        [Test]
-        public void DoesNotTakeVersionFromNameOfNonReleaseBranch()
-        {
-            using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
-            fixture.BranchTo("feature/upgrade-power-level-to-9000.0.1");
+    [Test]
+    public void DoesNotTakeVersionFromNameOfNonReleaseBranch()
+    {
+        using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
+        fixture.BranchTo("feature/upgrade-power-level-to-9000.0.1");
 
-            fixture.AssertFullSemver("1.1.0-upgrade-power-level-to-9000-0-1.1+1");
-        }
+        fixture.AssertFullSemver("1.1.0-upgrade-power-level-to-9000-0-1.1+1");
+    }
 
-        [Test]
-        public void TakesVersionFromNameOfBranchThatIsReleaseByConfig()
+    [Test]
+    public void TakesVersionFromNameOfBranchThatIsReleaseByConfig()
+    {
+        var config = new Config
         {
-            var config = new Config
-            {
-                Branches = new Dictionary<string, BranchConfig> { { "support", new BranchConfig { IsReleaseBranch = true } } }
-            };
+            Branches = new Dictionary<string, BranchConfig> { { "support", new BranchConfig { IsReleaseBranch = true } } }
+        };
 
-            using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
-            fixture.BranchTo("support/2.0.0");
+        using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
+        fixture.BranchTo("support/2.0.0");
 
-            fixture.AssertFullSemver("2.0.0+1", config);
-        }
+        fixture.AssertFullSemver("2.0.0+1", config);
+    }
 
-        [Test]
-        public void TakesVersionFromNameOfRemoteReleaseBranchInOrigin()
-        {
-            using var fixture = new RemoteRepositoryFixture();
-            fixture.BranchTo("release/2.0.0");
-            fixture.MakeACommit();
-            Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
+    [Test]
+    public void TakesVersionFromNameOfRemoteReleaseBranchInOrigin()
+    {
+        using var fixture = new RemoteRepositoryFixture();
+        fixture.BranchTo("release/2.0.0");
+        fixture.MakeACommit();
+        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
 
-            fixture.LocalRepositoryFixture.Checkout("origin/release/2.0.0");
+        fixture.LocalRepositoryFixture.Checkout("origin/release/2.0.0");
 
-            fixture.LocalRepositoryFixture.AssertFullSemver("2.0.0-beta.1+1");
-        }
+        fixture.LocalRepositoryFixture.AssertFullSemver("2.0.0-beta.1+1");
+    }
 
-        [Test]
-        public void DoesNotTakeVersionFromNameOfRemoteReleaseBranchInCustomRemote()
-        {
-            using var fixture = new RemoteRepositoryFixture();
-            fixture.LocalRepositoryFixture.Repository.Network.Remotes.Rename("origin", "upstream");
-            fixture.BranchTo("release/2.0.0");
-            fixture.MakeACommit();
-            Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
+    [Test]
+    public void DoesNotTakeVersionFromNameOfRemoteReleaseBranchInCustomRemote()
+    {
+        using var fixture = new RemoteRepositoryFixture();
+        fixture.LocalRepositoryFixture.Repository.Network.Remotes.Rename("origin", "upstream");
+        fixture.BranchTo("release/2.0.0");
+        fixture.MakeACommit();
+        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
 
-            fixture.LocalRepositoryFixture.Checkout("upstream/release/2.0.0");
+        fixture.LocalRepositoryFixture.Checkout("upstream/release/2.0.0");
 
-            fixture.LocalRepositoryFixture.AssertFullSemver("0.1.0-beta.1+5");
-        }
+        fixture.LocalRepositoryFixture.AssertFullSemver("0.1.0-beta.1+5");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs
index b2cf86a8d4..5031c3bdac 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs
@@ -6,80 +6,79 @@
 using LibGit2Sharp;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class VersionInMergedBranchNameScenarios : TestBase
 {
-    [TestFixture]
-    public class VersionInMergedBranchNameScenarios : TestBase
+    [Test]
+    public void TakesVersionFromNameOfReleaseBranch()
     {
-        [Test]
-        public void TakesVersionFromNameOfReleaseBranch()
-        {
-            using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
-            fixture.CreateAndMergeBranchIntoDevelop("release/2.0.0");
+        using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
+        fixture.CreateAndMergeBranchIntoDevelop("release/2.0.0");
 
-            fixture.AssertFullSemver("2.1.0-alpha.2");
-        }
+        fixture.AssertFullSemver("2.1.0-alpha.2");
+    }
 
-        [Test]
-        public void DoesNotTakeVersionFromNameOfNonReleaseBranch()
-        {
-            using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
-            fixture.CreateAndMergeBranchIntoDevelop("pull-request/improved-by-upgrading-some-lib-to-4.5.6");
-            fixture.CreateAndMergeBranchIntoDevelop("hotfix/downgrade-some-lib-to-3.2.1-to-avoid-breaking-changes");
+    [Test]
+    public void DoesNotTakeVersionFromNameOfNonReleaseBranch()
+    {
+        using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
+        fixture.CreateAndMergeBranchIntoDevelop("pull-request/improved-by-upgrading-some-lib-to-4.5.6");
+        fixture.CreateAndMergeBranchIntoDevelop("hotfix/downgrade-some-lib-to-3.2.1-to-avoid-breaking-changes");
 
-            fixture.AssertFullSemver("1.1.0-alpha.5");
-        }
+        fixture.AssertFullSemver("1.1.0-alpha.5");
+    }
 
-        [Test]
-        public void TakesVersionFromNameOfBranchThatIsReleaseByConfig()
+    [Test]
+    public void TakesVersionFromNameOfBranchThatIsReleaseByConfig()
+    {
+        var config = new Config
         {
-            var config = new Config
-            {
-                Branches = new Dictionary<string, BranchConfig> { { "support", new BranchConfig { IsReleaseBranch = true } } }
-            };
+            Branches = new Dictionary<string, BranchConfig> { { "support", new BranchConfig { IsReleaseBranch = true } } }
+        };
 
-            using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
-            fixture.CreateAndMergeBranchIntoDevelop("support/2.0.0");
+        using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
+        fixture.CreateAndMergeBranchIntoDevelop("support/2.0.0");
 
-            fixture.AssertFullSemver("2.1.0-alpha.2", config);
-        }
+        fixture.AssertFullSemver("2.1.0-alpha.2", config);
+    }
 
-        [Test]
-        public void TakesVersionFromNameOfRemoteReleaseBranchInOrigin()
-        {
-            using var fixture = new RemoteRepositoryFixture();
-            fixture.BranchTo("release/2.0.0");
-            fixture.MakeACommit();
-            Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
+    [Test]
+    public void TakesVersionFromNameOfRemoteReleaseBranchInOrigin()
+    {
+        using var fixture = new RemoteRepositoryFixture();
+        fixture.BranchTo("release/2.0.0");
+        fixture.MakeACommit();
+        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
 
-            fixture.LocalRepositoryFixture.MergeNoFF("origin/release/2.0.0");
+        fixture.LocalRepositoryFixture.MergeNoFF("origin/release/2.0.0");
 
-            fixture.LocalRepositoryFixture.AssertFullSemver("2.0.0+0");
-        }
+        fixture.LocalRepositoryFixture.AssertFullSemver("2.0.0+0");
+    }
 
-        [Test]
-        public void DoesNotTakeVersionFromNameOfRemoteReleaseBranchInCustomRemote()
-        {
-            using var fixture = new RemoteRepositoryFixture();
-            fixture.LocalRepositoryFixture.Repository.Network.Remotes.Rename("origin", "upstream");
-            fixture.BranchTo("release/2.0.0");
-            fixture.MakeACommit();
-            Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
+    [Test]
+    public void DoesNotTakeVersionFromNameOfRemoteReleaseBranchInCustomRemote()
+    {
+        using var fixture = new RemoteRepositoryFixture();
+        fixture.LocalRepositoryFixture.Repository.Network.Remotes.Rename("origin", "upstream");
+        fixture.BranchTo("release/2.0.0");
+        fixture.MakeACommit();
+        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
 
-            fixture.LocalRepositoryFixture.MergeNoFF("upstream/release/2.0.0");
+        fixture.LocalRepositoryFixture.MergeNoFF("upstream/release/2.0.0");
 
-            fixture.LocalRepositoryFixture.AssertFullSemver("0.1.0+6");
-        }
+        fixture.LocalRepositoryFixture.AssertFullSemver("0.1.0+6");
     }
+}
 
-    internal static class BaseGitFlowRepositoryFixtureExtensions
+internal static class BaseGitFlowRepositoryFixtureExtensions
+{
+    public static void CreateAndMergeBranchIntoDevelop(this BaseGitFlowRepositoryFixture fixture, string branchName)
     {
-        public static void CreateAndMergeBranchIntoDevelop(this BaseGitFlowRepositoryFixture fixture, string branchName)
-        {
-            fixture.BranchTo(branchName);
-            fixture.MakeACommit();
-            fixture.Checkout("develop");
-            fixture.MergeNoFF(branchName);
-        }
+        fixture.BranchTo(branchName);
+        fixture.MakeACommit();
+        fixture.Checkout("develop");
+        fixture.MergeNoFF(branchName);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionInTagScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionInTagScenarios.cs
index 64765a0f4e..62ff153478 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/VersionInTagScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/VersionInTagScenarios.cs
@@ -6,107 +6,106 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+internal class VersionInTagScenarios
 {
-    [TestFixture]
-    internal class VersionInTagScenarios
+    [Test]
+    public void TagPreReleaseWeightIsNotConfigured_HeadIsATaggedCommit_WeightedPreReleaseNumberShouldBeTheDefaultValue()
     {
-        [Test]
-        public void TagPreReleaseWeightIsNotConfigured_HeadIsATaggedCommit_WeightedPreReleaseNumberShouldBeTheDefaultValue()
-        {
-            // Arrange
-            var config = new ConfigurationBuilder()
-                         .Add(new Config
-                         {
-                             AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber}",
-                         })
-                         .Build();
+        // Arrange
+        var config = new ConfigurationBuilder()
+            .Add(new Config
+            {
+                AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber}",
+            })
+            .Build();
 
-            // Act
-            using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
-            fixture.MakeATaggedCommit("1.1.0");
-            var version = fixture.GetVersion(config);
+        // Act
+        using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
+        fixture.MakeATaggedCommit("1.1.0");
+        var version = fixture.GetVersion(config);
 
-            // Assert
-            version.AssemblySemFileVer.ShouldBe("1.1.0.60000");
-        }
+        // Assert
+        version.AssemblySemFileVer.ShouldBe("1.1.0.60000");
+    }
 
-        [Test]
-        public void TagPreReleaseWeightIsConfigured_HeadIsATaggedCommit_WeightedPreReleaseNumberShouldBeTheSameAsTheTagPreReleaseWeight()
-        {
-            // Arrange
-            var config = new ConfigurationBuilder()
-                         .Add(new Config
-                         {
-                             AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber}",
-                             TagPreReleaseWeight = 65535
-                         })
-                         .Build();
+    [Test]
+    public void TagPreReleaseWeightIsConfigured_HeadIsATaggedCommit_WeightedPreReleaseNumberShouldBeTheSameAsTheTagPreReleaseWeight()
+    {
+        // Arrange
+        var config = new ConfigurationBuilder()
+            .Add(new Config
+            {
+                AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber}",
+                TagPreReleaseWeight = 65535
+            })
+            .Build();
 
-            // Act
-            using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
-            fixture.MakeATaggedCommit("1.1.0");
-            var version = fixture.GetVersion(config);
+        // Act
+        using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
+        fixture.MakeATaggedCommit("1.1.0");
+        var version = fixture.GetVersion(config);
 
-            // Assert
-            version.AssemblySemFileVer.ShouldBe("1.1.0.65535");
-        }
+        // Assert
+        version.AssemblySemFileVer.ShouldBe("1.1.0.65535");
+    }
 
-        [Test]
-        public void TagPreReleaseWeightIsConfigured_GitFlowReleaseIsFinished_WeightedPreReleaseNumberShouldBeTheSameAsTheTagPreReleaseWeight()
-        {
-            // Arrange
-            var config = new ConfigurationBuilder()
-                         .Add(new Config
-                         {
-                             AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber}",
-                             TagPreReleaseWeight = 65535,
-                             VersioningMode = VersioningMode.ContinuousDeployment
-                         })
-                         .Build();
+    [Test]
+    public void TagPreReleaseWeightIsConfigured_GitFlowReleaseIsFinished_WeightedPreReleaseNumberShouldBeTheSameAsTheTagPreReleaseWeight()
+    {
+        // Arrange
+        var config = new ConfigurationBuilder()
+            .Add(new Config
+            {
+                AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber}",
+                TagPreReleaseWeight = 65535,
+                VersioningMode = VersioningMode.ContinuousDeployment
+            })
+            .Build();
 
-            // Act
-            using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
-            fixture.Checkout(TestBase.MainBranch);
-            fixture.MergeNoFF("develop");
-            fixture.Checkout("develop");
-            fixture.MakeACommit("Feature commit 1");
-            fixture.BranchTo("release/1.1.0");
-            fixture.MakeACommit("Release commit 1");
-            fixture.AssertFullSemver("1.1.0-beta.1", config);
-            fixture.ApplyTag("1.1.0");
-            var version = fixture.GetVersion(config);
+        // Act
+        using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
+        fixture.Checkout(TestBase.MainBranch);
+        fixture.MergeNoFF("develop");
+        fixture.Checkout("develop");
+        fixture.MakeACommit("Feature commit 1");
+        fixture.BranchTo("release/1.1.0");
+        fixture.MakeACommit("Release commit 1");
+        fixture.AssertFullSemver("1.1.0-beta.1", config);
+        fixture.ApplyTag("1.1.0");
+        var version = fixture.GetVersion(config);
 
-            // Assert
-            version.AssemblySemFileVer.ShouldBe("1.1.0.65535");
-        }
+        // Assert
+        version.AssemblySemFileVer.ShouldBe("1.1.0.65535");
+    }
 
-        [Test]
-        public void TagPreReleaseWeightIsNotConfigured_GitFlowReleaseIsFinished_WeightedPreReleaseNumberShouldBeTheDefaultValue()
-        {
-            // Arrange
-            var config = new ConfigurationBuilder()
-                         .Add(new Config
-                         {
-                             AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber}",
-                             VersioningMode = VersioningMode.ContinuousDeployment
-                         })
-                         .Build();
+    [Test]
+    public void TagPreReleaseWeightIsNotConfigured_GitFlowReleaseIsFinished_WeightedPreReleaseNumberShouldBeTheDefaultValue()
+    {
+        // Arrange
+        var config = new ConfigurationBuilder()
+            .Add(new Config
+            {
+                AssemblyFileVersioningFormat = "{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber}",
+                VersioningMode = VersioningMode.ContinuousDeployment
+            })
+            .Build();
 
-            // Act
-            using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
-            fixture.Checkout(TestBase.MainBranch);
-            fixture.MergeNoFF("develop");
-            fixture.Checkout("develop");
-            fixture.MakeACommit("Feature commit 1");
-            fixture.BranchTo("release/1.1.0");
-            fixture.MakeACommit("Release commit 1");
-            fixture.AssertFullSemver("1.1.0-beta.1", config);
-            fixture.ApplyTag("1.1.0");
-            var version = fixture.GetVersion(config);
+        // Act
+        using var fixture = new BaseGitFlowRepositoryFixture("1.0.0");
+        fixture.Checkout(TestBase.MainBranch);
+        fixture.MergeNoFF("develop");
+        fixture.Checkout("develop");
+        fixture.MakeACommit("Feature commit 1");
+        fixture.BranchTo("release/1.1.0");
+        fixture.MakeACommit("Release commit 1");
+        fixture.AssertFullSemver("1.1.0-beta.1", config);
+        fixture.ApplyTag("1.1.0");
+        var version = fixture.GetVersion(config);
 
-            // Assert
-            version.AssemblySemFileVer.ShouldBe("1.1.0.60000");
-        }
+        // Assert
+        version.AssemblySemFileVer.ShouldBe("1.1.0.60000");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/WorktreeScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/WorktreeScenarios.cs
index 08bb9c5f33..8ad21af5a9 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/WorktreeScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/WorktreeScenarios.cs
@@ -4,32 +4,30 @@
 using LibGit2Sharp;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.IntegrationTests
+namespace GitVersion.Core.Tests.IntegrationTests;
+
+[TestFixture]
+public class WorktreeScenarios : TestBase
 {
 
-    [TestFixture]
-    public class WorktreeScenarios : TestBase
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void UseWorktreeRepositoryForVersion()
     {
+        using var fixture = new EmptyRepositoryFixture();
+        var repoDir = new DirectoryInfo(fixture.RepositoryPath);
+        var worktreePath = Path.Combine(repoDir.Parent.FullName, $"{repoDir.Name}-v1");
 
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void UseWorktreeRepositoryForVersion()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            var repoDir = new DirectoryInfo(fixture.RepositoryPath);
-            var worktreePath = Path.Combine(repoDir.Parent.FullName, $"{repoDir.Name}-v1");
-
-            fixture.Repository.MakeATaggedCommit("v1.0.0");
-            var branchV1 = fixture.Repository.CreateBranch("support/1.0");
+        fixture.Repository.MakeATaggedCommit("v1.0.0");
+        var branchV1 = fixture.Repository.CreateBranch("support/1.0");
 
-            fixture.Repository.MakeATaggedCommit("v2.0.0");
-            fixture.AssertFullSemver("2.0.0");
-
-            fixture.Repository.Worktrees.Add(branchV1.CanonicalName, "1.0", worktreePath, false);
-            using var worktreeFixture = new LocalRepositoryFixture(new Repository(worktreePath));
-            worktreeFixture.AssertFullSemver("1.0.0");
-        }
+        fixture.Repository.MakeATaggedCommit("v2.0.0");
+        fixture.AssertFullSemver("2.0.0");
 
+        fixture.Repository.Worktrees.Add(branchV1.CanonicalName, "1.0", worktreePath, false);
+        using var worktreeFixture = new LocalRepositoryFixture(new Repository(worktreePath));
+        worktreeFixture.AssertFullSemver("1.0.0");
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Logging/LoggerTest.cs b/src/GitVersion.Core.Tests/Logging/LoggerTest.cs
index 344d22b78a..c8b55f5c0b 100644
--- a/src/GitVersion.Core.Tests/Logging/LoggerTest.cs
+++ b/src/GitVersion.Core.Tests/Logging/LoggerTest.cs
@@ -3,45 +3,44 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class LoggerTest : TestBase
 {
-    [TestFixture]
-    public class LoggerTest : TestBase
+    [Test]
+    [TestCase("http")]
+    [TestCase("https")]
+    public void LoggerObscuresPassword(string protocol)
     {
-        [Test]
-        [TestCase("http")]
-        [TestCase("https")]
-        public void LoggerObscuresPassword(string protocol)
-        {
-            const string username = "username%40domain.com";
-            const string password = "password";
-            var s = string.Empty;
+        const string username = "username%40domain.com";
+        const string password = "password";
+        var s = string.Empty;
 
-            void Action(string info) => s = info;
+        void Action(string info) => s = info;
 
-            var logAppender = new TestLogAppender(Action);
-            var log = new Log(logAppender);
+        var logAppender = new TestLogAppender(Action);
+        var log = new Log(logAppender);
 
-            log.Info($"{protocol}://{username}:{password}@workspace.visualstudio.com/DefaultCollection/_git/CAS");
+        log.Info($"{protocol}://{username}:{password}@workspace.visualstudio.com/DefaultCollection/_git/CAS");
 
-            s.Contains(password).ShouldBe(false);
-        }
+        s.Contains(password).ShouldBe(false);
+    }
 
-        [Test]
-        public void UsernameWithoutPassword()
-        {
-            var s = string.Empty;
+    [Test]
+    public void UsernameWithoutPassword()
+    {
+        var s = string.Empty;
 
-            void Action(string info) => s = info;
+        void Action(string info) => s = info;
 
-            var logAppender = new TestLogAppender(Action);
-            var log = new Log(logAppender);
+        var logAppender = new TestLogAppender(Action);
+        var log = new Log(logAppender);
 
-            const string repoUrl = "http://username@workspace.visualstudio.com/DefaultCollection/_git/CAS";
+        const string repoUrl = "http://username@workspace.visualstudio.com/DefaultCollection/_git/CAS";
 
-            log.Info(repoUrl);
+        log.Info(repoUrl);
 
-            s.Contains(repoUrl).ShouldBe(true);
-        }
+        s.Contains(repoUrl).ShouldBe(true);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Logging/LoggingTests.cs b/src/GitVersion.Core.Tests/Logging/LoggingTests.cs
index da4a9d753f..7a0d6572e0 100644
--- a/src/GitVersion.Core.Tests/Logging/LoggingTests.cs
+++ b/src/GitVersion.Core.Tests/Logging/LoggingTests.cs
@@ -1,17 +1,16 @@
 using GitVersion.Logging;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests.Logging
+namespace GitVersion.Core.Tests.Logging;
+
+[TestFixture]
+public class LoggingTests
 {
-    [TestFixture]
-    public class LoggingTests
+    [Test]
+    public void CanLogNonFormatStrings()
     {
-        [Test]
-        public void CanLogNonFormatStrings()
-        {
-            var log = new Log();
+        var log = new Log();
 
-            log.Info("Logging using git revision syntax eg. 1.0.0.0^{} shouldn't throw");
-        }
+        log.Info("Logging using git revision syntax eg. 1.0.0.0^{} shouldn't throw");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Model/CommitDateTests.cs b/src/GitVersion.Core.Tests/Model/CommitDateTests.cs
index 4326106a5c..90c738faf5 100644
--- a/src/GitVersion.Core.Tests/Model/CommitDateTests.cs
+++ b/src/GitVersion.Core.Tests/Model/CommitDateTests.cs
@@ -6,32 +6,31 @@
 using GitVersion.VersionCalculation;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class CommitDateTests : TestBase
 {
-    [TestFixture]
-    public class CommitDateTests : TestBase
+    [Test]
+    [TestCase("yyyy-MM-dd", "2017-10-06")]
+    [TestCase("dd.MM.yyyy", "06.10.2017")]
+    [TestCase("yyyyMMdd", "20171006")]
+    [TestCase("yyyy-MM", "2017-10")]
+    public void CommitDateFormatTest(string format, string expectedOutcome)
     {
-        [Test]
-        [TestCase("yyyy-MM-dd", "2017-10-06")]
-        [TestCase("dd.MM.yyyy", "06.10.2017")]
-        [TestCase("yyyyMMdd", "20171006")]
-        [TestCase("yyyy-MM", "2017-10")]
-        public void CommitDateFormatTest(string format, string expectedOutcome)
-        {
-            var date = new DateTime(2017, 10, 6);
+        var date = new DateTime(2017, 10, 6);
 
-            var formatValues = new SemanticVersionFormatValues(
-                                    new SemanticVersion
-                                    {
-                                        BuildMetaData = new SemanticVersionBuildMetaData("950d2f830f5a2af12a6779a48d20dcbb02351f25", 0, MainBranch, "3139d4eeb044f46057693473eacc2655b3b27e7d", "3139d4eeb", new DateTimeOffset(date, TimeSpan.Zero), 0), // assume time zone is UTC
+        var formatValues = new SemanticVersionFormatValues(
+            new SemanticVersion
+            {
+                BuildMetaData = new SemanticVersionBuildMetaData("950d2f830f5a2af12a6779a48d20dcbb02351f25", 0, MainBranch, "3139d4eeb044f46057693473eacc2655b3b27e7d", "3139d4eeb", new DateTimeOffset(date, TimeSpan.Zero), 0), // assume time zone is UTC
 
-                                    },
-                                    new EffectiveConfiguration(
-                                        AssemblyVersioningScheme.MajorMinorPatch, AssemblyFileVersioningScheme.MajorMinorPatch, "", "", "", VersioningMode.ContinuousDelivery, "", "", "", IncrementStrategy.Inherit,
-                                        "", true, "", "", false, "", "", "", "", CommitMessageIncrementMode.Enabled, 4, 4, 4, Enumerable.Empty<IVersionFilter>(), false, true, format, false, 0, 0)
-                                );
+            },
+            new EffectiveConfiguration(
+                AssemblyVersioningScheme.MajorMinorPatch, AssemblyFileVersioningScheme.MajorMinorPatch, "", "", "", VersioningMode.ContinuousDelivery, "", "", "", IncrementStrategy.Inherit,
+                "", true, "", "", false, "", "", "", "", CommitMessageIncrementMode.Enabled, 4, 4, 4, Enumerable.Empty<IVersionFilter>(), false, true, format, false, 0, 0)
+        );
 
-            Assert.That(formatValues.CommitDate, Is.EqualTo(expectedOutcome));
-        }
+        Assert.That(formatValues.CommitDate, Is.EqualTo(expectedOutcome));
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Model/GitVersionContextTests.cs b/src/GitVersion.Core.Tests/Model/GitVersionContextTests.cs
index 094c71dd46..27b40adf98 100644
--- a/src/GitVersion.Core.Tests/Model/GitVersionContextTests.cs
+++ b/src/GitVersion.Core.Tests/Model/GitVersionContextTests.cs
@@ -12,190 +12,189 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+public class GitVersionContextTests : TestBase
 {
-    public class GitVersionContextTests : TestBase
+    [Test]
+    [Theory]
+    public void CanInheritVersioningMode(VersioningMode mode)
     {
-        [Test]
-        [Theory]
-        public void CanInheritVersioningMode(VersioningMode mode)
-        {
-            using var fixture = new EmptyRepositoryFixture();
+        using var fixture = new EmptyRepositoryFixture();
 
-            var config = new ConfigurationBuilder()
-                .Add(new Config { VersioningMode = mode })
-                .Build();
+        var config = new ConfigurationBuilder()
+            .Add(new Config { VersioningMode = mode })
+            .Build();
 
-            const string branchName = MainBranch;
+        const string branchName = MainBranch;
 
-            var mockCommit = GitToolsTestingExtensions.CreateMockCommit();
-            var mockBranch = GitToolsTestingExtensions.CreateMockBranch(branchName, mockCommit);
+        var mockCommit = GitToolsTestingExtensions.CreateMockCommit();
+        var mockBranch = GitToolsTestingExtensions.CreateMockBranch(branchName, mockCommit);
 
-            var branches = Substitute.For<IBranchCollection>();
-            branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { mockBranch }).GetEnumerator());
+        var branches = Substitute.For<IBranchCollection>();
+        branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { mockBranch }).GetEnumerator());
 
-            var mockRepository = Substitute.For<IGitRepository>();
-            mockRepository.Head.Returns(mockBranch);
-            mockRepository.Branches.Returns(branches);
-            mockRepository.Commits.Returns(mockBranch.Commits);
+        var mockRepository = Substitute.For<IGitRepository>();
+        mockRepository.Head.Returns(mockBranch);
+        mockRepository.Branches.Returns(branches);
+        mockRepository.Commits.Returns(mockBranch.Commits);
 
-            var context = GetGitVersionContext(fixture.RepositoryPath, mockRepository, branchName, config);
+        var context = GetGitVersionContext(fixture.RepositoryPath, mockRepository, branchName, config);
 
-            context.Configuration.VersioningMode.ShouldBe(mode);
-        }
+        context.Configuration.VersioningMode.ShouldBe(mode);
+    }
 
-        [TestCase(IncrementStrategy.Inherit, IncrementStrategy.Patch)] // Since it inherits, the increment strategy of main is used => Patch
-        [TestCase(IncrementStrategy.Patch, null)]
-        [TestCase(IncrementStrategy.Major, null)]
-        [TestCase(IncrementStrategy.Minor, null)]
-        [TestCase(IncrementStrategy.None, null)]
-        public void CanInheritIncrement(IncrementStrategy increment, IncrementStrategy? alternateExpected)
-        {
-            // Dummy branch name to make sure that no default config exists.
-            const string dummyBranchName = "dummy";
+    [TestCase(IncrementStrategy.Inherit, IncrementStrategy.Patch)] // Since it inherits, the increment strategy of main is used => Patch
+    [TestCase(IncrementStrategy.Patch, null)]
+    [TestCase(IncrementStrategy.Major, null)]
+    [TestCase(IncrementStrategy.Minor, null)]
+    [TestCase(IncrementStrategy.None, null)]
+    public void CanInheritIncrement(IncrementStrategy increment, IncrementStrategy? alternateExpected)
+    {
+        // Dummy branch name to make sure that no default config exists.
+        const string dummyBranchName = "dummy";
 
-            var config = new ConfigurationBuilder()
-                .Add(new Config { Increment = increment })
-                .Build();
+        var config = new ConfigurationBuilder()
+            .Add(new Config { Increment = increment })
+            .Build();
 
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit();
-            fixture.BranchTo(dummyBranchName);
-            fixture.MakeACommit();
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.BranchTo(dummyBranchName);
+        fixture.MakeACommit();
 
-            var context = GetGitVersionContext(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), dummyBranchName, config);
+        var context = GetGitVersionContext(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), dummyBranchName, config);
 
-            context.Configuration.Increment.ShouldBe(alternateExpected ?? increment);
-        }
+        context.Configuration.Increment.ShouldBe(alternateExpected ?? increment);
+    }
 
-        [Test]
-        public void UsesBranchSpecificConfigOverTopLevelDefaults()
-        {
-            using var fixture = new EmptyRepositoryFixture();
+    [Test]
+    public void UsesBranchSpecificConfigOverTopLevelDefaults()
+    {
+        using var fixture = new EmptyRepositoryFixture();
 
-            const string branchName = "develop";
-            var config = new ConfigurationBuilder()
-                .Add(new Config
+        const string branchName = "develop";
+        var config = new ConfigurationBuilder()
+            .Add(new Config
+            {
+                VersioningMode = VersioningMode.ContinuousDelivery,
+                Branches =
                 {
-                    VersioningMode = VersioningMode.ContinuousDelivery,
-                    Branches =
                     {
+                        branchName, new BranchConfig
                         {
-                            branchName, new BranchConfig
-                            {
-                                VersioningMode = VersioningMode.ContinuousDeployment,
-                                Tag = "alpha"
-                            }
+                            VersioningMode = VersioningMode.ContinuousDeployment,
+                            Tag = "alpha"
                         }
                     }
-                })
-                .Build();
+                }
+            })
+            .Build();
 
-            var main = GitToolsTestingExtensions.CreateMockBranch(MainBranch, GitToolsTestingExtensions.CreateMockCommit());
-            var develop = GitToolsTestingExtensions.CreateMockBranch(branchName, GitToolsTestingExtensions.CreateMockCommit());
+        var main = GitToolsTestingExtensions.CreateMockBranch(MainBranch, GitToolsTestingExtensions.CreateMockCommit());
+        var develop = GitToolsTestingExtensions.CreateMockBranch(branchName, GitToolsTestingExtensions.CreateMockCommit());
 
-            var branches = Substitute.For<IBranchCollection>();
-            branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { main, develop }).GetEnumerator());
+        var branches = Substitute.For<IBranchCollection>();
+        branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { main, develop }).GetEnumerator());
 
-            var mockRepository = Substitute.For<IGitRepository>();
-            mockRepository.Head.Returns(develop);
-            mockRepository.Branches.Returns(branches);
-            mockRepository.Commits.Returns(develop.Commits);
+        var mockRepository = Substitute.For<IGitRepository>();
+        mockRepository.Head.Returns(develop);
+        mockRepository.Branches.Returns(branches);
+        mockRepository.Commits.Returns(develop.Commits);
 
-            var context = GetGitVersionContext(fixture.RepositoryPath, mockRepository, branchName, config);
+        var context = GetGitVersionContext(fixture.RepositoryPath, mockRepository, branchName, config);
 
-            context.Configuration.Tag.ShouldBe("alpha");
-        }
+        context.Configuration.Tag.ShouldBe("alpha");
+    }
 
-        [Test]
-        public void UsesFirstBranchConfigWhenMultipleMatch()
-        {
-            using var fixture = new EmptyRepositoryFixture();
+    [Test]
+    public void UsesFirstBranchConfigWhenMultipleMatch()
+    {
+        using var fixture = new EmptyRepositoryFixture();
 
-            var branchConfig = new BranchConfig
+        var branchConfig = new BranchConfig
+        {
+            VersioningMode = VersioningMode.Mainline,
+            Increment = IncrementStrategy.None,
+            PreventIncrementOfMergedBranchVersion = false,
+            TrackMergeTarget = false,
+            TracksReleaseBranches = false,
+            IsReleaseBranch = false,
+            SourceBranches = new HashSet<string>()
+        };
+        var config = new ConfigurationBuilder()
+            .Add(new Config
             {
-                VersioningMode = VersioningMode.Mainline,
-                Increment = IncrementStrategy.None,
-                PreventIncrementOfMergedBranchVersion = false,
-                TrackMergeTarget = false,
-                TracksReleaseBranches = false,
-                IsReleaseBranch = false,
-                SourceBranches = new HashSet<string>()
-            };
-            var config = new ConfigurationBuilder()
-                .Add(new Config
+                VersioningMode = VersioningMode.ContinuousDelivery,
+                Branches =
                 {
-                    VersioningMode = VersioningMode.ContinuousDelivery,
-                    Branches =
-                    {
-                        { "release/latest", new BranchConfig(branchConfig) { Increment = IncrementStrategy.None, Regex = "release/latest" } },
-                        { "release", new BranchConfig(branchConfig) { Increment = IncrementStrategy.Patch, Regex = "releases?[/-]" } }
-                    }
-                })
-                .Build();
+                    { "release/latest", new BranchConfig(branchConfig) { Increment = IncrementStrategy.None, Regex = "release/latest" } },
+                    { "release", new BranchConfig(branchConfig) { Increment = IncrementStrategy.Patch, Regex = "releases?[/-]" } }
+                }
+            })
+            .Build();
 
-            var releaseLatestBranch = GitToolsTestingExtensions.CreateMockBranch("release/latest", GitToolsTestingExtensions.CreateMockCommit());
-            var releaseVersionBranch = GitToolsTestingExtensions.CreateMockBranch("release/1.0.0", GitToolsTestingExtensions.CreateMockCommit());
+        var releaseLatestBranch = GitToolsTestingExtensions.CreateMockBranch("release/latest", GitToolsTestingExtensions.CreateMockCommit());
+        var releaseVersionBranch = GitToolsTestingExtensions.CreateMockBranch("release/1.0.0", GitToolsTestingExtensions.CreateMockCommit());
 
-            var branches = Substitute.For<IBranchCollection>();
-            branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { releaseLatestBranch, releaseVersionBranch }).GetEnumerator());
+        var branches = Substitute.For<IBranchCollection>();
+        branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { releaseLatestBranch, releaseVersionBranch }).GetEnumerator());
 
-            var mockRepository = Substitute.For<IGitRepository>();
-            mockRepository.Branches.Returns(branches);
-            mockRepository.Head.Returns(releaseLatestBranch);
-            mockRepository.Commits.Returns(releaseLatestBranch.Commits);
+        var mockRepository = Substitute.For<IGitRepository>();
+        mockRepository.Branches.Returns(branches);
+        mockRepository.Head.Returns(releaseLatestBranch);
+        mockRepository.Commits.Returns(releaseLatestBranch.Commits);
 
-            var latestContext = GetGitVersionContext(fixture.RepositoryPath, mockRepository, releaseLatestBranch.Name.Canonical, config);
-            latestContext.Configuration.Increment.ShouldBe(IncrementStrategy.None);
+        var latestContext = GetGitVersionContext(fixture.RepositoryPath, mockRepository, releaseLatestBranch.Name.Canonical, config);
+        latestContext.Configuration.Increment.ShouldBe(IncrementStrategy.None);
 
-            mockRepository.Head.Returns(releaseVersionBranch);
-            var versionContext = GetGitVersionContext(fixture.RepositoryPath, mockRepository, releaseVersionBranch.Name.Canonical, config);
-            versionContext.Configuration.Increment.ShouldBe(IncrementStrategy.Patch);
-        }
+        mockRepository.Head.Returns(releaseVersionBranch);
+        var versionContext = GetGitVersionContext(fixture.RepositoryPath, mockRepository, releaseVersionBranch.Name.Canonical, config);
+        versionContext.Configuration.Increment.ShouldBe(IncrementStrategy.Patch);
+    }
 
-        [Test]
-        public void CanFindParentBranchForInheritingIncrementStrategy()
-        {
-            var config = new ConfigurationBuilder()
-                .Add(new Config
+    [Test]
+    public void CanFindParentBranchForInheritingIncrementStrategy()
+    {
+        var config = new ConfigurationBuilder()
+            .Add(new Config
+            {
+                Branches =
                 {
-                    Branches =
-                    {
-                        { "develop", new BranchConfig { Increment = IncrementStrategy.Major } },
-                        { "feature", new BranchConfig { Increment = IncrementStrategy.Inherit } }
-                    }
-                })
-                .Build();
-
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            fixture.Repository.MakeACommit();
-            var featureBranch = fixture.Repository.CreateBranch("feature/foo");
-            Commands.Checkout(fixture.Repository, featureBranch);
-            fixture.Repository.MakeACommit();
-
-            var context = GetGitVersionContext(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), "develop", config);
-
-            context.Configuration.Increment.ShouldBe(IncrementStrategy.Major);
-        }
+                    { "develop", new BranchConfig { Increment = IncrementStrategy.Major } },
+                    { "feature", new BranchConfig { Increment = IncrementStrategy.Inherit } }
+                }
+            })
+            .Build();
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        fixture.Repository.MakeACommit();
+        var featureBranch = fixture.Repository.CreateBranch("feature/foo");
+        Commands.Checkout(fixture.Repository, featureBranch);
+        fixture.Repository.MakeACommit();
+
+        var context = GetGitVersionContext(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), "develop", config);
+
+        context.Configuration.Increment.ShouldBe(IncrementStrategy.Major);
+    }
 
-        private static GitVersionContext GetGitVersionContext(string workingDirectory, IGitRepository repository, string branch, Config config = null)
+    private static GitVersionContext GetGitVersionContext(string workingDirectory, IGitRepository repository, string branch, Config config = null)
+    {
+        var options = Options.Create(new GitVersionOptions
         {
-            var options = Options.Create(new GitVersionOptions
-            {
-                WorkingDirectory = workingDirectory,
-                RepositoryInfo = { TargetBranch = branch },
-                ConfigInfo = { OverrideConfig = config }
-            });
+            WorkingDirectory = workingDirectory,
+            RepositoryInfo = { TargetBranch = branch },
+            ConfigInfo = { OverrideConfig = config }
+        });
 
-            var sp = ConfigureServices(services =>
-            {
-                services.AddSingleton(options);
-                services.AddSingleton(repository);
-            });
+        var sp = ConfigureServices(services =>
+        {
+            services.AddSingleton(options);
+            services.AddSingleton(repository);
+        });
 
-            return sp.GetService<Lazy<GitVersionContext>>()?.Value;
-        }
+        return sp.GetService<Lazy<GitVersionContext>>()?.Value;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/Model/MergeMessageTests.cs b/src/GitVersion.Core.Tests/Model/MergeMessageTests.cs
index d4a7ca87b4..6038e2a939 100644
--- a/src/GitVersion.Core.Tests/Model/MergeMessageTests.cs
+++ b/src/GitVersion.Core.Tests/Model/MergeMessageTests.cs
@@ -5,362 +5,361 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class MergeMessageTests : TestBase
 {
-    [TestFixture]
-    public class MergeMessageTests : TestBase
+    private readonly Config config = new() { TagPrefix = "[vV]" };
+
+    [Test]
+    public void NullMessageStringThrows() =>
+        // Act / Assert
+        Should.Throw<NullReferenceException>(() => new MergeMessage(null, this.config));
+
+    [TestCase("")]
+    [TestCase("\t\t  ")]
+    public void EmptyMessageString(string message)
     {
-        private readonly Config config = new() { TagPrefix = "[vV]" };
+        // Act
+        var sut = new MergeMessage(message, this.config);
+
+        // Assert
+        sut.TargetBranch.ShouldBeNull();
+        sut.MergedBranch.ShouldBeEmpty();
+        sut.IsMergedPullRequest.ShouldBeFalse();
+        sut.PullRequestNumber.ShouldBe(null);
+        sut.Version.ShouldBeNull();
+    }
 
-        [Test]
-        public void NullMessageStringThrows() =>
-            // Act / Assert
-            Should.Throw<NullReferenceException>(() => new MergeMessage(null, this.config));
+    [TestCase("")]
+    [TestCase("\t\t  ")]
+    [TestCase(null)]
+    public void EmptyTagPrefix(string prefix)
+    {
+        // Arrange
+        var message = "Updated some code.";
+        var config = new Config { TagPrefix = prefix };
+
+        // Act
+        var sut = new MergeMessage(message, config);
+
+        // Assert
+        sut.TargetBranch.ShouldBeNull();
+        sut.MergedBranch.ShouldBeEmpty();
+        sut.IsMergedPullRequest.ShouldBeFalse();
+        sut.PullRequestNumber.ShouldBe(null);
+        sut.Version.ShouldBeNull();
+    }
 
-        [TestCase("")]
-        [TestCase("\t\t  ")]
-        public void EmptyMessageString(string message)
-        {
-            // Act
-            var sut = new MergeMessage(message, this.config);
-
-            // Assert
-            sut.TargetBranch.ShouldBeNull();
-            sut.MergedBranch.ShouldBeEmpty();
-            sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBe(null);
-            sut.Version.ShouldBeNull();
-        }
-
-        [TestCase("")]
-        [TestCase("\t\t  ")]
-        [TestCase(null)]
-        public void EmptyTagPrefix(string prefix)
-        {
-            // Arrange
-            var message = "Updated some code.";
-            var config = new Config { TagPrefix = prefix };
-
-            // Act
-            var sut = new MergeMessage(message, config);
-
-            // Assert
-            sut.TargetBranch.ShouldBeNull();
-            sut.MergedBranch.ShouldBeEmpty();
-            sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBe(null);
-            sut.Version.ShouldBeNull();
-        }
-
-        private static readonly object[] MergeMessages =
-        {
-            new object[] { "Merge branch 'feature/one'", "feature/one", null, null },
-            new object[] { "Merge branch 'origin/feature/one'", "origin/feature/one", null, null },
-            new object[] { $"Merge tag 'v4.0.0' into {MainBranch}", "v4.0.0", MainBranch, new SemanticVersion(4) },
-            new object[] { $"Merge tag 'V4.0.0' into {MainBranch}", "V4.0.0", MainBranch, new SemanticVersion(4) },
-            new object[] { "Merge branch 'feature/4.1/one'", "feature/4.1/one", null, new SemanticVersion(4, 1) },
-            new object[] { "Merge branch 'origin/4.1/feature/one'", "origin/4.1/feature/one", null, new SemanticVersion(4, 1) },
-            new object[] { $"Merge tag 'v://10.10.10.10' into {MainBranch}", "v://10.10.10.10", MainBranch, null }
-         };
-
-        [TestCaseSource(nameof(MergeMessages))]
-        public void ParsesMergeMessage(
-            string message,
-            string expectedMergedBranch,
-            string expectedTargetBranch,
-            SemanticVersion expectedVersion)
-        {
-            // Act
-            var sut = new MergeMessage(message, this.config);
-
-            // Assert
-            sut.FormatName.ShouldBe("Default");
-            sut.TargetBranch.ShouldBe(expectedTargetBranch);
-            sut.MergedBranch.ShouldBe(expectedMergedBranch);
-            sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBe(null);
-            sut.Version.ShouldBe(expectedVersion);
-        }
-
-        private static readonly object[] GitHubPullPullMergeMessages =
-        {
-            new object[] { "Merge pull request #1234 from feature/one", "feature/one", null, null, 1234 },
-            new object[] { "Merge pull request #1234 in feature/one", "feature/one", null, null, 1234  },
-            new object[] { "Merge pull request #1234 in v4.0.0", "v4.0.0", null, new SemanticVersion(4), 1234  },
-            new object[] { "Merge pull request #1234 from origin/feature/one", "origin/feature/one", null, null, 1234  },
-            new object[] { "Merge pull request #1234 in feature/4.1/one", "feature/4.1/one", null, new SemanticVersion(4,1), 1234  },
-            new object[] { "Merge pull request #1234 in V://10.10.10.10", "V://10.10.10.10", null, null, 1234 },
-            new object[] { "Merge pull request #1234 from feature/one into dev", "feature/one", "dev", null, 1234  }
-         };
-
-        [TestCaseSource(nameof(GitHubPullPullMergeMessages))]
-        public void ParsesGitHubPullMergeMessage(
-            string message,
-            string expectedMergedBranch,
-            string expectedTargetBranch,
-            SemanticVersion expectedVersion,
-            int? expectedPullRequestNumber)
-        {
-            // Act
-            var sut = new MergeMessage(message, this.config);
-
-            // Assert
-            sut.FormatName.ShouldBe("GitHubPull");
-            sut.TargetBranch.ShouldBe(expectedTargetBranch);
-            sut.MergedBranch.ShouldBe(expectedMergedBranch);
-            sut.IsMergedPullRequest.ShouldBeTrue();
-            sut.PullRequestNumber.ShouldBe(expectedPullRequestNumber);
-            sut.Version.ShouldBe(expectedVersion);
-        }
-
-        private static readonly object[] BitBucketPullMergeMessages =
-        {
-            new object[] { "Merge pull request #1234 from feature/one from feature/two to dev", "feature/two", "dev", null, 1234  },
-            new object[] { "Merge pull request #1234 in feature/one from feature/two to dev", "feature/two", "dev", null, 1234 },
-            new object[] { "Merge pull request #1234 in v4.0.0 from v4.1.0 to dev", "v4.1.0", "dev", new SemanticVersion(4,1), 1234  },
-            new object[] { "Merge pull request #1234 from origin/feature/one from origin/feature/4.2/two to dev", "origin/feature/4.2/two", "dev", new SemanticVersion(4,2), 1234  },
-            new object[] { "Merge pull request #1234 in feature/4.1/one from feature/4.2/two to dev", "feature/4.2/two", "dev", new SemanticVersion(4,2), 1234  },
-            new object[] { $"Merge pull request #1234 from feature/one from feature/two to {MainBranch}" , "feature/two", MainBranch, null, 1234 },
-            new object[] { "Merge pull request #1234 in V4.1.0 from V://10.10.10.10 to dev", "V://10.10.10.10", "dev", null, 1234 },
-            //TODO: Investigate successful bitbucket merge messages that may be invalid
-            // Regex has double 'from/in from' section.  Is that correct?
-            new object[] { $"Merge pull request #1234 from feature/one from v4.0.0 to {MainBranch}", "v4.0.0", MainBranch, new SemanticVersion(4), 1234  }
-         };
-
-        [TestCaseSource(nameof(BitBucketPullMergeMessages))]
-        public void ParsesBitBucketPullMergeMessage(
-            string message,
-            string expectedMergedBranch,
-            string expectedTargetBranch,
-            SemanticVersion expectedVersion,
-            int? expectedPullRequestNumber)
-        {
-            // Act
-            var sut = new MergeMessage(message, this.config);
-
-            // Assert
-            sut.FormatName.ShouldBe("BitBucketPull");
-            sut.TargetBranch.ShouldBe(expectedTargetBranch);
-            sut.MergedBranch.ShouldBe(expectedMergedBranch);
-            sut.IsMergedPullRequest.ShouldBeTrue();
-            sut.PullRequestNumber.ShouldBe(expectedPullRequestNumber);
-            sut.Version.ShouldBe(expectedVersion);
-        }
-
-        private static readonly object[] BitBucketPullMergeMessagesv7 =
-        {
-            new object[] { $@"Pull request #68: Release/2.2
+    private static readonly object[] MergeMessages =
+    {
+        new object[] { "Merge branch 'feature/one'", "feature/one", null, null },
+        new object[] { "Merge branch 'origin/feature/one'", "origin/feature/one", null, null },
+        new object[] { $"Merge tag 'v4.0.0' into {MainBranch}", "v4.0.0", MainBranch, new SemanticVersion(4) },
+        new object[] { $"Merge tag 'V4.0.0' into {MainBranch}", "V4.0.0", MainBranch, new SemanticVersion(4) },
+        new object[] { "Merge branch 'feature/4.1/one'", "feature/4.1/one", null, new SemanticVersion(4, 1) },
+        new object[] { "Merge branch 'origin/4.1/feature/one'", "origin/4.1/feature/one", null, new SemanticVersion(4, 1) },
+        new object[] { $"Merge tag 'v://10.10.10.10' into {MainBranch}", "v://10.10.10.10", MainBranch, null }
+    };
+
+    [TestCaseSource(nameof(MergeMessages))]
+    public void ParsesMergeMessage(
+        string message,
+        string expectedMergedBranch,
+        string expectedTargetBranch,
+        SemanticVersion expectedVersion)
+    {
+        // Act
+        var sut = new MergeMessage(message, this.config);
+
+        // Assert
+        sut.FormatName.ShouldBe("Default");
+        sut.TargetBranch.ShouldBe(expectedTargetBranch);
+        sut.MergedBranch.ShouldBe(expectedMergedBranch);
+        sut.IsMergedPullRequest.ShouldBeFalse();
+        sut.PullRequestNumber.ShouldBe(null);
+        sut.Version.ShouldBe(expectedVersion);
+    }
+
+    private static readonly object[] GitHubPullPullMergeMessages =
+    {
+        new object[] { "Merge pull request #1234 from feature/one", "feature/one", null, null, 1234 },
+        new object[] { "Merge pull request #1234 in feature/one", "feature/one", null, null, 1234  },
+        new object[] { "Merge pull request #1234 in v4.0.0", "v4.0.0", null, new SemanticVersion(4), 1234  },
+        new object[] { "Merge pull request #1234 from origin/feature/one", "origin/feature/one", null, null, 1234  },
+        new object[] { "Merge pull request #1234 in feature/4.1/one", "feature/4.1/one", null, new SemanticVersion(4,1), 1234  },
+        new object[] { "Merge pull request #1234 in V://10.10.10.10", "V://10.10.10.10", null, null, 1234 },
+        new object[] { "Merge pull request #1234 from feature/one into dev", "feature/one", "dev", null, 1234  }
+    };
+
+    [TestCaseSource(nameof(GitHubPullPullMergeMessages))]
+    public void ParsesGitHubPullMergeMessage(
+        string message,
+        string expectedMergedBranch,
+        string expectedTargetBranch,
+        SemanticVersion expectedVersion,
+        int? expectedPullRequestNumber)
+    {
+        // Act
+        var sut = new MergeMessage(message, this.config);
+
+        // Assert
+        sut.FormatName.ShouldBe("GitHubPull");
+        sut.TargetBranch.ShouldBe(expectedTargetBranch);
+        sut.MergedBranch.ShouldBe(expectedMergedBranch);
+        sut.IsMergedPullRequest.ShouldBeTrue();
+        sut.PullRequestNumber.ShouldBe(expectedPullRequestNumber);
+        sut.Version.ShouldBe(expectedVersion);
+    }
+
+    private static readonly object[] BitBucketPullMergeMessages =
+    {
+        new object[] { "Merge pull request #1234 from feature/one from feature/two to dev", "feature/two", "dev", null, 1234  },
+        new object[] { "Merge pull request #1234 in feature/one from feature/two to dev", "feature/two", "dev", null, 1234 },
+        new object[] { "Merge pull request #1234 in v4.0.0 from v4.1.0 to dev", "v4.1.0", "dev", new SemanticVersion(4,1), 1234  },
+        new object[] { "Merge pull request #1234 from origin/feature/one from origin/feature/4.2/two to dev", "origin/feature/4.2/two", "dev", new SemanticVersion(4,2), 1234  },
+        new object[] { "Merge pull request #1234 in feature/4.1/one from feature/4.2/two to dev", "feature/4.2/two", "dev", new SemanticVersion(4,2), 1234  },
+        new object[] { $"Merge pull request #1234 from feature/one from feature/two to {MainBranch}" , "feature/two", MainBranch, null, 1234 },
+        new object[] { "Merge pull request #1234 in V4.1.0 from V://10.10.10.10 to dev", "V://10.10.10.10", "dev", null, 1234 },
+        //TODO: Investigate successful bitbucket merge messages that may be invalid
+        // Regex has double 'from/in from' section.  Is that correct?
+        new object[] { $"Merge pull request #1234 from feature/one from v4.0.0 to {MainBranch}", "v4.0.0", MainBranch, new SemanticVersion(4), 1234  }
+    };
+
+    [TestCaseSource(nameof(BitBucketPullMergeMessages))]
+    public void ParsesBitBucketPullMergeMessage(
+        string message,
+        string expectedMergedBranch,
+        string expectedTargetBranch,
+        SemanticVersion expectedVersion,
+        int? expectedPullRequestNumber)
+    {
+        // Act
+        var sut = new MergeMessage(message, this.config);
+
+        // Assert
+        sut.FormatName.ShouldBe("BitBucketPull");
+        sut.TargetBranch.ShouldBe(expectedTargetBranch);
+        sut.MergedBranch.ShouldBe(expectedMergedBranch);
+        sut.IsMergedPullRequest.ShouldBeTrue();
+        sut.PullRequestNumber.ShouldBe(expectedPullRequestNumber);
+        sut.Version.ShouldBe(expectedVersion);
+    }
+
+    private static readonly object[] BitBucketPullMergeMessagesv7 =
+    {
+        new object[] { $@"Pull request #68: Release/2.2
 
 Merge in aaa/777 from release/2.2 to {MainBranch}
 
 * commit '750aa37753dec1a85b22cc16db851187649d9e97':", "release/2.2", MainBranch, new SemanticVersion(2,2), 68  }
-        };
+    };
+
+    [TestCaseSource(nameof(BitBucketPullMergeMessagesv7))]
+    public void ParsesBitBucketPullMergeMessagev7(
+        string message,
+        string expectedMergedBranch,
+        string expectedTargetBranch,
+        SemanticVersion expectedVersion,
+        int? expectedPullRequestNumber)
+    {
+        // Act
+        var sut = new MergeMessage(message, this.config);
+
+        // Assert
+        sut.FormatName.ShouldBe("BitBucketPullv7");
+        sut.TargetBranch.ShouldBe(expectedTargetBranch);
+        sut.MergedBranch.ShouldBe(expectedMergedBranch);
+        sut.IsMergedPullRequest.ShouldBeTrue();
+        sut.PullRequestNumber.ShouldBe(expectedPullRequestNumber);
+        sut.Version.ShouldBe(expectedVersion);
+    }
 
-        [TestCaseSource(nameof(BitBucketPullMergeMessagesv7))]
-        public void ParsesBitBucketPullMergeMessagev7(
-            string message,
-            string expectedMergedBranch,
-            string expectedTargetBranch,
-            SemanticVersion expectedVersion,
-            int? expectedPullRequestNumber)
-        {
-            // Act
-            var sut = new MergeMessage(message, this.config);
-
-            // Assert
-            sut.FormatName.ShouldBe("BitBucketPullv7");
-            sut.TargetBranch.ShouldBe(expectedTargetBranch);
-            sut.MergedBranch.ShouldBe(expectedMergedBranch);
-            sut.IsMergedPullRequest.ShouldBeTrue();
-            sut.PullRequestNumber.ShouldBe(expectedPullRequestNumber);
-            sut.Version.ShouldBe(expectedVersion);
-        }
-
-        private static readonly object[] SmartGitMergeMessages =
-        {
-            new object[] { "Finish feature/one", "feature/one", null, null },
-            new object[] { "Finish origin/feature/one", "origin/feature/one", null, null },
-            new object[] { "Finish v4.0.0", "v4.0.0", null, new SemanticVersion(4) },
-            new object[] { "Finish feature/4.1/one", "feature/4.1/one", null, new SemanticVersion(4, 1) },
-            new object[] { "Finish origin/4.1/feature/one", "origin/4.1/feature/one", null, new SemanticVersion(4, 1) },
-            new object[] { "Finish V://10.10.10.10", "V://10.10.10.10", null, null },
-            new object[] { $"Finish V4.0.0 into {MainBranch}", "V4.0.0", MainBranch, new SemanticVersion(4) }
-         };
-
-        [TestCaseSource(nameof(SmartGitMergeMessages))]
-        public void ParsesSmartGitMergeMessage(
-            string message,
-            string expectedMergedBranch,
-            string expectedTargetBranch,
-            SemanticVersion expectedVersion)
-        {
-            // Act
-            var sut = new MergeMessage(message, this.config);
-
-            // Assert
-            sut.FormatName.ShouldBe("SmartGit");
-            sut.TargetBranch.ShouldBe(expectedTargetBranch);
-            sut.MergedBranch.ShouldBe(expectedMergedBranch);
-            sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBe(null);
-            sut.Version.ShouldBe(expectedVersion);
-        }
-
-        private static readonly object[] RemoteTrackingMergeMessages =
-        {
-            new object[] { $"Merge remote-tracking branch 'feature/one' into {MainBranch}", "feature/one", MainBranch, null },
-            new object[] { "Merge remote-tracking branch 'origin/feature/one' into dev", "origin/feature/one", "dev", null },
-            new object[] { $"Merge remote-tracking branch 'v4.0.0' into {MainBranch}", "v4.0.0", MainBranch, new SemanticVersion(4) },
-            new object[] { $"Merge remote-tracking branch 'V4.0.0' into {MainBranch}", "V4.0.0", MainBranch, new SemanticVersion(4) },
-            new object[] { "Merge remote-tracking branch 'feature/4.1/one' into dev", "feature/4.1/one", "dev", new SemanticVersion(4, 1) },
-            new object[] { $"Merge remote-tracking branch 'origin/4.1/feature/one' into {MainBranch}", "origin/4.1/feature/one", MainBranch, new SemanticVersion(4, 1) },
-            new object[] { $"Merge remote-tracking branch 'v://10.10.10.10' into {MainBranch}", "v://10.10.10.10", MainBranch, null }
-         };
-
-        [TestCaseSource(nameof(RemoteTrackingMergeMessages))]
-        public void ParsesRemoteTrackingMergeMessage(
-            string message,
-            string expectedMergedBranch,
-            string expectedTargetBranch,
-            SemanticVersion expectedVersion)
-        {
-            // Act
-            var sut = new MergeMessage(message, this.config);
-
-            // Assert
-            sut.FormatName.ShouldBe("RemoteTracking");
-            sut.TargetBranch.ShouldBe(expectedTargetBranch);
-            sut.MergedBranch.ShouldBe(expectedMergedBranch);
-            sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBe(null);
-            sut.Version.ShouldBe(expectedVersion);
-        }
-
-        private static readonly object[] InvalidMergeMessages =
+    private static readonly object[] SmartGitMergeMessages =
+    {
+        new object[] { "Finish feature/one", "feature/one", null, null },
+        new object[] { "Finish origin/feature/one", "origin/feature/one", null, null },
+        new object[] { "Finish v4.0.0", "v4.0.0", null, new SemanticVersion(4) },
+        new object[] { "Finish feature/4.1/one", "feature/4.1/one", null, new SemanticVersion(4, 1) },
+        new object[] { "Finish origin/4.1/feature/one", "origin/4.1/feature/one", null, new SemanticVersion(4, 1) },
+        new object[] { "Finish V://10.10.10.10", "V://10.10.10.10", null, null },
+        new object[] { $"Finish V4.0.0 into {MainBranch}", "V4.0.0", MainBranch, new SemanticVersion(4) }
+    };
+
+    [TestCaseSource(nameof(SmartGitMergeMessages))]
+    public void ParsesSmartGitMergeMessage(
+        string message,
+        string expectedMergedBranch,
+        string expectedTargetBranch,
+        SemanticVersion expectedVersion)
+    {
+        // Act
+        var sut = new MergeMessage(message, this.config);
+
+        // Assert
+        sut.FormatName.ShouldBe("SmartGit");
+        sut.TargetBranch.ShouldBe(expectedTargetBranch);
+        sut.MergedBranch.ShouldBe(expectedMergedBranch);
+        sut.IsMergedPullRequest.ShouldBeFalse();
+        sut.PullRequestNumber.ShouldBe(null);
+        sut.Version.ShouldBe(expectedVersion);
+    }
+
+    private static readonly object[] RemoteTrackingMergeMessages =
+    {
+        new object[] { $"Merge remote-tracking branch 'feature/one' into {MainBranch}", "feature/one", MainBranch, null },
+        new object[] { "Merge remote-tracking branch 'origin/feature/one' into dev", "origin/feature/one", "dev", null },
+        new object[] { $"Merge remote-tracking branch 'v4.0.0' into {MainBranch}", "v4.0.0", MainBranch, new SemanticVersion(4) },
+        new object[] { $"Merge remote-tracking branch 'V4.0.0' into {MainBranch}", "V4.0.0", MainBranch, new SemanticVersion(4) },
+        new object[] { "Merge remote-tracking branch 'feature/4.1/one' into dev", "feature/4.1/one", "dev", new SemanticVersion(4, 1) },
+        new object[] { $"Merge remote-tracking branch 'origin/4.1/feature/one' into {MainBranch}", "origin/4.1/feature/one", MainBranch, new SemanticVersion(4, 1) },
+        new object[] { $"Merge remote-tracking branch 'v://10.10.10.10' into {MainBranch}", "v://10.10.10.10", MainBranch, null }
+    };
+
+    [TestCaseSource(nameof(RemoteTrackingMergeMessages))]
+    public void ParsesRemoteTrackingMergeMessage(
+        string message,
+        string expectedMergedBranch,
+        string expectedTargetBranch,
+        SemanticVersion expectedVersion)
+    {
+        // Act
+        var sut = new MergeMessage(message, this.config);
+
+        // Assert
+        sut.FormatName.ShouldBe("RemoteTracking");
+        sut.TargetBranch.ShouldBe(expectedTargetBranch);
+        sut.MergedBranch.ShouldBe(expectedMergedBranch);
+        sut.IsMergedPullRequest.ShouldBeFalse();
+        sut.PullRequestNumber.ShouldBe(null);
+        sut.Version.ShouldBe(expectedVersion);
+    }
+
+    private static readonly object[] InvalidMergeMessages =
+    {
+        new object[] { "Merge pull request # from feature/one", "", null, null, null },
+        new object[] { $"Merge pull request # in feature/one from feature/two to {MainBranch}" , "", null, null, null },
+        new object[] { $"Zusammengeführter PR : feature/one mit {MainBranch} mergen", "", null, null, null }
+    };
+
+    [TestCaseSource(nameof(InvalidMergeMessages))]
+    public void ParsesInvalidMergeMessage(
+        string message,
+        string expectedMergedBranch,
+        string expectedTargetBranch,
+        SemanticVersion expectedVersion,
+        int? expectedPullRequestNumber)
+    {
+        // Act
+        var sut = new MergeMessage(message, this.config);
+
+        // Assert
+        sut.FormatName.ShouldBeNull();
+        sut.TargetBranch.ShouldBe(expectedTargetBranch);
+        sut.MergedBranch.ShouldBe(expectedMergedBranch);
+        sut.IsMergedPullRequest.ShouldBeFalse();
+        sut.PullRequestNumber.ShouldBe(expectedPullRequestNumber);
+        sut.Version.ShouldBe(expectedVersion);
+    }
+
+    [Test]
+    public void MatchesSingleCustomMessage()
+    {
+        // Arrange
+        var message = "My custom message";
+        var definition = "Mycustom";
+        this.config.MergeMessageFormats = new Dictionary<string, string>
         {
-            new object[] { "Merge pull request # from feature/one", "", null, null, null },
-            new object[] { $"Merge pull request # in feature/one from feature/two to {MainBranch}" , "", null, null, null },
-            new object[] { $"Zusammengeführter PR : feature/one mit {MainBranch} mergen", "", null, null, null }
+            [definition] = message
         };
 
-        [TestCaseSource(nameof(InvalidMergeMessages))]
-        public void ParsesInvalidMergeMessage(
-            string message,
-            string expectedMergedBranch,
-            string expectedTargetBranch,
-            SemanticVersion expectedVersion,
-            int? expectedPullRequestNumber)
-        {
-            // Act
-            var sut = new MergeMessage(message, this.config);
-
-            // Assert
-            sut.FormatName.ShouldBeNull();
-            sut.TargetBranch.ShouldBe(expectedTargetBranch);
-            sut.MergedBranch.ShouldBe(expectedMergedBranch);
-            sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBe(expectedPullRequestNumber);
-            sut.Version.ShouldBe(expectedVersion);
-        }
-
-        [Test]
-        public void MatchesSingleCustomMessage()
-        {
-            // Arrange
-            var message = "My custom message";
-            var definition = "Mycustom";
-            this.config.MergeMessageFormats = new Dictionary<string, string>
-            {
-                [definition] = message
-            };
-
-            // Act
-            var sut = new MergeMessage(message, this.config);
-
-            // Assert
-            sut.FormatName.ShouldBe(definition);
-            sut.TargetBranch.ShouldBeNull();
-            sut.MergedBranch.ShouldBeEmpty();
-            sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBe(null);
-            sut.Version.ShouldBeNull();
-        }
-
-        [Test]
-        public void MatchesMultipleCustomMessages()
+        // Act
+        var sut = new MergeMessage(message, this.config);
+
+        // Assert
+        sut.FormatName.ShouldBe(definition);
+        sut.TargetBranch.ShouldBeNull();
+        sut.MergedBranch.ShouldBeEmpty();
+        sut.IsMergedPullRequest.ShouldBeFalse();
+        sut.PullRequestNumber.ShouldBe(null);
+        sut.Version.ShouldBeNull();
+    }
+
+    [Test]
+    public void MatchesMultipleCustomMessages()
+    {
+        // Arrange
+        var format = "My custom message";
+        var definition = "Mycustom";
+        this.config.MergeMessageFormats = new Dictionary<string, string>
         {
-            // Arrange
-            var format = "My custom message";
-            var definition = "Mycustom";
-            this.config.MergeMessageFormats = new Dictionary<string, string>
-            {
-                ["Default2"] = "some example",
-                ["Default3"] = "another example",
-                [definition] = format
-            };
-
-            // Act
-            var sut = new MergeMessage(format, this.config);
-
-            // Assert
-            sut.FormatName.ShouldBe(definition);
-            sut.TargetBranch.ShouldBeNull();
-            sut.MergedBranch.ShouldBeEmpty();
-            sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBe(null);
-            sut.Version.ShouldBeNull();
-        }
-
-        [Test]
-        public void MatchesCaptureGroupsFromCustomMessages()
+            ["Default2"] = "some example",
+            ["Default3"] = "another example",
+            [definition] = format
+        };
+
+        // Act
+        var sut = new MergeMessage(format, this.config);
+
+        // Assert
+        sut.FormatName.ShouldBe(definition);
+        sut.TargetBranch.ShouldBeNull();
+        sut.MergedBranch.ShouldBeEmpty();
+        sut.IsMergedPullRequest.ShouldBeFalse();
+        sut.PullRequestNumber.ShouldBe(null);
+        sut.Version.ShouldBeNull();
+    }
+
+    [Test]
+    public void MatchesCaptureGroupsFromCustomMessages()
+    {
+        // Arrange
+        var format = @"^Merged PR #(?<PullRequestNumber>\d+) into (?<TargetBranch>[^\s]*) from (?:(?<SourceBranch>[^\s]*))";
+        var definition = "Mycustom";
+        this.config.MergeMessageFormats = new Dictionary<string, string>
         {
-            // Arrange
-            var format = @"^Merged PR #(?<PullRequestNumber>\d+) into (?<TargetBranch>[^\s]*) from (?:(?<SourceBranch>[^\s]*))";
-            var definition = "Mycustom";
-            this.config.MergeMessageFormats = new Dictionary<string, string>
-            {
-                [definition] = format
-            };
-            var pr = 1234;
-            var target = MainBranch;
-            var source = "feature/2.0/example";
-
-
-            // Act
-            var sut = new MergeMessage($"Merged PR #{pr} into {target} from {source}", this.config);
-
-            // Assert
-            sut.FormatName.ShouldBe(definition);
-            sut.TargetBranch.ShouldBe(target);
-            sut.MergedBranch.ShouldBe(source);
-            sut.IsMergedPullRequest.ShouldBeTrue();
-            sut.PullRequestNumber.ShouldBe(pr);
-            sut.Version.ShouldBe(new SemanticVersion(2));
-        }
-
-        [Test]
-        public void ReturnsAfterFirstMatchingPattern()
+            [definition] = format
+        };
+        var pr = 1234;
+        var target = MainBranch;
+        var source = "feature/2.0/example";
+
+
+        // Act
+        var sut = new MergeMessage($"Merged PR #{pr} into {target} from {source}", this.config);
+
+        // Assert
+        sut.FormatName.ShouldBe(definition);
+        sut.TargetBranch.ShouldBe(target);
+        sut.MergedBranch.ShouldBe(source);
+        sut.IsMergedPullRequest.ShouldBeTrue();
+        sut.PullRequestNumber.ShouldBe(pr);
+        sut.Version.ShouldBe(new SemanticVersion(2));
+    }
+
+    [Test]
+    public void ReturnsAfterFirstMatchingPattern()
+    {
+        // Arrange
+        var format = @"^Merge (branch|tag) '(?<SourceBranch>[^']*)'(?: into (?<TargetBranch>[^\s]*))*";
+        var definition = "Mycustom";
+        this.config.MergeMessageFormats = new Dictionary<string, string>
         {
-            // Arrange
-            var format = @"^Merge (branch|tag) '(?<SourceBranch>[^']*)'(?: into (?<TargetBranch>[^\s]*))*";
-            var definition = "Mycustom";
-            this.config.MergeMessageFormats = new Dictionary<string, string>
-            {
-                [definition] = format,
-                ["Default2"] = format,
-                ["Default3"] = format
-            };
-
-            // Act
-            var sut = new MergeMessage("Merge branch 'this'", this.config);
-
-            // Assert
-            sut.FormatName.ShouldBe(definition);
-            sut.TargetBranch.ShouldBeNull();
-            sut.MergedBranch.ShouldBe("this");
-            sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBe(null);
-            sut.Version.ShouldBeNull();
-        }
+            [definition] = format,
+            ["Default2"] = format,
+            ["Default3"] = format
+        };
+
+        // Act
+        var sut = new MergeMessage("Merge branch 'this'", this.config);
+
+        // Assert
+        sut.FormatName.ShouldBe(definition);
+        sut.TargetBranch.ShouldBeNull();
+        sut.MergedBranch.ShouldBe("this");
+        sut.IsMergedPullRequest.ShouldBeFalse();
+        sut.PullRequestNumber.ShouldBe(null);
+        sut.Version.ShouldBeNull();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/BaseVersionCalculatorTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/BaseVersionCalculatorTests.cs
index cd46be0ca7..892355874e 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/BaseVersionCalculatorTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/BaseVersionCalculatorTests.cs
@@ -9,242 +9,241 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.VersionCalculation
+namespace GitVersion.Core.Tests.VersionCalculation;
+
+[TestFixture]
+public class BaseVersionCalculatorTests : TestBase
 {
-    [TestFixture]
-    public class BaseVersionCalculatorTests : TestBase
+    [Test]
+    public void ChoosesHighestVersionReturnedFromStrategies()
     {
-        [Test]
-        public void ChoosesHighestVersionReturnedFromStrategies()
-        {
-            var dateTimeOffset = DateTimeOffset.Now;
-            var versionCalculator = GetBaseVersionCalculator(contextBuilder =>
-                contextBuilder.OverrideServices(services =>
-                {
-                    services.RemoveAll<IVersionStrategy>();
-                    services.AddSingleton<IVersionStrategy>(new V1Strategy(DateTimeOffset.Now));
-                    services.AddSingleton<IVersionStrategy>(new V2Strategy(dateTimeOffset));
-                }));
+        var dateTimeOffset = DateTimeOffset.Now;
+        var versionCalculator = GetBaseVersionCalculator(contextBuilder =>
+            contextBuilder.OverrideServices(services =>
+            {
+                services.RemoveAll<IVersionStrategy>();
+                services.AddSingleton<IVersionStrategy>(new V1Strategy(DateTimeOffset.Now));
+                services.AddSingleton<IVersionStrategy>(new V2Strategy(dateTimeOffset));
+            }));
 
-            var baseVersion = versionCalculator.GetBaseVersion();
+        var baseVersion = versionCalculator.GetBaseVersion();
 
-            baseVersion.SemanticVersion.ToString().ShouldBe("2.0.0");
-            baseVersion.ShouldIncrement.ShouldBe(true);
-            baseVersion.BaseVersionSource.When.ShouldBe(dateTimeOffset);
-        }
+        baseVersion.SemanticVersion.ToString().ShouldBe("2.0.0");
+        baseVersion.ShouldIncrement.ShouldBe(true);
+        baseVersion.BaseVersionSource.When.ShouldBe(dateTimeOffset);
+    }
 
-        [Test]
-        public void UsesWhenFromNextBestMatchIfHighestDoesntHaveWhen()
-        {
-            var when = DateTimeOffset.Now;
+    [Test]
+    public void UsesWhenFromNextBestMatchIfHighestDoesntHaveWhen()
+    {
+        var when = DateTimeOffset.Now;
 
-            var versionCalculator = GetBaseVersionCalculator(contextBuilder =>
-                contextBuilder.OverrideServices(services =>
-                {
-                    services.RemoveAll<IVersionStrategy>();
-                    services.AddSingleton<IVersionStrategy>(new V1Strategy(when));
-                    services.AddSingleton<IVersionStrategy>(new V2Strategy(null));
-                }));
+        var versionCalculator = GetBaseVersionCalculator(contextBuilder =>
+            contextBuilder.OverrideServices(services =>
+            {
+                services.RemoveAll<IVersionStrategy>();
+                services.AddSingleton<IVersionStrategy>(new V1Strategy(when));
+                services.AddSingleton<IVersionStrategy>(new V2Strategy(null));
+            }));
 
-            var baseVersion = versionCalculator.GetBaseVersion();
+        var baseVersion = versionCalculator.GetBaseVersion();
 
-            baseVersion.SemanticVersion.ToString().ShouldBe("2.0.0");
-            baseVersion.ShouldIncrement.ShouldBe(true);
-            baseVersion.BaseVersionSource.When.ShouldBe(when);
-        }
+        baseVersion.SemanticVersion.ToString().ShouldBe("2.0.0");
+        baseVersion.ShouldIncrement.ShouldBe(true);
+        baseVersion.BaseVersionSource.When.ShouldBe(when);
+    }
 
-        [Test]
-        public void UsesWhenFromNextBestMatchIfHighestDoesntHaveWhenReversedOrder()
-        {
-            var when = DateTimeOffset.Now;
+    [Test]
+    public void UsesWhenFromNextBestMatchIfHighestDoesntHaveWhenReversedOrder()
+    {
+        var when = DateTimeOffset.Now;
 
-            var versionCalculator = GetBaseVersionCalculator(contextBuilder =>
-                contextBuilder.OverrideServices(services =>
-                {
-                    services.RemoveAll<IVersionStrategy>();
-                    services.AddSingleton<IVersionStrategy>(new V1Strategy(null));
-                    services.AddSingleton<IVersionStrategy>(new V2Strategy(when));
-                }));
+        var versionCalculator = GetBaseVersionCalculator(contextBuilder =>
+            contextBuilder.OverrideServices(services =>
+            {
+                services.RemoveAll<IVersionStrategy>();
+                services.AddSingleton<IVersionStrategy>(new V1Strategy(null));
+                services.AddSingleton<IVersionStrategy>(new V2Strategy(when));
+            }));
 
-            var baseVersion = versionCalculator.GetBaseVersion();
+        var baseVersion = versionCalculator.GetBaseVersion();
 
-            baseVersion.SemanticVersion.ToString().ShouldBe("2.0.0");
-            baseVersion.ShouldIncrement.ShouldBe(true);
-            baseVersion.BaseVersionSource.When.ShouldBe(when);
-        }
+        baseVersion.SemanticVersion.ToString().ShouldBe("2.0.0");
+        baseVersion.ShouldIncrement.ShouldBe(true);
+        baseVersion.BaseVersionSource.When.ShouldBe(when);
+    }
 
-        [Test]
-        public void ShouldNotFilterVersion()
-        {
-            var fakeIgnoreConfig = new TestIgnoreConfig(new ExcludeSourcesContainingExclude());
-            var version = new BaseVersion("dummy", false, new SemanticVersion(2), GitToolsTestingExtensions.CreateMockCommit(), null);
-
-            var versionCalculator = GetBaseVersionCalculator(contextBuilder => contextBuilder
-                    .WithConfig(new Config { Ignore = fakeIgnoreConfig })
-                    .OverrideServices(services =>
-                    {
-                        services.RemoveAll<IVersionStrategy>();
-                        services.AddSingleton<IVersionStrategy>(new TestVersionStrategy(version));
-                    }));
-
-            var baseVersion = versionCalculator.GetBaseVersion();
-
-            baseVersion.Source.ShouldBe(version.Source);
-            baseVersion.ShouldIncrement.ShouldBe(version.ShouldIncrement);
-            baseVersion.SemanticVersion.ShouldBe(version.SemanticVersion);
-        }
+    [Test]
+    public void ShouldNotFilterVersion()
+    {
+        var fakeIgnoreConfig = new TestIgnoreConfig(new ExcludeSourcesContainingExclude());
+        var version = new BaseVersion("dummy", false, new SemanticVersion(2), GitToolsTestingExtensions.CreateMockCommit(), null);
 
-        [Test]
-        public void ShouldFilterVersion()
-        {
-            var fakeIgnoreConfig = new TestIgnoreConfig(new ExcludeSourcesContainingExclude());
-
-            var higherVersion = new BaseVersion("exclude", false, new SemanticVersion(2), GitToolsTestingExtensions.CreateMockCommit(), null);
-            var lowerVersion = new BaseVersion("dummy", false, new SemanticVersion(1), GitToolsTestingExtensions.CreateMockCommit(), null);
-
-            var versionCalculator = GetBaseVersionCalculator(contextBuilder => contextBuilder
-                    .WithConfig(new Config { Ignore = fakeIgnoreConfig })
-                    .OverrideServices(services =>
-                    {
-                        services.RemoveAll<IVersionStrategy>();
-                        services.AddSingleton<IVersionStrategy>(new TestVersionStrategy(higherVersion, lowerVersion));
-                    }));
-            var baseVersion = versionCalculator.GetBaseVersion();
-
-            baseVersion.Source.ShouldNotBe(higherVersion.Source);
-            baseVersion.SemanticVersion.ShouldNotBe(higherVersion.SemanticVersion);
-            baseVersion.Source.ShouldBe(lowerVersion.Source);
-            baseVersion.SemanticVersion.ShouldBe(lowerVersion.SemanticVersion);
-        }
+        var versionCalculator = GetBaseVersionCalculator(contextBuilder => contextBuilder
+            .WithConfig(new Config { Ignore = fakeIgnoreConfig })
+            .OverrideServices(services =>
+            {
+                services.RemoveAll<IVersionStrategy>();
+                services.AddSingleton<IVersionStrategy>(new TestVersionStrategy(version));
+            }));
 
-        [Test]
-        public void ShouldIgnorePreReleaseVersionInMainlineMode()
-        {
-            var fakeIgnoreConfig = new TestIgnoreConfig(new ExcludeSourcesContainingExclude());
+        var baseVersion = versionCalculator.GetBaseVersion();
+
+        baseVersion.Source.ShouldBe(version.Source);
+        baseVersion.ShouldIncrement.ShouldBe(version.ShouldIncrement);
+        baseVersion.SemanticVersion.ShouldBe(version.SemanticVersion);
+    }
+
+    [Test]
+    public void ShouldFilterVersion()
+    {
+        var fakeIgnoreConfig = new TestIgnoreConfig(new ExcludeSourcesContainingExclude());
+
+        var higherVersion = new BaseVersion("exclude", false, new SemanticVersion(2), GitToolsTestingExtensions.CreateMockCommit(), null);
+        var lowerVersion = new BaseVersion("dummy", false, new SemanticVersion(1), GitToolsTestingExtensions.CreateMockCommit(), null);
 
-            var lowerVersion = new BaseVersion("dummy", false, new SemanticVersion(1), GitToolsTestingExtensions.CreateMockCommit(), null);
-            var preReleaseVersion = new BaseVersion(
-                "prerelease",
-                false,
-                new SemanticVersion(1, 0, 1)
+        var versionCalculator = GetBaseVersionCalculator(contextBuilder => contextBuilder
+            .WithConfig(new Config { Ignore = fakeIgnoreConfig })
+            .OverrideServices(services =>
+            {
+                services.RemoveAll<IVersionStrategy>();
+                services.AddSingleton<IVersionStrategy>(new TestVersionStrategy(higherVersion, lowerVersion));
+            }));
+        var baseVersion = versionCalculator.GetBaseVersion();
+
+        baseVersion.Source.ShouldNotBe(higherVersion.Source);
+        baseVersion.SemanticVersion.ShouldNotBe(higherVersion.SemanticVersion);
+        baseVersion.Source.ShouldBe(lowerVersion.Source);
+        baseVersion.SemanticVersion.ShouldBe(lowerVersion.SemanticVersion);
+    }
+
+    [Test]
+    public void ShouldIgnorePreReleaseVersionInMainlineMode()
+    {
+        var fakeIgnoreConfig = new TestIgnoreConfig(new ExcludeSourcesContainingExclude());
+
+        var lowerVersion = new BaseVersion("dummy", false, new SemanticVersion(1), GitToolsTestingExtensions.CreateMockCommit(), null);
+        var preReleaseVersion = new BaseVersion(
+            "prerelease",
+            false,
+            new SemanticVersion(1, 0, 1)
+            {
+                PreReleaseTag = new SemanticVersionPreReleaseTag
                 {
-                    PreReleaseTag = new SemanticVersionPreReleaseTag
-                    {
-                        Name = "alpha",
-                        Number = 1
-                    }
-                },
-                GitToolsTestingExtensions.CreateMockCommit(),
-                null
-            );
-
-            var versionCalculator = GetBaseVersionCalculator(contextBuilder => contextBuilder
-                    .WithConfig(new Config { VersioningMode = VersioningMode.Mainline, Ignore = fakeIgnoreConfig })
-                    .OverrideServices(services =>
-                    {
-                        services.RemoveAll<IVersionStrategy>();
-                        services.AddSingleton<IVersionStrategy>(new TestVersionStrategy(preReleaseVersion, lowerVersion));
-                    }));
-            var baseVersion = versionCalculator.GetBaseVersion();
-
-            baseVersion.Source.ShouldNotBe(preReleaseVersion.Source);
-            baseVersion.SemanticVersion.ShouldNotBe(preReleaseVersion.SemanticVersion);
-            baseVersion.Source.ShouldBe(lowerVersion.Source);
-            baseVersion.SemanticVersion.ShouldBe(lowerVersion.SemanticVersion);
-        }
+                    Name = "alpha",
+                    Number = 1
+                }
+            },
+            GitToolsTestingExtensions.CreateMockCommit(),
+            null
+        );
+
+        var versionCalculator = GetBaseVersionCalculator(contextBuilder => contextBuilder
+            .WithConfig(new Config { VersioningMode = VersioningMode.Mainline, Ignore = fakeIgnoreConfig })
+            .OverrideServices(services =>
+            {
+                services.RemoveAll<IVersionStrategy>();
+                services.AddSingleton<IVersionStrategy>(new TestVersionStrategy(preReleaseVersion, lowerVersion));
+            }));
+        var baseVersion = versionCalculator.GetBaseVersion();
+
+        baseVersion.Source.ShouldNotBe(preReleaseVersion.Source);
+        baseVersion.SemanticVersion.ShouldNotBe(preReleaseVersion.SemanticVersion);
+        baseVersion.Source.ShouldBe(lowerVersion.Source);
+        baseVersion.SemanticVersion.ShouldBe(lowerVersion.SemanticVersion);
+    }
 
-        private static IBaseVersionCalculator GetBaseVersionCalculator(Action<GitVersionContextBuilder> contextBuilderAction)
-        {
-            var contextBuilder = new GitVersionContextBuilder();
-            contextBuilderAction?.Invoke(contextBuilder);
+    private static IBaseVersionCalculator GetBaseVersionCalculator(Action<GitVersionContextBuilder> contextBuilderAction)
+    {
+        var contextBuilder = new GitVersionContextBuilder();
+        contextBuilderAction?.Invoke(contextBuilder);
 
-            contextBuilder.Build();
+        contextBuilder.Build();
 
-            return contextBuilder.ServicesProvider.GetService<IBaseVersionCalculator>();
-        }
+        return contextBuilder.ServicesProvider.GetService<IBaseVersionCalculator>();
+    }
 
-        private class TestIgnoreConfig : IgnoreConfig
-        {
-            private readonly IVersionFilter filter;
+    private class TestIgnoreConfig : IgnoreConfig
+    {
+        private readonly IVersionFilter filter;
 
-            public override bool IsEmpty => false;
+        public override bool IsEmpty => false;
 
-            public TestIgnoreConfig(IVersionFilter filter) => this.filter = filter;
+        public TestIgnoreConfig(IVersionFilter filter) => this.filter = filter;
 
-            public override IEnumerable<IVersionFilter> ToFilters()
-            {
-                yield return this.filter;
-            }
+        public override IEnumerable<IVersionFilter> ToFilters()
+        {
+            yield return this.filter;
         }
+    }
 
-        private class ExcludeSourcesContainingExclude : IVersionFilter
+    private class ExcludeSourcesContainingExclude : IVersionFilter
+    {
+        public bool Exclude(BaseVersion version, out string reason)
         {
-            public bool Exclude(BaseVersion version, out string reason)
-            {
-                reason = null;
+            reason = null;
 
-                if (version.Source.Contains("exclude"))
-                {
-                    reason = "was excluded";
-                    return true;
-                }
-                return false;
+            if (version.Source.Contains("exclude"))
+            {
+                reason = "was excluded";
+                return true;
             }
+            return false;
         }
+    }
 
-        private sealed class V1Strategy : IVersionStrategy
-        {
-            private readonly ICommit when;
+    private sealed class V1Strategy : IVersionStrategy
+    {
+        private readonly ICommit when;
 
-            public V1Strategy(DateTimeOffset? when)
+        public V1Strategy(DateTimeOffset? when)
+        {
+            if (when != null)
             {
-                if (when != null)
-                {
-                    this.when = GitToolsTestingExtensions.CreateMockCommit();
-                    this.when.When.Returns(when.Value);
-                }
-                else
-                {
-                    this.when = null;
-                }
+                this.when = GitToolsTestingExtensions.CreateMockCommit();
+                this.when.When.Returns(when.Value);
             }
-
-            public IEnumerable<BaseVersion> GetVersions()
+            else
             {
-                yield return new BaseVersion("Source 1", false, new SemanticVersion(1), this.when, null);
+                this.when = null;
             }
         }
 
-        private sealed class V2Strategy : IVersionStrategy
+        public IEnumerable<BaseVersion> GetVersions()
         {
-            private readonly ICommit when;
+            yield return new BaseVersion("Source 1", false, new SemanticVersion(1), this.when, null);
+        }
+    }
+
+    private sealed class V2Strategy : IVersionStrategy
+    {
+        private readonly ICommit when;
 
-            public V2Strategy(DateTimeOffset? when)
+        public V2Strategy(DateTimeOffset? when)
+        {
+            if (when != null)
             {
-                if (when != null)
-                {
-                    this.when = GitToolsTestingExtensions.CreateMockCommit();
-                    this.when.When.Returns(when.Value);
-                }
-                else
-                {
-                    this.when = null;
-                }
+                this.when = GitToolsTestingExtensions.CreateMockCommit();
+                this.when.When.Returns(when.Value);
             }
-
-            public IEnumerable<BaseVersion> GetVersions()
+            else
             {
-                yield return new BaseVersion("Source 2", true, new SemanticVersion(2), this.when, null);
+                this.when = null;
             }
         }
 
-        private sealed class TestVersionStrategy : IVersionStrategy
+        public IEnumerable<BaseVersion> GetVersions()
         {
-            private readonly IEnumerable<BaseVersion> versions;
+            yield return new BaseVersion("Source 2", true, new SemanticVersion(2), this.when, null);
+        }
+    }
+
+    private sealed class TestVersionStrategy : IVersionStrategy
+    {
+        private readonly IEnumerable<BaseVersion> versions;
 
-            public TestVersionStrategy(params BaseVersion[] versions) => this.versions = versions;
+        public TestVersionStrategy(params BaseVersion[] versions) => this.versions = versions;
 
-            public IEnumerable<BaseVersion> GetVersions() => this.versions;
-        }
+        public IEnumerable<BaseVersion> GetVersions() => this.versions;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/JsonVersionBuilderTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/JsonVersionBuilderTests.cs
index 8dcdd65ec7..a049c1e279 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/JsonVersionBuilderTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/JsonVersionBuilderTests.cs
@@ -5,36 +5,35 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class JsonVersionBuilderTests : TestBase
 {
-    [TestFixture]
-    public class JsonVersionBuilderTests : TestBase
-    {
-        [SetUp]
-        public void Setup() => ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
+    [SetUp]
+    public void Setup() => ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
 
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void Json()
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void Json()
+    {
+        var semanticVersion = new SemanticVersion
         {
-            var semanticVersion = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 0,
-                PreReleaseTag = "unstable4",
-                BuildMetaData = new SemanticVersionBuildMetaData("versionSourceSha", 5, "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"), 0)
-            };
+            Major = 1,
+            Minor = 2,
+            Patch = 0,
+            PreReleaseTag = "unstable4",
+            BuildMetaData = new SemanticVersionBuildMetaData("versionSourceSha", 5, "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"), 0)
+        };
 
-            var config = new TestEffectiveConfiguration();
+        var config = new TestEffectiveConfiguration();
 
-            var sp = ConfigureServices();
+        var sp = ConfigureServices();
 
-            var variableProvider = sp.GetService<IVariableProvider>();
-            var variables = variableProvider.GetVariablesFor(semanticVersion, config, false);
-            var json = variables.ToString();
-            json.ShouldMatchApproved(c => c.SubFolder("Approved"));
-        }
+        var variableProvider = sp.GetService<IVariableProvider>();
+        var variables = variableProvider.GetVariablesFor(semanticVersion, config, false);
+        var json = variables.ToString();
+        json.ShouldMatchApproved(c => c.SubFolder("Approved"));
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/MinDateVersionFilterTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/MinDateVersionFilterTests.cs
index 6924e0d917..13f558c04c 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/MinDateVersionFilterTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/MinDateVersionFilterTests.cs
@@ -4,53 +4,52 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class MinDateVersionFilterTests : TestBase
 {
-    [TestFixture]
-    public class MinDateVersionFilterTests : TestBase
+    [Test]
+    public void VerifyNullGuard()
+    {
+        var dummy = DateTimeOffset.UtcNow.AddSeconds(1.0);
+        var sut = new MinDateVersionFilter(dummy);
+
+        Should.Throw<ArgumentNullException>(() => sut.Exclude(null, out _));
+    }
+
+    [Test]
+    public void WhenCommitShouldExcludeWithReason()
+    {
+        var commit = GitToolsTestingExtensions.CreateMockCommit();
+        var version = new BaseVersion("dummy", false, new SemanticVersion(1), commit, string.Empty);
+        var futureDate = DateTimeOffset.UtcNow.AddYears(1);
+        var sut = new MinDateVersionFilter(futureDate);
+
+        sut.Exclude(version, out var reason).ShouldBeTrue();
+        reason.ShouldNotBeNullOrWhiteSpace();
+    }
+
+    [Test]
+    public void WhenShaMismatchShouldNotExclude()
     {
-        [Test]
-        public void VerifyNullGuard()
-        {
-            var dummy = DateTimeOffset.UtcNow.AddSeconds(1.0);
-            var sut = new MinDateVersionFilter(dummy);
-
-            Should.Throw<ArgumentNullException>(() => sut.Exclude(null, out _));
-        }
-
-        [Test]
-        public void WhenCommitShouldExcludeWithReason()
-        {
-            var commit = GitToolsTestingExtensions.CreateMockCommit();
-            var version = new BaseVersion("dummy", false, new SemanticVersion(1), commit, string.Empty);
-            var futureDate = DateTimeOffset.UtcNow.AddYears(1);
-            var sut = new MinDateVersionFilter(futureDate);
-
-            sut.Exclude(version, out var reason).ShouldBeTrue();
-            reason.ShouldNotBeNullOrWhiteSpace();
-        }
-
-        [Test]
-        public void WhenShaMismatchShouldNotExclude()
-        {
-            var commit = GitToolsTestingExtensions.CreateMockCommit();
-            var version = new BaseVersion("dummy", false, new SemanticVersion(1), commit, string.Empty);
-            var pastDate = DateTimeOffset.UtcNow.AddYears(-1);
-            var sut = new MinDateVersionFilter(pastDate);
-
-            sut.Exclude(version, out var reason).ShouldBeFalse();
-            reason.ShouldBeNull();
-        }
-
-        [Test]
-        public void ExcludeShouldAcceptVersionWithNullCommit()
-        {
-            var version = new BaseVersion("dummy", false, new SemanticVersion(1), null, string.Empty);
-            var futureDate = DateTimeOffset.UtcNow.AddYears(1);
-            var sut = new MinDateVersionFilter(futureDate);
-
-            sut.Exclude(version, out var reason).ShouldBeFalse();
-            reason.ShouldBeNull();
-        }
+        var commit = GitToolsTestingExtensions.CreateMockCommit();
+        var version = new BaseVersion("dummy", false, new SemanticVersion(1), commit, string.Empty);
+        var pastDate = DateTimeOffset.UtcNow.AddYears(-1);
+        var sut = new MinDateVersionFilter(pastDate);
+
+        sut.Exclude(version, out var reason).ShouldBeFalse();
+        reason.ShouldBeNull();
+    }
+
+    [Test]
+    public void ExcludeShouldAcceptVersionWithNullCommit()
+    {
+        var version = new BaseVersion("dummy", false, new SemanticVersion(1), null, string.Empty);
+        var futureDate = DateTimeOffset.UtcNow.AddYears(1);
+        var sut = new MinDateVersionFilter(futureDate);
+
+        sut.Exclude(version, out var reason).ShouldBeFalse();
+        reason.ShouldBeNull();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs
index a8f2a406a7..c00a2b3879 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs
@@ -10,316 +10,315 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.VersionCalculation
+namespace GitVersion.Core.Tests.VersionCalculation;
+
+public class NextVersionCalculatorTests : TestBase
 {
-    public class NextVersionCalculatorTests : TestBase
+    [Test]
+    public void ShouldIncrementVersionBasedOnConfig()
     {
-        [Test]
-        public void ShouldIncrementVersionBasedOnConfig()
-        {
-            var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData("ef7d0d7e1e700f1c7c9fa01ea6791bb778a5c37c", 1, MainBranch, "b1a34edbd80e141f7cc046c074f109be7d022074", "b1a34e", DateTimeOffset.Now, 0);
+        var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData("ef7d0d7e1e700f1c7c9fa01ea6791bb778a5c37c", 1, MainBranch, "b1a34edbd80e141f7cc046c074f109be7d022074", "b1a34e", DateTimeOffset.Now, 0);
 
-            var contextBuilder = new GitVersionContextBuilder();
+        var contextBuilder = new GitVersionContextBuilder();
 
-            contextBuilder
-                .OverrideServices(services =>
-                {
-                    var testBaseVersionCalculator = new TestBaseVersionCalculator(true, new SemanticVersion(1), GitToolsTestingExtensions.CreateMockCommit());
-                    services.AddSingleton<IBaseVersionCalculator>(testBaseVersionCalculator);
-                    services.AddSingleton<IMainlineVersionCalculator>(new TestMainlineVersionCalculator(semanticVersionBuildMetaData));
-                })
-                .WithConfig(new Config())
-                .Build();
+        contextBuilder
+            .OverrideServices(services =>
+            {
+                var testBaseVersionCalculator = new TestBaseVersionCalculator(true, new SemanticVersion(1), GitToolsTestingExtensions.CreateMockCommit());
+                services.AddSingleton<IBaseVersionCalculator>(testBaseVersionCalculator);
+                services.AddSingleton<IMainlineVersionCalculator>(new TestMainlineVersionCalculator(semanticVersionBuildMetaData));
+            })
+            .WithConfig(new Config())
+            .Build();
 
-            var nextVersionCalculator = contextBuilder.ServicesProvider.GetService<INextVersionCalculator>();
-            nextVersionCalculator.ShouldNotBeNull();
+        var nextVersionCalculator = contextBuilder.ServicesProvider.GetService<INextVersionCalculator>();
+        nextVersionCalculator.ShouldNotBeNull();
 
-            var version = nextVersionCalculator.FindVersion();
+        var version = nextVersionCalculator.FindVersion();
 
-            version.ToString().ShouldBe("1.0.1");
-        }
+        version.ToString().ShouldBe("1.0.1");
+    }
 
-        [Test]
-        public void DoesNotIncrementWhenBaseVersionSaysNotTo()
-        {
-            var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData("ef7d0d7e1e700f1c7c9fa01ea6791bb778a5c37c", 1, MainBranch, "b1a34edbd80e141f7cc046c074f109be7d022074", "b1a34e", DateTimeOffset.Now, 0);
+    [Test]
+    public void DoesNotIncrementWhenBaseVersionSaysNotTo()
+    {
+        var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData("ef7d0d7e1e700f1c7c9fa01ea6791bb778a5c37c", 1, MainBranch, "b1a34edbd80e141f7cc046c074f109be7d022074", "b1a34e", DateTimeOffset.Now, 0);
 
-            var contextBuilder = new GitVersionContextBuilder();
+        var contextBuilder = new GitVersionContextBuilder();
 
-            contextBuilder
-                .OverrideServices(services =>
-                {
-                    var testBaseVersionCalculator = new TestBaseVersionCalculator(false, new SemanticVersion(1), GitToolsTestingExtensions.CreateMockCommit());
-                    services.AddSingleton<IBaseVersionCalculator>(testBaseVersionCalculator);
-                    services.AddSingleton<IMainlineVersionCalculator>(new TestMainlineVersionCalculator(semanticVersionBuildMetaData));
-                })
-                .WithConfig(new Config())
-                .Build();
+        contextBuilder
+            .OverrideServices(services =>
+            {
+                var testBaseVersionCalculator = new TestBaseVersionCalculator(false, new SemanticVersion(1), GitToolsTestingExtensions.CreateMockCommit());
+                services.AddSingleton<IBaseVersionCalculator>(testBaseVersionCalculator);
+                services.AddSingleton<IMainlineVersionCalculator>(new TestMainlineVersionCalculator(semanticVersionBuildMetaData));
+            })
+            .WithConfig(new Config())
+            .Build();
 
-            var nextVersionCalculator = contextBuilder.ServicesProvider.GetService<INextVersionCalculator>();
+        var nextVersionCalculator = contextBuilder.ServicesProvider.GetService<INextVersionCalculator>();
 
-            nextVersionCalculator.ShouldNotBeNull();
+        nextVersionCalculator.ShouldNotBeNull();
 
-            var version = nextVersionCalculator.FindVersion();
+        var version = nextVersionCalculator.FindVersion();
 
-            version.ToString().ShouldBe("1.0.0");
-        }
+        version.ToString().ShouldBe("1.0.0");
+    }
 
-        [Test]
-        public void AppliesBranchPreReleaseTag()
-        {
-            var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData("ef7d0d7e1e700f1c7c9fa01ea6791bb778a5c37c", 2, "develop", "b1a34edbd80e141f7cc046c074f109be7d022074", "b1a34e", DateTimeOffset.Now, 0);
-            var contextBuilder = new GitVersionContextBuilder();
+    [Test]
+    public void AppliesBranchPreReleaseTag()
+    {
+        var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData("ef7d0d7e1e700f1c7c9fa01ea6791bb778a5c37c", 2, "develop", "b1a34edbd80e141f7cc046c074f109be7d022074", "b1a34e", DateTimeOffset.Now, 0);
+        var contextBuilder = new GitVersionContextBuilder();
 
-            contextBuilder
-                .OverrideServices(services =>
-                {
-                    var testBaseVersionCalculator = new TestBaseVersionCalculator(false, new SemanticVersion(1), GitToolsTestingExtensions.CreateMockCommit());
-                    services.AddSingleton<IBaseVersionCalculator>(testBaseVersionCalculator);
-                    services.AddSingleton<IMainlineVersionCalculator>(new TestMainlineVersionCalculator(semanticVersionBuildMetaData));
-                })
-                .WithDevelopBranch()
-                .Build();
+        contextBuilder
+            .OverrideServices(services =>
+            {
+                var testBaseVersionCalculator = new TestBaseVersionCalculator(false, new SemanticVersion(1), GitToolsTestingExtensions.CreateMockCommit());
+                services.AddSingleton<IBaseVersionCalculator>(testBaseVersionCalculator);
+                services.AddSingleton<IMainlineVersionCalculator>(new TestMainlineVersionCalculator(semanticVersionBuildMetaData));
+            })
+            .WithDevelopBranch()
+            .Build();
 
-            var nextVersionCalculator = contextBuilder.ServicesProvider.GetService<INextVersionCalculator>();
-            nextVersionCalculator.ShouldNotBeNull();
+        var nextVersionCalculator = contextBuilder.ServicesProvider.GetService<INextVersionCalculator>();
+        nextVersionCalculator.ShouldNotBeNull();
 
-            var version = nextVersionCalculator.FindVersion();
+        var version = nextVersionCalculator.FindVersion();
 
-            version.ToString("f").ShouldBe("1.0.0-alpha.1+2");
-        }
+        version.ToString("f").ShouldBe("1.0.0-alpha.1+2");
+    }
 
-        [Test]
-        public void PreReleaseTagCanUseBranchName()
+    [Test]
+    public void PreReleaseTagCanUseBranchName()
+    {
+        var config = new Config
         {
-            var config = new Config
+            NextVersion = "1.0.0",
+            Branches = new Dictionary<string, BranchConfig>
             {
-                NextVersion = "1.0.0",
-                Branches = new Dictionary<string, BranchConfig>
                 {
+                    "custom", new BranchConfig
                     {
-                        "custom", new BranchConfig
-                        {
-                            Regex = "custom/",
-                            Tag = "useBranchName",
-                            SourceBranches = new HashSet<string>()
-                        }
+                        Regex = "custom/",
+                        Tag = "useBranchName",
+                        SourceBranches = new HashSet<string>()
                     }
                 }
-            };
+            }
+        };
 
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit();
-            fixture.BranchTo("develop");
-            fixture.MakeACommit();
-            fixture.BranchTo("custom/foo");
-            fixture.MakeACommit();
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.BranchTo("develop");
+        fixture.MakeACommit();
+        fixture.BranchTo("custom/foo");
+        fixture.MakeACommit();
 
-            fixture.AssertFullSemver("1.0.0-foo.1+2", config);
-        }
+        fixture.AssertFullSemver("1.0.0-foo.1+2", config);
+    }
 
-        [Test]
-        public void PreReleaseVersionMainline()
+    [Test]
+    public void PreReleaseVersionMainline()
+    {
+        var config = new Config
         {
-            var config = new Config
-            {
-                VersioningMode = VersioningMode.Mainline,
-                NextVersion = "1.0.0"
-            };
+            VersioningMode = VersioningMode.Mainline,
+            NextVersion = "1.0.0"
+        };
 
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit();
-            fixture.BranchTo("foo");
-            fixture.MakeACommit();
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.BranchTo("foo");
+        fixture.MakeACommit();
 
-            fixture.AssertFullSemver("1.0.0-foo.1", config);
-        }
+        fixture.AssertFullSemver("1.0.0-foo.1", config);
+    }
 
-        [Test]
-        public void MergeIntoMainline()
+    [Test]
+    public void MergeIntoMainline()
+    {
+        var config = new Config
         {
-            var config = new Config
-            {
-                VersioningMode = VersioningMode.Mainline,
-                NextVersion = "1.0.0"
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit();
-            fixture.BranchTo("foo");
-            fixture.MakeACommit();
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("foo");
-
-            fixture.AssertFullSemver("1.0.0", config);
-        }
-
-        [Test]
-        public void MergeFeatureIntoMainline()
+            VersioningMode = VersioningMode.Mainline,
+            NextVersion = "1.0.0"
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.BranchTo("foo");
+        fixture.MakeACommit();
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("foo");
+
+        fixture.AssertFullSemver("1.0.0", config);
+    }
+
+    [Test]
+    public void MergeFeatureIntoMainline()
+    {
+        var config = new Config
         {
-            var config = new Config
-            {
-                VersioningMode = VersioningMode.Mainline
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit();
-            fixture.ApplyTag("1.0.0");
-            fixture.AssertFullSemver("1.0.0", config);
-
-            fixture.BranchTo("feature/foo");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.0.1-foo.1", config);
-            fixture.ApplyTag("1.0.1-foo.1");
-
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo");
-            fixture.AssertFullSemver("1.0.1", config);
-        }
-
-        [Test]
-        public void MergeFeatureIntoMainlineWithMinorIncrement()
+            VersioningMode = VersioningMode.Mainline
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.ApplyTag("1.0.0");
+        fixture.AssertFullSemver("1.0.0", config);
+
+        fixture.BranchTo("feature/foo");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.0.1-foo.1", config);
+        fixture.ApplyTag("1.0.1-foo.1");
+
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo");
+        fixture.AssertFullSemver("1.0.1", config);
+    }
+
+    [Test]
+    public void MergeFeatureIntoMainlineWithMinorIncrement()
+    {
+        var config = new Config
         {
-            var config = new Config
+            VersioningMode = VersioningMode.Mainline,
+            Branches = new Dictionary<string, BranchConfig>()
             {
-                VersioningMode = VersioningMode.Mainline,
-                Branches = new Dictionary<string, BranchConfig>()
-                {
-                    { "feature", new BranchConfig { Increment = IncrementStrategy.Minor } }
-                },
-                Ignore = new IgnoreConfig() { ShAs = new List<string>() },
-                MergeMessageFormats = new Dictionary<string, string>()
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit();
-            fixture.ApplyTag("1.0.0");
-            fixture.AssertFullSemver("1.0.0", config);
-
-            fixture.BranchTo("feature/foo");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.1.0-foo.1", config);
-            fixture.ApplyTag("1.1.0-foo.1");
-
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo");
-            fixture.AssertFullSemver("1.1.0", config);
-        }
-
-        [Test]
-        public void MergeFeatureIntoMainlineWithMinorIncrementAndThenMergeHotfix()
+                { "feature", new BranchConfig { Increment = IncrementStrategy.Minor } }
+            },
+            Ignore = new IgnoreConfig() { ShAs = new List<string>() },
+            MergeMessageFormats = new Dictionary<string, string>()
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.ApplyTag("1.0.0");
+        fixture.AssertFullSemver("1.0.0", config);
+
+        fixture.BranchTo("feature/foo");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.1.0-foo.1", config);
+        fixture.ApplyTag("1.1.0-foo.1");
+
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo");
+        fixture.AssertFullSemver("1.1.0", config);
+    }
+
+    [Test]
+    public void MergeFeatureIntoMainlineWithMinorIncrementAndThenMergeHotfix()
+    {
+        var config = new Config
         {
-            var config = new Config
+            VersioningMode = VersioningMode.Mainline,
+            Branches = new Dictionary<string, BranchConfig>()
             {
-                VersioningMode = VersioningMode.Mainline,
-                Branches = new Dictionary<string, BranchConfig>()
-                {
-                    { "feature", new BranchConfig { Increment = IncrementStrategy.Minor } }
-                },
-                Ignore = new IgnoreConfig() { ShAs = new List<string>() },
-                MergeMessageFormats = new Dictionary<string, string>()
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit();
-            fixture.ApplyTag("1.0.0");
-            fixture.AssertFullSemver("1.0.0", config);
-
-            fixture.BranchTo("feature/foo");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.1.0-foo.1", config);
-            fixture.ApplyTag("1.1.0-foo.1");
-
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("feature/foo");
-            fixture.AssertFullSemver("1.1.0", config);
-            fixture.ApplyTag("1.1.0");
-
-            fixture.BranchTo("hotfix/bar");
-            fixture.MakeACommit();
-            fixture.AssertFullSemver("1.1.1-beta.1", config);
-            fixture.ApplyTag("1.1.1-beta.1");
-
-            fixture.Checkout(MainBranch);
-            fixture.MergeNoFF("hotfix/bar");
-            fixture.AssertFullSemver("1.1.1", config);
-        }
-
-        [Test]
-        public void PreReleaseTagCanUseBranchNameVariable()
+                { "feature", new BranchConfig { Increment = IncrementStrategy.Minor } }
+            },
+            Ignore = new IgnoreConfig() { ShAs = new List<string>() },
+            MergeMessageFormats = new Dictionary<string, string>()
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.ApplyTag("1.0.0");
+        fixture.AssertFullSemver("1.0.0", config);
+
+        fixture.BranchTo("feature/foo");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.1.0-foo.1", config);
+        fixture.ApplyTag("1.1.0-foo.1");
+
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("feature/foo");
+        fixture.AssertFullSemver("1.1.0", config);
+        fixture.ApplyTag("1.1.0");
+
+        fixture.BranchTo("hotfix/bar");
+        fixture.MakeACommit();
+        fixture.AssertFullSemver("1.1.1-beta.1", config);
+        fixture.ApplyTag("1.1.1-beta.1");
+
+        fixture.Checkout(MainBranch);
+        fixture.MergeNoFF("hotfix/bar");
+        fixture.AssertFullSemver("1.1.1", config);
+    }
+
+    [Test]
+    public void PreReleaseTagCanUseBranchNameVariable()
+    {
+        var config = new Config
         {
-            var config = new Config
+            NextVersion = "1.0.0",
+            Branches = new Dictionary<string, BranchConfig>
             {
-                NextVersion = "1.0.0",
-                Branches = new Dictionary<string, BranchConfig>
                 {
+                    "custom", new BranchConfig
                     {
-                        "custom", new BranchConfig
-                        {
-                            Regex = "custom/",
-                            Tag = "alpha.{BranchName}",
-                            SourceBranches = new HashSet<string>()
-                        }
+                        Regex = "custom/",
+                        Tag = "alpha.{BranchName}",
+                        SourceBranches = new HashSet<string>()
                     }
                 }
-            };
+            }
+        };
 
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit();
-            fixture.BranchTo("develop");
-            fixture.MakeACommit();
-            fixture.BranchTo("custom/foo");
-            fixture.MakeACommit();
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.BranchTo("develop");
+        fixture.MakeACommit();
+        fixture.BranchTo("custom/foo");
+        fixture.MakeACommit();
 
-            fixture.AssertFullSemver("1.0.0-alpha.foo.1+2", config);
-        }
+        fixture.AssertFullSemver("1.0.0-alpha.foo.1+2", config);
+    }
 
-        [Test]
-        public void PreReleaseNumberShouldBeScopeToPreReleaseLabelInContinuousDelivery()
+    [Test]
+    public void PreReleaseNumberShouldBeScopeToPreReleaseLabelInContinuousDelivery()
+    {
+        var config = new Config
         {
-            var config = new Config
+            VersioningMode = VersioningMode.ContinuousDelivery,
+            Branches = new Dictionary<string, BranchConfig>
             {
-                VersioningMode = VersioningMode.ContinuousDelivery,
-                Branches = new Dictionary<string, BranchConfig>
                 {
+                    MainBranch, new BranchConfig
                     {
-                        MainBranch, new BranchConfig
-                        {
-                            Tag = "beta"
-                        }
-                    },
-                }
-            };
+                        Tag = "beta"
+                    }
+                },
+            }
+        };
 
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
 
-            fixture.Repository.CreateBranch("feature/test");
-            Commands.Checkout(fixture.Repository, "feature/test");
-            fixture.Repository.MakeATaggedCommit("0.1.0-test.1");
-            fixture.Repository.MakeACommit();
+        fixture.Repository.CreateBranch("feature/test");
+        Commands.Checkout(fixture.Repository, "feature/test");
+        fixture.Repository.MakeATaggedCommit("0.1.0-test.1");
+        fixture.Repository.MakeACommit();
 
-            fixture.AssertFullSemver("0.1.0-test.2+2", config);
+        fixture.AssertFullSemver("0.1.0-test.2+2", config);
 
-            Commands.Checkout(fixture.Repository, MainBranch);
-            fixture.Repository.Merge("feature/test", Generate.SignatureNow());
+        Commands.Checkout(fixture.Repository, MainBranch);
+        fixture.Repository.Merge("feature/test", Generate.SignatureNow());
 
-            fixture.AssertFullSemver("0.1.0-beta.1+2", config);
-        }
+        fixture.AssertFullSemver("0.1.0-beta.1+2", config);
+    }
 
-        [Test]
-        public void GetNextVersionOnNonMainlineBranchWithoutCommitsShouldWorkNormally()
+    [Test]
+    public void GetNextVersionOnNonMainlineBranchWithoutCommitsShouldWorkNormally()
+    {
+        var config = new Config
         {
-            var config = new Config
-            {
-                VersioningMode = VersioningMode.Mainline,
-                NextVersion = "1.0.0"
-            };
-
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeACommit("initial commit");
-            fixture.BranchTo("feature/f1");
-            fixture.AssertFullSemver("1.0.0-f1.0", config);
-        }
+            VersioningMode = VersioningMode.Mainline,
+            NextVersion = "1.0.0"
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit("initial commit");
+        fixture.BranchTo("feature/f1");
+        fixture.AssertFullSemver("1.0.0-f1.0", config);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
index 458ac9aada..18fe68412d 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
@@ -3,260 +3,259 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class SemanticVersionTests : TestBase
 {
-    [TestFixture]
-    public class SemanticVersionTests : TestBase
-    {
 
-        [TestCase("1.2.3", 1, 2, 3, null, null, null, null, null, null, null, null)]
-        [TestCase("1.2", 1, 2, 0, null, null, null, null, null, null, "1.2.0", null)]
-        [TestCase("1.2.3-beta", 1, 2, 3, "beta", null, null, null, null, null, null, null)]
-        [TestCase("1.2.3-beta3", 1, 2, 3, "beta", 3, null, null, null, null, "1.2.3-beta.3", null)]
-        [TestCase("1.2.3-beta.3", 1, 2, 3, "beta", 3, null, null, null, null, "1.2.3-beta.3", null)]
-        [TestCase("1.2.3-beta-3", 1, 2, 3, "beta-3", null, null, null, null, null, "1.2.3-beta-3", null)]
-        [TestCase("1.2.3-alpha", 1, 2, 3, "alpha", null, null, null, null, null, null, null)]
-        [TestCase("1.2-alpha4", 1, 2, 0, "alpha", 4, null, null, null, null, "1.2.0-alpha.4", null)]
-        [TestCase("1.2.3-rc", 1, 2, 3, "rc", null, null, null, null, null, null, null)]
-        [TestCase("1.2.3-rc3", 1, 2, 3, "rc", 3, null, null, null, null, "1.2.3-rc.3", null)]
-        [TestCase("1.2.3-3", 1, 2, 3, "", 3, null, null, null, null, "1.2.3-3", null)]
-        [TestCase("1.2.3-RC3", 1, 2, 3, "RC", 3, null, null, null, null, "1.2.3-RC.3", null)]
-        [TestCase("1.2.3-rc3.1", 1, 2, 3, "rc3", 1, null, null, null, null, "1.2.3-rc3.1", null)]
-        [TestCase("01.02.03-rc03", 1, 2, 3, "rc", 3, null, null, null, null, "1.2.3-rc.3", null)]
-        [TestCase("1.2.3-beta3f", 1, 2, 3, "beta3f", null, null, null, null, null, null, null)]
-        [TestCase("1.2.3-notAStability1", 1, 2, 3, "notAStability", 1, null, null, null, null, "1.2.3-notAStability.1", null)]
-        [TestCase("1.2.3.4", 1, 2, 3, null, null, 4, null, null, null, "1.2.3+4", null)]
-        [TestCase("1.2.3+4", 1, 2, 3, null, null, 4, null, null, null, null, null)]
-        [TestCase("1.2.3+4.Branch.Foo", 1, 2, 3, null, null, 4, "Foo", null, null, null, null)]
-        [TestCase("1.2.3+randomMetaData", 1, 2, 3, null, null, null, null, null, "randomMetaData", null, null)]
-        [TestCase("1.2.3-beta.1+4.Sha.12234.Othershiz", 1, 2, 3, "beta", 1, 4, null, "12234", "Othershiz", null, null)]
-        [TestCase("1.2.3", 1, 2, 3, null, null, null, null, null, null, null, Config.DefaultTagPrefix)]
-        [TestCase("v1.2.3", 1, 2, 3, null, null, null, null, null, null, "1.2.3", Config.DefaultTagPrefix)]
-        [TestCase("V1.2.3", 1, 2, 3, null, null, null, null, null, null, "1.2.3", Config.DefaultTagPrefix)]
-        [TestCase("version-1.2.3", 1, 2, 3, null, null, null, null, null, null, "1.2.3", "version-")]
-        [TestCase("1", 1, 0, 0, null, null, null, null, null, null, "1.0.0", null)]
-        [TestCase("1.1", 1, 1, 0, null, null, null, null, null, null, "1.1.0", null)]
-        public void ValidateVersionParsing(
-            string versionString, int major, int minor, int patch, string tag, int? tagNumber, int? numberOfBuilds,
-            string branchName, string sha, string otherMetaData, string fullFormattedVersionString, string tagPrefixRegex)
-        {
-            fullFormattedVersionString ??= versionString;
+    [TestCase("1.2.3", 1, 2, 3, null, null, null, null, null, null, null, null)]
+    [TestCase("1.2", 1, 2, 0, null, null, null, null, null, null, "1.2.0", null)]
+    [TestCase("1.2.3-beta", 1, 2, 3, "beta", null, null, null, null, null, null, null)]
+    [TestCase("1.2.3-beta3", 1, 2, 3, "beta", 3, null, null, null, null, "1.2.3-beta.3", null)]
+    [TestCase("1.2.3-beta.3", 1, 2, 3, "beta", 3, null, null, null, null, "1.2.3-beta.3", null)]
+    [TestCase("1.2.3-beta-3", 1, 2, 3, "beta-3", null, null, null, null, null, "1.2.3-beta-3", null)]
+    [TestCase("1.2.3-alpha", 1, 2, 3, "alpha", null, null, null, null, null, null, null)]
+    [TestCase("1.2-alpha4", 1, 2, 0, "alpha", 4, null, null, null, null, "1.2.0-alpha.4", null)]
+    [TestCase("1.2.3-rc", 1, 2, 3, "rc", null, null, null, null, null, null, null)]
+    [TestCase("1.2.3-rc3", 1, 2, 3, "rc", 3, null, null, null, null, "1.2.3-rc.3", null)]
+    [TestCase("1.2.3-3", 1, 2, 3, "", 3, null, null, null, null, "1.2.3-3", null)]
+    [TestCase("1.2.3-RC3", 1, 2, 3, "RC", 3, null, null, null, null, "1.2.3-RC.3", null)]
+    [TestCase("1.2.3-rc3.1", 1, 2, 3, "rc3", 1, null, null, null, null, "1.2.3-rc3.1", null)]
+    [TestCase("01.02.03-rc03", 1, 2, 3, "rc", 3, null, null, null, null, "1.2.3-rc.3", null)]
+    [TestCase("1.2.3-beta3f", 1, 2, 3, "beta3f", null, null, null, null, null, null, null)]
+    [TestCase("1.2.3-notAStability1", 1, 2, 3, "notAStability", 1, null, null, null, null, "1.2.3-notAStability.1", null)]
+    [TestCase("1.2.3.4", 1, 2, 3, null, null, 4, null, null, null, "1.2.3+4", null)]
+    [TestCase("1.2.3+4", 1, 2, 3, null, null, 4, null, null, null, null, null)]
+    [TestCase("1.2.3+4.Branch.Foo", 1, 2, 3, null, null, 4, "Foo", null, null, null, null)]
+    [TestCase("1.2.3+randomMetaData", 1, 2, 3, null, null, null, null, null, "randomMetaData", null, null)]
+    [TestCase("1.2.3-beta.1+4.Sha.12234.Othershiz", 1, 2, 3, "beta", 1, 4, null, "12234", "Othershiz", null, null)]
+    [TestCase("1.2.3", 1, 2, 3, null, null, null, null, null, null, null, Config.DefaultTagPrefix)]
+    [TestCase("v1.2.3", 1, 2, 3, null, null, null, null, null, null, "1.2.3", Config.DefaultTagPrefix)]
+    [TestCase("V1.2.3", 1, 2, 3, null, null, null, null, null, null, "1.2.3", Config.DefaultTagPrefix)]
+    [TestCase("version-1.2.3", 1, 2, 3, null, null, null, null, null, null, "1.2.3", "version-")]
+    [TestCase("1", 1, 0, 0, null, null, null, null, null, null, "1.0.0", null)]
+    [TestCase("1.1", 1, 1, 0, null, null, null, null, null, null, "1.1.0", null)]
+    public void ValidateVersionParsing(
+        string versionString, int major, int minor, int patch, string tag, int? tagNumber, int? numberOfBuilds,
+        string branchName, string sha, string otherMetaData, string fullFormattedVersionString, string tagPrefixRegex)
+    {
+        fullFormattedVersionString ??= versionString;
 
-            SemanticVersion.TryParse(versionString, tagPrefixRegex, out var version).ShouldBe(true, versionString);
-            Assert.AreEqual(major, version.Major);
-            Assert.AreEqual(minor, version.Minor);
-            Assert.AreEqual(patch, version.Patch);
-            Assert.AreEqual(tag, version.PreReleaseTag.Name);
-            Assert.AreEqual(tagNumber, version.PreReleaseTag.Number);
-            Assert.AreEqual(numberOfBuilds, version.BuildMetaData.CommitsSinceTag);
-            Assert.AreEqual(branchName, version.BuildMetaData.Branch);
-            Assert.AreEqual(sha, version.BuildMetaData.Sha);
-            Assert.AreEqual(otherMetaData, version.BuildMetaData.OtherMetaData);
-            Assert.AreEqual(fullFormattedVersionString, version.ToString("i"));
-        }
+        SemanticVersion.TryParse(versionString, tagPrefixRegex, out var version).ShouldBe(true, versionString);
+        Assert.AreEqual(major, version.Major);
+        Assert.AreEqual(minor, version.Minor);
+        Assert.AreEqual(patch, version.Patch);
+        Assert.AreEqual(tag, version.PreReleaseTag.Name);
+        Assert.AreEqual(tagNumber, version.PreReleaseTag.Number);
+        Assert.AreEqual(numberOfBuilds, version.BuildMetaData.CommitsSinceTag);
+        Assert.AreEqual(branchName, version.BuildMetaData.Branch);
+        Assert.AreEqual(sha, version.BuildMetaData.Sha);
+        Assert.AreEqual(otherMetaData, version.BuildMetaData.OtherMetaData);
+        Assert.AreEqual(fullFormattedVersionString, version.ToString("i"));
+    }
 
-        [TestCase("someText")]
-        [TestCase("some-T-ext")]
-        [TestCase("v.1.2.3", "v")]
-        public void ValidateInvalidVersionParsing(string versionString, string tagPrefixRegex = null) => Assert.IsFalse(SemanticVersion.TryParse(versionString, tagPrefixRegex, out _), "TryParse Result");
+    [TestCase("someText")]
+    [TestCase("some-T-ext")]
+    [TestCase("v.1.2.3", "v")]
+    public void ValidateInvalidVersionParsing(string versionString, string tagPrefixRegex = null) => Assert.IsFalse(SemanticVersion.TryParse(versionString, tagPrefixRegex, out _), "TryParse Result");
 
-        [Test]
-        public void LegacySemVerTest()
-        {
-            new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", null).ToString("l").ShouldBe("TKT-2134");
-            new SemanticVersionPreReleaseTag("AReallyReallyReallyLongBranchName", null).ToString("l").ShouldBe("AReallyReallyReallyL");
-            new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", 1).ToString("lp").ShouldBe("TKT-2134-0001");
-            new SemanticVersionPreReleaseTag("TKT-2134", 1).ToString("lp").ShouldBe("TKT-2134-0001");
-            new SemanticVersionPreReleaseTag("AReallyReallyReallyLongBranchName", 1).ToString("lp").ShouldBe("AReallyReallyRea0001");
-        }
+    [Test]
+    public void LegacySemVerTest()
+    {
+        new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", null).ToString("l").ShouldBe("TKT-2134");
+        new SemanticVersionPreReleaseTag("AReallyReallyReallyLongBranchName", null).ToString("l").ShouldBe("AReallyReallyReallyL");
+        new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", 1).ToString("lp").ShouldBe("TKT-2134-0001");
+        new SemanticVersionPreReleaseTag("TKT-2134", 1).ToString("lp").ShouldBe("TKT-2134-0001");
+        new SemanticVersionPreReleaseTag("AReallyReallyReallyLongBranchName", 1).ToString("lp").ShouldBe("AReallyReallyRea0001");
+    }
 
-        [Test]
-        public void VersionSorting()
-        {
-            SemanticVersion.Parse("1.0.0", null).ShouldBeGreaterThan(SemanticVersion.Parse("1.0.0-beta", null));
-            SemanticVersion.Parse("1.0.0-beta.2", null).ShouldBeGreaterThan(SemanticVersion.Parse("1.0.0-beta.1", null));
-            SemanticVersion.Parse("1.0.0-beta.1", null).ShouldBeLessThan(SemanticVersion.Parse("1.0.0-beta.2", null));
-        }
+    [Test]
+    public void VersionSorting()
+    {
+        SemanticVersion.Parse("1.0.0", null).ShouldBeGreaterThan(SemanticVersion.Parse("1.0.0-beta", null));
+        SemanticVersion.Parse("1.0.0-beta.2", null).ShouldBeGreaterThan(SemanticVersion.Parse("1.0.0-beta.1", null));
+        SemanticVersion.Parse("1.0.0-beta.1", null).ShouldBeLessThan(SemanticVersion.Parse("1.0.0-beta.2", null));
+    }
 
-        [Test]
-        public void ToStringJTests()
+    [Test]
+    public void ToStringJTests()
+    {
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("j"));
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("j"));
+        var fullSemVer = new SemanticVersion
         {
-            Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("j"));
-            Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("j"));
-            var fullSemVer = new SemanticVersion
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
+            BuildMetaData = new SemanticVersionBuildMetaData
             {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-                BuildMetaData = new SemanticVersionBuildMetaData
-                {
-                    Sha = "theSha",
-                    Branch = "TheBranch",
-                    CommitsSinceTag = 5,
-                    OtherMetaData = "TheOtherMetaData"
-                }
-            };
-            Assert.AreEqual("1.2.3", fullSemVer.ToString("j"));
-        }
-        [Test]
-        public void ToStringSTests()
+                Sha = "theSha",
+                Branch = "TheBranch",
+                CommitsSinceTag = 5,
+                OtherMetaData = "TheOtherMetaData"
+            }
+        };
+        Assert.AreEqual("1.2.3", fullSemVer.ToString("j"));
+    }
+    [Test]
+    public void ToStringSTests()
+    {
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("s"));
+        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("s"));
+        var fullSemVer = new SemanticVersion
         {
-            Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("s"));
-            Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("s"));
-            var fullSemVer = new SemanticVersion
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
+            BuildMetaData = new SemanticVersionBuildMetaData
             {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-                BuildMetaData = new SemanticVersionBuildMetaData
-                {
-                    Sha = "theSha",
-                    Branch = "TheBranch",
-                    CommitsSinceTag = 5,
-                    OtherMetaData = "TheOtherMetaData"
-                }
-            };
-            Assert.AreEqual("1.2.3-beta.4", fullSemVer.ToString("s"));
-            var fullSemVerNoPreReleaseName = new SemanticVersion
+                Sha = "theSha",
+                Branch = "TheBranch",
+                CommitsSinceTag = 5,
+                OtherMetaData = "TheOtherMetaData"
+            }
+        };
+        Assert.AreEqual("1.2.3-beta.4", fullSemVer.ToString("s"));
+        var fullSemVerNoPreReleaseName = new SemanticVersion
+        {
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = new SemanticVersionPreReleaseTag("", 4),
+            BuildMetaData = new SemanticVersionBuildMetaData
             {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = new SemanticVersionPreReleaseTag("", 4),
-                BuildMetaData = new SemanticVersionBuildMetaData
-                {
-                    Sha = "theSha",
-                    Branch = "TheBranch",
-                    CommitsSinceTag = 5,
-                    OtherMetaData = "TheOtherMetaData"
-                }
-            };
-            Assert.AreEqual("1.2.3-4", fullSemVerNoPreReleaseName.ToString("s"));
-        }
-        [Test]
-        public void ToStringLTests()
+                Sha = "theSha",
+                Branch = "TheBranch",
+                CommitsSinceTag = 5,
+                OtherMetaData = "TheOtherMetaData"
+            }
+        };
+        Assert.AreEqual("1.2.3-4", fullSemVerNoPreReleaseName.ToString("s"));
+    }
+    [Test]
+    public void ToStringLTests()
+    {
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("l"));
+        Assert.AreEqual("1.2.3-beta4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("l"));
+        var fullSemVer = new SemanticVersion
         {
-            Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("l"));
-            Assert.AreEqual("1.2.3-beta4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("l"));
-            var fullSemVer = new SemanticVersion
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
+            BuildMetaData = new SemanticVersionBuildMetaData
             {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-                BuildMetaData = new SemanticVersionBuildMetaData
-                {
-                    Sha = "theSha",
-                    Branch = "TheBranch",
-                    CommitsSinceTag = 5,
-                    OtherMetaData = "TheOtherMetaData"
-                }
-            };
-            Assert.AreEqual("1.2.3-beta4", fullSemVer.ToString("l"));
-        }
-        [Test]
-        public void ToStringLpTests()
+                Sha = "theSha",
+                Branch = "TheBranch",
+                CommitsSinceTag = 5,
+                OtherMetaData = "TheOtherMetaData"
+            }
+        };
+        Assert.AreEqual("1.2.3-beta4", fullSemVer.ToString("l"));
+    }
+    [Test]
+    public void ToStringLpTests()
+    {
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("lp"));
+        Assert.AreEqual("1.2.3-beta0004", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("lp"));
+        var fullSemVer = new SemanticVersion
         {
-            Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("lp"));
-            Assert.AreEqual("1.2.3-beta0004", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("lp"));
-            var fullSemVer = new SemanticVersion
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
+            BuildMetaData = new SemanticVersionBuildMetaData
             {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-                BuildMetaData = new SemanticVersionBuildMetaData
-                {
-                    Sha = "theSha",
-                    Branch = "TheBranch",
-                    CommitsSinceTag = 5,
-                    OtherMetaData = "TheOtherMetaData"
-                }
-            };
-            Assert.AreEqual("1.2.3-beta0004", fullSemVer.ToString("lp"));
-        }
-        [Test]
-        public void ToStringTests()
+                Sha = "theSha",
+                Branch = "TheBranch",
+                CommitsSinceTag = 5,
+                OtherMetaData = "TheOtherMetaData"
+            }
+        };
+        Assert.AreEqual("1.2.3-beta0004", fullSemVer.ToString("lp"));
+    }
+    [Test]
+    public void ToStringTests()
+    {
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString());
+        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString());
+        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4+5", null).ToString());
+        var fullSemVer = new SemanticVersion
         {
-            Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString());
-            Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString());
-            Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4+5", null).ToString());
-            var fullSemVer = new SemanticVersion
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
+            BuildMetaData = new SemanticVersionBuildMetaData
             {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-                BuildMetaData = new SemanticVersionBuildMetaData
-                {
-                    Sha = "theSha",
-                    Branch = "TheBranch",
-                    CommitsSinceTag = 5,
-                    OtherMetaData = "TheOtherMetaData"
-                }
-            };
-            Assert.AreEqual("1.2.3-beta.4", fullSemVer.ToString());
-            var fullSemVerNoPreReleaseName = new SemanticVersion
+                Sha = "theSha",
+                Branch = "TheBranch",
+                CommitsSinceTag = 5,
+                OtherMetaData = "TheOtherMetaData"
+            }
+        };
+        Assert.AreEqual("1.2.3-beta.4", fullSemVer.ToString());
+        var fullSemVerNoPreReleaseName = new SemanticVersion
+        {
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = new SemanticVersionPreReleaseTag("", 4),
+            BuildMetaData = new SemanticVersionBuildMetaData
             {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = new SemanticVersionPreReleaseTag("", 4),
-                BuildMetaData = new SemanticVersionBuildMetaData
-                {
-                    Sha = "theSha",
-                    Branch = "TheBranch",
-                    CommitsSinceTag = 5,
-                    OtherMetaData = "TheOtherMetaData"
-                }
-            };
-            Assert.AreEqual("1.2.3-4", fullSemVerNoPreReleaseName.ToString());
-        }
-        [Test]
-        public void ToStringFTests()
+                Sha = "theSha",
+                Branch = "TheBranch",
+                CommitsSinceTag = 5,
+                OtherMetaData = "TheOtherMetaData"
+            }
+        };
+        Assert.AreEqual("1.2.3-4", fullSemVerNoPreReleaseName.ToString());
+    }
+    [Test]
+    public void ToStringFTests()
+    {
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("f"));
+        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("f"));
+        Assert.AreEqual("1.2.3-beta.4+5", SemanticVersion.Parse("1.2.3-beta.4+5", null).ToString("f"));
+        var fullSemVer = new SemanticVersion
         {
-            Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("f"));
-            Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("f"));
-            Assert.AreEqual("1.2.3-beta.4+5", SemanticVersion.Parse("1.2.3-beta.4+5", null).ToString("f"));
-            var fullSemVer = new SemanticVersion
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
+            BuildMetaData = new SemanticVersionBuildMetaData
             {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-                BuildMetaData = new SemanticVersionBuildMetaData
-                {
-                    Sha = "theSha",
-                    Branch = "TheBranch",
-                    CommitsSinceTag = 5,
-                    OtherMetaData = "TheOtherMetaData"
-                }
-            };
-            Assert.AreEqual("1.2.3-beta.4+5", fullSemVer.ToString("f"));
-        }
-        [Test]
-        public void ToStringITests()
+                Sha = "theSha",
+                Branch = "TheBranch",
+                CommitsSinceTag = 5,
+                OtherMetaData = "TheOtherMetaData"
+            }
+        };
+        Assert.AreEqual("1.2.3-beta.4+5", fullSemVer.ToString("f"));
+    }
+    [Test]
+    public void ToStringITests()
+    {
+        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("i"));
+        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("i"));
+        Assert.AreEqual("1.2.3-beta.4+5", SemanticVersion.Parse("1.2.3-beta.4+5", null).ToString("i"));
+        var fullSemVer = new SemanticVersion
         {
-            Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("i"));
-            Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("i"));
-            Assert.AreEqual("1.2.3-beta.4+5", SemanticVersion.Parse("1.2.3-beta.4+5", null).ToString("i"));
-            var fullSemVer = new SemanticVersion
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
+            BuildMetaData = new SemanticVersionBuildMetaData
             {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-                BuildMetaData = new SemanticVersionBuildMetaData
-                {
-                    Sha = "theSha",
-                    Branch = "TheBranch",
-                    CommitsSinceTag = 5,
-                    OtherMetaData = "TheOtherMetaData"
-                }
-            };
-            Assert.AreEqual("1.2.3-beta.4+5.Branch.TheBranch.Sha.theSha.TheOtherMetaData", fullSemVer.ToString("i"));
-        }
+                Sha = "theSha",
+                Branch = "TheBranch",
+                CommitsSinceTag = 5,
+                OtherMetaData = "TheOtherMetaData"
+            }
+        };
+        Assert.AreEqual("1.2.3-beta.4+5.Branch.TheBranch.Sha.theSha.TheOtherMetaData", fullSemVer.ToString("i"));
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/ShaVersionFilterTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/ShaVersionFilterTests.cs
index 01f862ce58..0a72e6d635 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/ShaVersionFilterTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/ShaVersionFilterTests.cs
@@ -4,53 +4,52 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class ShaVersionFilterTests : TestBase
 {
-    [TestFixture]
-    public class ShaVersionFilterTests : TestBase
+    [Test]
+    public void VerifyNullGuard() => Should.Throw<ArgumentNullException>(() => new ShaVersionFilter(null));
+
+    [Test]
+    public void VerifyNullGuard2()
+    {
+        var commit = GitToolsTestingExtensions.CreateMockCommit();
+        var sut = new ShaVersionFilter(new[] { commit.Sha });
+
+        Should.Throw<ArgumentNullException>(() => sut.Exclude(null, out _));
+    }
+
+    [Test]
+    public void WhenShaMatchShouldExcludeWithReason()
     {
-        [Test]
-        public void VerifyNullGuard() => Should.Throw<ArgumentNullException>(() => new ShaVersionFilter(null));
-
-        [Test]
-        public void VerifyNullGuard2()
-        {
-            var commit = GitToolsTestingExtensions.CreateMockCommit();
-            var sut = new ShaVersionFilter(new[] { commit.Sha });
-
-            Should.Throw<ArgumentNullException>(() => sut.Exclude(null, out _));
-        }
-
-        [Test]
-        public void WhenShaMatchShouldExcludeWithReason()
-        {
-            var commit = GitToolsTestingExtensions.CreateMockCommit();
-            var version = new BaseVersion("dummy", false, new SemanticVersion(1), commit, string.Empty);
-            var sut = new ShaVersionFilter(new[] { commit.Sha });
-
-            sut.Exclude(version, out var reason).ShouldBeTrue();
-            reason.ShouldNotBeNullOrWhiteSpace();
-        }
-
-        [Test]
-        public void WhenShaMismatchShouldNotExclude()
-        {
-            var commit = GitToolsTestingExtensions.CreateMockCommit();
-            var version = new BaseVersion("dummy", false, new SemanticVersion(1), commit, string.Empty);
-            var sut = new ShaVersionFilter(new[] { "mismatched" });
-
-            sut.Exclude(version, out var reason).ShouldBeFalse();
-            reason.ShouldBeNull();
-        }
-
-        [Test]
-        public void ExcludeShouldAcceptVersionWithNullCommit()
-        {
-            var version = new BaseVersion("dummy", false, new SemanticVersion(1), null, string.Empty);
-            var sut = new ShaVersionFilter(new[] { "mismatched" });
-
-            sut.Exclude(version, out var reason).ShouldBeFalse();
-            reason.ShouldBeNull();
-        }
+        var commit = GitToolsTestingExtensions.CreateMockCommit();
+        var version = new BaseVersion("dummy", false, new SemanticVersion(1), commit, string.Empty);
+        var sut = new ShaVersionFilter(new[] { commit.Sha });
+
+        sut.Exclude(version, out var reason).ShouldBeTrue();
+        reason.ShouldNotBeNullOrWhiteSpace();
+    }
+
+    [Test]
+    public void WhenShaMismatchShouldNotExclude()
+    {
+        var commit = GitToolsTestingExtensions.CreateMockCommit();
+        var version = new BaseVersion("dummy", false, new SemanticVersion(1), commit, string.Empty);
+        var sut = new ShaVersionFilter(new[] { "mismatched" });
+
+        sut.Exclude(version, out var reason).ShouldBeFalse();
+        reason.ShouldBeNull();
+    }
+
+    [Test]
+    public void ExcludeShouldAcceptVersionWithNullCommit()
+    {
+        var version = new BaseVersion("dummy", false, new SemanticVersion(1), null, string.Empty);
+        var sut = new ShaVersionFilter(new[] { "mismatched" });
+
+        sut.Exclude(version, out var reason).ShouldBeFalse();
+        reason.ShouldBeNull();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs
index da01f28754..419eac5d04 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs
@@ -6,47 +6,46 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.VersionCalculation.Strategies
+namespace GitVersion.Core.Tests.VersionCalculation.Strategies;
+
+[TestFixture]
+public class ConfigNextVersionBaseVersionStrategyTests : TestBase
 {
-    [TestFixture]
-    public class ConfigNextVersionBaseVersionStrategyTests : TestBase
+    [Test]
+    public void ReturnsNullWhenNoNextVersionIsInConfig()
     {
-        [Test]
-        public void ReturnsNullWhenNoNextVersionIsInConfig()
-        {
-            var baseVersion = GetBaseVersion();
+        var baseVersion = GetBaseVersion();
 
-            baseVersion.ShouldBe(null);
-        }
+        baseVersion.ShouldBe(null);
+    }
 
-        [TestCase("1.0.0", "1.0.0")]
-        [TestCase("2", "2.0.0")]
-        [TestCase("2.118998723", "2.118998723.0")]
-        [TestCase("2.12.654651698", "2.12.654651698")]
-        public void ConfigNextVersionTest(string nextVersion, string expectedVersion)
+    [TestCase("1.0.0", "1.0.0")]
+    [TestCase("2", "2.0.0")]
+    [TestCase("2.118998723", "2.118998723.0")]
+    [TestCase("2.12.654651698", "2.12.654651698")]
+    public void ConfigNextVersionTest(string nextVersion, string expectedVersion)
+    {
+        var baseVersion = GetBaseVersion(new Config
         {
-            var baseVersion = GetBaseVersion(new Config
-            {
-                NextVersion = nextVersion
-            });
+            NextVersion = nextVersion
+        });
 
-            baseVersion.ShouldIncrement.ShouldBe(false);
-            baseVersion.SemanticVersion.ToString().ShouldBe(expectedVersion);
-        }
+        baseVersion.ShouldIncrement.ShouldBe(false);
+        baseVersion.SemanticVersion.ToString().ShouldBe(expectedVersion);
+    }
 
-        private static BaseVersion GetBaseVersion(Config config = null)
-        {
-            var contextBuilder = new GitVersionContextBuilder();
+    private static BaseVersion GetBaseVersion(Config config = null)
+    {
+        var contextBuilder = new GitVersionContextBuilder();
 
-            if (config != null)
-            {
-                contextBuilder = contextBuilder.WithConfig(config);
-            }
+        if (config != null)
+        {
+            contextBuilder = contextBuilder.WithConfig(config);
+        }
 
-            contextBuilder.Build();
-            var strategy = contextBuilder.ServicesProvider.GetServiceForType<IVersionStrategy, ConfigNextVersionVersionStrategy>();
+        contextBuilder.Build();
+        var strategy = contextBuilder.ServicesProvider.GetServiceForType<IVersionStrategy, ConfigNextVersionVersionStrategy>();
 
-            return strategy.GetVersions().SingleOrDefault();
-        }
+        return strategy.GetVersions().SingleOrDefault();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
index bd59e14474..6e8aae0fd7 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
@@ -8,195 +8,194 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.VersionCalculation.Strategies
+namespace GitVersion.Core.Tests.VersionCalculation.Strategies;
+
+[TestFixture]
+public class MergeMessageBaseVersionStrategyTests : TestBase
 {
-    [TestFixture]
-    public class MergeMessageBaseVersionStrategyTests : TestBase
+    [Test]
+    public void ShouldNotAllowIncrementOfVersion()
     {
-        [Test]
-        public void ShouldNotAllowIncrementOfVersion()
-        {
-            // When a branch is merged in you want to start building stable packages of that version
-            // So we shouldn't bump the version
-            var mockCommit = GitToolsTestingExtensions.CreateMockCommit();
-            mockCommit.Message.Returns("Merge branch 'release-0.1.5'");
-            mockCommit.Parents.Returns(GetParents(true));
+        // When a branch is merged in you want to start building stable packages of that version
+        // So we shouldn't bump the version
+        var mockCommit = GitToolsTestingExtensions.CreateMockCommit();
+        mockCommit.Message.Returns("Merge branch 'release-0.1.5'");
+        mockCommit.Parents.Returns(GetParents(true));
 
-            var mockBranch = GitToolsTestingExtensions.CreateMockBranch(MainBranch, mockCommit);
-            var branches = Substitute.For<IBranchCollection>();
-            branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { mockBranch }).GetEnumerator());
+        var mockBranch = GitToolsTestingExtensions.CreateMockBranch(MainBranch, mockCommit);
+        var branches = Substitute.For<IBranchCollection>();
+        branches.GetEnumerator().Returns(_ => ((IEnumerable<IBranch>)new[] { mockBranch }).GetEnumerator());
 
-            var mockRepository = Substitute.For<IGitRepository>();
-            mockRepository.Head.Returns(mockBranch);
-            mockRepository.Branches.Returns(branches);
-            mockRepository.Commits.Returns(mockBranch.Commits);
+        var mockRepository = Substitute.For<IGitRepository>();
+        mockRepository.Head.Returns(mockBranch);
+        mockRepository.Branches.Returns(branches);
+        mockRepository.Commits.Returns(mockBranch.Commits);
 
-            var contextBuilder = new GitVersionContextBuilder().WithRepository(mockRepository);
-            contextBuilder.Build();
-            var strategy = contextBuilder.ServicesProvider.GetServiceForType<IVersionStrategy, MergeMessageVersionStrategy>();
+        var contextBuilder = new GitVersionContextBuilder().WithRepository(mockRepository);
+        contextBuilder.Build();
+        var strategy = contextBuilder.ServicesProvider.GetServiceForType<IVersionStrategy, MergeMessageVersionStrategy>();
 
-            var baseVersion = strategy.GetVersions().Single();
+        var baseVersion = strategy.GetVersions().Single();
 
-            baseVersion.ShouldIncrement.ShouldBe(false);
-        }
+        baseVersion.ShouldIncrement.ShouldBe(false);
+    }
 
-        [TestCase("Merge branch 'release-10.10.50'", true, "10.10.50")]
-        [TestCase("Merge branch 'release-0.2.0'", true, "0.2.0")]
-        [TestCase("Merge branch 'Release-0.2.0'", true, "0.2.0")]
-        [TestCase("Merge branch 'Release/0.2.0'", true, "0.2.0")]
-        [TestCase("Merge branch 'releases-0.2.0'", true, "0.2.0")]
-        [TestCase("Merge branch 'Releases-0.2.0'", true, "0.2.0")]
-        [TestCase("Merge branch 'Releases/0.2.0'", true, "0.2.0")]
-        [TestCase("Merge branch 'release-4.6.6' into support-4.6", true, "4.6.6")]
-        [TestCase("Merge branch 'release-0.1.5'\n\nRelates to: TicketId", true, "0.1.5")]
-        [TestCase("Finish Release-0.12.0", true, "0.12.0")] //Support Syntevo SmartGit/Hg's Gitflow merge commit messages for finishing a 'Release' branch
-        [TestCase("Merge branch 'Release-v0.2.0'", true, "0.2.0")]
-        [TestCase("Merge branch 'Release-v2.2'", true, "2.2.0")]
-        [TestCase("Merge remote-tracking branch 'origin/release/0.8.0' into develop/" + MainBranch, true, "0.8.0")]
-        [TestCase("Merge remote-tracking branch 'refs/remotes/origin/release/2.0.0'", true, "2.0.0")]
-        public void TakesVersionFromMergeOfReleaseBranch(string message, bool isMergeCommit, string expectedVersion)
-        {
-            var parents = GetParents(isMergeCommit);
-            AssertMergeMessage(message, expectedVersion, parents);
-            AssertMergeMessage(message + " ", expectedVersion, parents);
-            AssertMergeMessage(message + "\r ", expectedVersion, parents);
-            AssertMergeMessage(message + "\r", expectedVersion, parents);
-            AssertMergeMessage(message + "\r\n", expectedVersion, parents);
-            AssertMergeMessage(message + "\r\n ", expectedVersion, parents);
-            AssertMergeMessage(message + "\n", expectedVersion, parents);
-            AssertMergeMessage(message + "\n ", expectedVersion, parents);
-        }
+    [TestCase("Merge branch 'release-10.10.50'", true, "10.10.50")]
+    [TestCase("Merge branch 'release-0.2.0'", true, "0.2.0")]
+    [TestCase("Merge branch 'Release-0.2.0'", true, "0.2.0")]
+    [TestCase("Merge branch 'Release/0.2.0'", true, "0.2.0")]
+    [TestCase("Merge branch 'releases-0.2.0'", true, "0.2.0")]
+    [TestCase("Merge branch 'Releases-0.2.0'", true, "0.2.0")]
+    [TestCase("Merge branch 'Releases/0.2.0'", true, "0.2.0")]
+    [TestCase("Merge branch 'release-4.6.6' into support-4.6", true, "4.6.6")]
+    [TestCase("Merge branch 'release-0.1.5'\n\nRelates to: TicketId", true, "0.1.5")]
+    [TestCase("Finish Release-0.12.0", true, "0.12.0")] //Support Syntevo SmartGit/Hg's Gitflow merge commit messages for finishing a 'Release' branch
+    [TestCase("Merge branch 'Release-v0.2.0'", true, "0.2.0")]
+    [TestCase("Merge branch 'Release-v2.2'", true, "2.2.0")]
+    [TestCase("Merge remote-tracking branch 'origin/release/0.8.0' into develop/" + MainBranch, true, "0.8.0")]
+    [TestCase("Merge remote-tracking branch 'refs/remotes/origin/release/2.0.0'", true, "2.0.0")]
+    public void TakesVersionFromMergeOfReleaseBranch(string message, bool isMergeCommit, string expectedVersion)
+    {
+        var parents = GetParents(isMergeCommit);
+        AssertMergeMessage(message, expectedVersion, parents);
+        AssertMergeMessage(message + " ", expectedVersion, parents);
+        AssertMergeMessage(message + "\r ", expectedVersion, parents);
+        AssertMergeMessage(message + "\r", expectedVersion, parents);
+        AssertMergeMessage(message + "\r\n", expectedVersion, parents);
+        AssertMergeMessage(message + "\r\n ", expectedVersion, parents);
+        AssertMergeMessage(message + "\n", expectedVersion, parents);
+        AssertMergeMessage(message + "\n ", expectedVersion, parents);
+    }
 
-        [TestCase("Merge branch 'hotfix-0.1.5'", false)]
-        [TestCase("Merge branch 'develop' of github.com:Particular/NServiceBus into develop", true)]
-        [TestCase("Merge branch '4.0.3'", true)]
-        [TestCase("Merge branch 's'", true)]
-        [TestCase("Merge tag '10.10.50'", true)]
-        [TestCase("Merge branch 'hotfix-4.6.6' into support-4.6", true)]
-        [TestCase("Merge branch 'hotfix-10.10.50'", true)]
-        [TestCase("Merge branch 'Hotfix-10.10.50'", true)]
-        [TestCase("Merge branch 'Hotfix/10.10.50'", true)]
-        [TestCase("Merge branch 'hotfix-0.1.5'", true)]
-        [TestCase("Merge branch 'hotfix-4.2.2' into support-4.2", true)]
-        [TestCase("Merge branch 'somebranch' into release-3.0.0", true)]
-        [TestCase("Merge branch 'hotfix-0.1.5'\n\nRelates to: TicketId", true)]
-        [TestCase("Merge branch 'alpha-0.1.5'", true)]
-        [TestCase("Merge pull request #95 from Particular/issue-94", false)]
-        [TestCase("Merge pull request #95 in Particular/issue-94", true)]
-        [TestCase("Merge pull request #95 in Particular/issue-94", false)]
-        [TestCase("Merge pull request #64 from arledesma/feature-VS2013_3rd_party_test_framework_support", true)]
-        [TestCase("Merge pull request #500 in FOO/bar from Particular/release-1.0.0 to develop)", true)]
-        [TestCase("Merge pull request #500 in FOO/bar from feature/new-service to develop)", true)]
-        [TestCase("Finish 0.14.1", true)] // Don't support Syntevo SmartGit/Hg's Gitflow merge commit messages for finishing a 'Hotfix' branch
-        public void ShouldNotTakeVersionFromMergeOfNonReleaseBranch(string message, bool isMergeCommit)
-        {
-            var parents = GetParents(isMergeCommit);
-            AssertMergeMessage(message, null, parents);
-            AssertMergeMessage(message + " ", null, parents);
-            AssertMergeMessage(message + "\r ", null, parents);
-            AssertMergeMessage(message + "\r", null, parents);
-            AssertMergeMessage(message + "\r\n", null, parents);
-            AssertMergeMessage(message + "\r\n ", null, parents);
-            AssertMergeMessage(message + "\n", null, parents);
-            AssertMergeMessage(message + "\n ", null, parents);
-        }
+    [TestCase("Merge branch 'hotfix-0.1.5'", false)]
+    [TestCase("Merge branch 'develop' of github.com:Particular/NServiceBus into develop", true)]
+    [TestCase("Merge branch '4.0.3'", true)]
+    [TestCase("Merge branch 's'", true)]
+    [TestCase("Merge tag '10.10.50'", true)]
+    [TestCase("Merge branch 'hotfix-4.6.6' into support-4.6", true)]
+    [TestCase("Merge branch 'hotfix-10.10.50'", true)]
+    [TestCase("Merge branch 'Hotfix-10.10.50'", true)]
+    [TestCase("Merge branch 'Hotfix/10.10.50'", true)]
+    [TestCase("Merge branch 'hotfix-0.1.5'", true)]
+    [TestCase("Merge branch 'hotfix-4.2.2' into support-4.2", true)]
+    [TestCase("Merge branch 'somebranch' into release-3.0.0", true)]
+    [TestCase("Merge branch 'hotfix-0.1.5'\n\nRelates to: TicketId", true)]
+    [TestCase("Merge branch 'alpha-0.1.5'", true)]
+    [TestCase("Merge pull request #95 from Particular/issue-94", false)]
+    [TestCase("Merge pull request #95 in Particular/issue-94", true)]
+    [TestCase("Merge pull request #95 in Particular/issue-94", false)]
+    [TestCase("Merge pull request #64 from arledesma/feature-VS2013_3rd_party_test_framework_support", true)]
+    [TestCase("Merge pull request #500 in FOO/bar from Particular/release-1.0.0 to develop)", true)]
+    [TestCase("Merge pull request #500 in FOO/bar from feature/new-service to develop)", true)]
+    [TestCase("Finish 0.14.1", true)] // Don't support Syntevo SmartGit/Hg's Gitflow merge commit messages for finishing a 'Hotfix' branch
+    public void ShouldNotTakeVersionFromMergeOfNonReleaseBranch(string message, bool isMergeCommit)
+    {
+        var parents = GetParents(isMergeCommit);
+        AssertMergeMessage(message, null, parents);
+        AssertMergeMessage(message + " ", null, parents);
+        AssertMergeMessage(message + "\r ", null, parents);
+        AssertMergeMessage(message + "\r", null, parents);
+        AssertMergeMessage(message + "\r\n", null, parents);
+        AssertMergeMessage(message + "\r\n ", null, parents);
+        AssertMergeMessage(message + "\n", null, parents);
+        AssertMergeMessage(message + "\n ", null, parents);
+    }
 
-        [TestCase("Merge pull request #165 from Particular/release-1.0.0", true)]
-        [TestCase("Merge pull request #165 in Particular/release-1.0.0", true)]
-        [TestCase("Merge pull request #500 in FOO/bar from Particular/release-1.0.0 to develop)", true)]
-        public void ShouldNotTakeVersionFromMergeOfReleaseBranchWithRemoteOtherThanOrigin(string message, bool isMergeCommit)
-        {
-            var parents = GetParents(isMergeCommit);
-            AssertMergeMessage(message, null, parents);
-            AssertMergeMessage(message + " ", null, parents);
-            AssertMergeMessage(message + "\r ", null, parents);
-            AssertMergeMessage(message + "\r", null, parents);
-            AssertMergeMessage(message + "\r\n", null, parents);
-            AssertMergeMessage(message + "\r\n ", null, parents);
-            AssertMergeMessage(message + "\n", null, parents);
-            AssertMergeMessage(message + "\n ", null, parents);
-        }
+    [TestCase("Merge pull request #165 from Particular/release-1.0.0", true)]
+    [TestCase("Merge pull request #165 in Particular/release-1.0.0", true)]
+    [TestCase("Merge pull request #500 in FOO/bar from Particular/release-1.0.0 to develop)", true)]
+    public void ShouldNotTakeVersionFromMergeOfReleaseBranchWithRemoteOtherThanOrigin(string message, bool isMergeCommit)
+    {
+        var parents = GetParents(isMergeCommit);
+        AssertMergeMessage(message, null, parents);
+        AssertMergeMessage(message + " ", null, parents);
+        AssertMergeMessage(message + "\r ", null, parents);
+        AssertMergeMessage(message + "\r", null, parents);
+        AssertMergeMessage(message + "\r\n", null, parents);
+        AssertMergeMessage(message + "\r\n ", null, parents);
+        AssertMergeMessage(message + "\n", null, parents);
+        AssertMergeMessage(message + "\n ", null, parents);
+    }
 
-        [TestCase(@"Merge pull request #1 in FOO/bar from feature/ISSUE-1 to develop
+    [TestCase(@"Merge pull request #1 in FOO/bar from feature/ISSUE-1 to develop
 
 * commit '38560a7eed06e8d3f3f1aaf091befcdf8bf50fea':
   Updated jQuery to v2.1.3")]
-        [TestCase(@"Merge pull request #45 in BRIKKS/brikks from feature/NOX-68 to develop
+    [TestCase(@"Merge pull request #45 in BRIKKS/brikks from feature/NOX-68 to develop
 
 * commit '38560a7eed06e8d3f3f1aaf091befcdf8bf50fea':
   Another commit message
   Commit message including a IP-number https://10.50.1.1
   A commit message")]
-        [TestCase(@"Merge branch 'release/Sprint_2.0_Holdings_Computed_Balances'")]
-        [TestCase(@"Merge branch 'develop' of http://10.0.6.3/gitblit/r/... into develop")]
-        [TestCase(@"Merge branch " + MainBranch + @" of http://172.16.3.10:8082/r/asu_tk/p_sd")]
-        [TestCase(@"Merge branch " + MainBranch + @" of http://212.248.89.56:8082/r/asu_tk/p_sd")]
-        [TestCase(@"Merge branch 'DEMO' of http://10.10.10.121/gitlab/mtolland/orcid into DEMO")]
-        public void ShouldNotTakeVersionFromUnrelatedMerge(string commitMessage)
-        {
-            var parents = GetParents(true);
+    [TestCase(@"Merge branch 'release/Sprint_2.0_Holdings_Computed_Balances'")]
+    [TestCase(@"Merge branch 'develop' of http://10.0.6.3/gitblit/r/... into develop")]
+    [TestCase(@"Merge branch " + MainBranch + @" of http://172.16.3.10:8082/r/asu_tk/p_sd")]
+    [TestCase(@"Merge branch " + MainBranch + @" of http://212.248.89.56:8082/r/asu_tk/p_sd")]
+    [TestCase(@"Merge branch 'DEMO' of http://10.10.10.121/gitlab/mtolland/orcid into DEMO")]
+    public void ShouldNotTakeVersionFromUnrelatedMerge(string commitMessage)
+    {
+        var parents = GetParents(true);
 
-            AssertMergeMessage(commitMessage, null, parents);
-        }
+        AssertMergeMessage(commitMessage, null, parents);
+    }
 
-        [TestCase("Merge branch 'support/0.2.0'", "support", "0.2.0")]
-        [TestCase("Merge branch 'support/0.2.0'", null, null)]
-        [TestCase("Merge branch 'release/2.0.0'", null, "2.0.0")]
-        public void TakesVersionFromMergeOfConfiguredReleaseBranch(string message, string releaseBranch, string expectedVersion)
-        {
-            var config = new Config();
-            if (releaseBranch != null) config.Branches[releaseBranch] = new BranchConfig { IsReleaseBranch = true };
-            var parents = GetParents(true);
+    [TestCase("Merge branch 'support/0.2.0'", "support", "0.2.0")]
+    [TestCase("Merge branch 'support/0.2.0'", null, null)]
+    [TestCase("Merge branch 'release/2.0.0'", null, "2.0.0")]
+    public void TakesVersionFromMergeOfConfiguredReleaseBranch(string message, string releaseBranch, string expectedVersion)
+    {
+        var config = new Config();
+        if (releaseBranch != null) config.Branches[releaseBranch] = new BranchConfig { IsReleaseBranch = true };
+        var parents = GetParents(true);
 
-            AssertMergeMessage(message, expectedVersion, parents, config);
-        }
+        AssertMergeMessage(message, expectedVersion, parents, config);
+    }
 
-        private static void AssertMergeMessage(string message, string expectedVersion, IEnumerable<ICommit> parents, Config config = null)
-        {
-            var commit = GitToolsTestingExtensions.CreateMockCommit();
-            commit.Message.Returns(message);
-            commit.Parents.Returns(parents);
+    private static void AssertMergeMessage(string message, string expectedVersion, IEnumerable<ICommit> parents, Config config = null)
+    {
+        var commit = GitToolsTestingExtensions.CreateMockCommit();
+        commit.Message.Returns(message);
+        commit.Parents.Returns(parents);
 
-            var mockBranch = GitToolsTestingExtensions.CreateMockBranch(MainBranch, commit, GitToolsTestingExtensions.CreateMockCommit());
+        var mockBranch = GitToolsTestingExtensions.CreateMockBranch(MainBranch, commit, GitToolsTestingExtensions.CreateMockCommit());
 
-            var mockRepository = Substitute.For<IGitRepository>();
-            mockRepository.Head.Returns(mockBranch);
-            mockRepository.Commits.Returns(mockBranch.Commits);
+        var mockRepository = Substitute.For<IGitRepository>();
+        mockRepository.Head.Returns(mockBranch);
+        mockRepository.Commits.Returns(mockBranch.Commits);
 
-            var contextBuilder = new GitVersionContextBuilder()
-                .WithConfig(config ?? new Config())
-                .WithRepository(mockRepository);
-            contextBuilder.Build();
-            var strategy = contextBuilder.ServicesProvider.GetServiceForType<IVersionStrategy, MergeMessageVersionStrategy>();
+        var contextBuilder = new GitVersionContextBuilder()
+            .WithConfig(config ?? new Config())
+            .WithRepository(mockRepository);
+        contextBuilder.Build();
+        var strategy = contextBuilder.ServicesProvider.GetServiceForType<IVersionStrategy, MergeMessageVersionStrategy>();
 
-            var baseVersion = strategy.GetVersions().SingleOrDefault();
+        var baseVersion = strategy.GetVersions().SingleOrDefault();
 
-            if (expectedVersion == null)
-            {
-                baseVersion.ShouldBe(null);
-            }
-            else
-            {
-                baseVersion.ShouldNotBeNull();
-                baseVersion.SemanticVersion.ToString().ShouldBe(expectedVersion);
-            }
+        if (expectedVersion == null)
+        {
+            baseVersion.ShouldBe(null);
         }
-
-        private static List<ICommit> GetParents(bool isMergeCommit)
+        else
         {
-            if (isMergeCommit)
-            {
-                return new List<ICommit>
-                {
-                    null,
-                    null
-                };
-            }
+            baseVersion.ShouldNotBeNull();
+            baseVersion.SemanticVersion.ToString().ShouldBe(expectedVersion);
+        }
+    }
 
+    private static List<ICommit> GetParents(bool isMergeCommit)
+    {
+        if (isMergeCommit)
+        {
             return new List<ICommit>
             {
+                null,
                 null
             };
         }
+
+        return new List<ICommit>
+        {
+            null
+        };
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs
index 7907fcd4ef..20bba2f98c 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs
@@ -9,82 +9,81 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests.VersionCalculation.Strategies
+namespace GitVersion.Core.Tests.VersionCalculation.Strategies;
+
+[TestFixture]
+public class VersionInBranchNameBaseVersionStrategyTests : TestBase
 {
-    [TestFixture]
-    public class VersionInBranchNameBaseVersionStrategyTests : TestBase
+    [TestCase("release-2.0.0", "2.0.0")]
+    [TestCase("release/3.0.0", "3.0.0")]
+    public void CanTakeVersionFromNameOfReleaseBranch(string branchName, string expectedBaseVersion)
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.CreateBranch(branchName);
+
+        var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), branchName);
+        var baseVersion = strategy.GetVersions().Single();
+
+        baseVersion.SemanticVersion.ToString().ShouldBe(expectedBaseVersion);
+    }
+
+    [TestCase("hotfix-2.0.0")]
+    [TestCase("hotfix/2.0.0")]
+    [TestCase("custom/JIRA-123")]
+    [TestCase("hotfix/downgrade-to-gitversion-3.6.5-to-fix-miscalculated-version")]
+    public void ShouldNotTakeVersionFromNameOfNonReleaseBranch(string branchName)
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.CreateBranch(branchName);
+
+        var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), branchName);
+        var baseVersions = strategy.GetVersions();
+
+        baseVersions.ShouldBeEmpty();
+    }
+
+    [TestCase("support/lts-2.0.0", "2.0.0")]
+    [TestCase("support-3.0.0-lts", "3.0.0")]
+    public void CanTakeVersionFromNameOfConfiguredReleaseBranch(string branchName, string expectedBaseVersion)
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.CreateBranch(branchName);
+
+        var config = new ConfigurationBuilder()
+            .Add(new Config { Branches = { { "support", new BranchConfig { IsReleaseBranch = true } } } })
+            .Build();
+
+        var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), branchName, config);
+
+        var baseVersion = strategy.GetVersions().Single();
+
+        baseVersion.SemanticVersion.ToString().ShouldBe(expectedBaseVersion);
+    }
+
+    [TestCase("release-2.0.0", "2.0.0")]
+    [TestCase("release/3.0.0", "3.0.0")]
+    public void CanTakeVersionFromNameOfRemoteReleaseBranch(string branchName, string expectedBaseVersion)
+    {
+        using var fixture = new RemoteRepositoryFixture();
+        var branch = fixture.Repository.CreateBranch(branchName);
+        Commands.Checkout(fixture.Repository, branch);
+        fixture.MakeACommit();
+
+        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
+        fixture.LocalRepositoryFixture.Checkout($"origin/{branchName}");
+
+        var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), branchName);
+        var baseVersion = strategy.GetVersions().Single();
+
+        baseVersion.SemanticVersion.ToString().ShouldBe(expectedBaseVersion);
+    }
+
+    private static IVersionStrategy GetVersionStrategy(string workingDirectory, IGitRepository repository, string branch, Config config = null)
     {
-        [TestCase("release-2.0.0", "2.0.0")]
-        [TestCase("release/3.0.0", "3.0.0")]
-        public void CanTakeVersionFromNameOfReleaseBranch(string branchName, string expectedBaseVersion)
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.CreateBranch(branchName);
-
-            var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), branchName);
-            var baseVersion = strategy.GetVersions().Single();
-
-            baseVersion.SemanticVersion.ToString().ShouldBe(expectedBaseVersion);
-        }
-
-        [TestCase("hotfix-2.0.0")]
-        [TestCase("hotfix/2.0.0")]
-        [TestCase("custom/JIRA-123")]
-        [TestCase("hotfix/downgrade-to-gitversion-3.6.5-to-fix-miscalculated-version")]
-        public void ShouldNotTakeVersionFromNameOfNonReleaseBranch(string branchName)
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.CreateBranch(branchName);
-
-            var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), branchName);
-            var baseVersions = strategy.GetVersions();
-
-            baseVersions.ShouldBeEmpty();
-        }
-
-        [TestCase("support/lts-2.0.0", "2.0.0")]
-        [TestCase("support-3.0.0-lts", "3.0.0")]
-        public void CanTakeVersionFromNameOfConfiguredReleaseBranch(string branchName, string expectedBaseVersion)
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.CreateBranch(branchName);
-
-            var config = new ConfigurationBuilder()
-                         .Add(new Config { Branches = { { "support", new BranchConfig { IsReleaseBranch = true } } } })
-                         .Build();
-
-            var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), branchName, config);
-
-            var baseVersion = strategy.GetVersions().Single();
-
-            baseVersion.SemanticVersion.ToString().ShouldBe(expectedBaseVersion);
-        }
-
-        [TestCase("release-2.0.0", "2.0.0")]
-        [TestCase("release/3.0.0", "3.0.0")]
-        public void CanTakeVersionFromNameOfRemoteReleaseBranch(string branchName, string expectedBaseVersion)
-        {
-            using var fixture = new RemoteRepositoryFixture();
-            var branch = fixture.Repository.CreateBranch(branchName);
-            Commands.Checkout(fixture.Repository, branch);
-            fixture.MakeACommit();
-
-            Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
-            fixture.LocalRepositoryFixture.Checkout($"origin/{branchName}");
-
-            var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), branchName);
-            var baseVersion = strategy.GetVersions().Single();
-
-            baseVersion.SemanticVersion.ToString().ShouldBe(expectedBaseVersion);
-        }
-
-        private static IVersionStrategy GetVersionStrategy(string workingDirectory, IGitRepository repository, string branch, Config config = null)
-        {
-            var sp = BuildServiceProvider(workingDirectory, repository, branch, config);
-            return sp.GetServiceForType<IVersionStrategy, VersionInBranchNameVersionStrategy>();
-        }
+        var sp = BuildServiceProvider(workingDirectory, repository, branch, config);
+        return sp.GetServiceForType<IVersionStrategy, VersionInBranchNameVersionStrategy>();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/TestBaseVersionCalculator.cs b/src/GitVersion.Core.Tests/VersionCalculation/TestBaseVersionCalculator.cs
index 579ccf6ae3..42ec6e1cf0 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/TestBaseVersionCalculator.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/TestBaseVersionCalculator.cs
@@ -1,20 +1,19 @@
 using GitVersion.VersionCalculation;
 
-namespace GitVersion.Core.Tests.VersionCalculation
-{
-    public class TestBaseVersionCalculator : IBaseVersionCalculator
-    {
-        private readonly SemanticVersion semanticVersion;
-        private readonly bool shouldIncrement;
-        private readonly ICommit source;
+namespace GitVersion.Core.Tests.VersionCalculation;
 
-        public TestBaseVersionCalculator(bool shouldIncrement, SemanticVersion semanticVersion, ICommit source)
-        {
-            this.semanticVersion = semanticVersion;
-            this.source = source;
-            this.shouldIncrement = shouldIncrement;
-        }
+public class TestBaseVersionCalculator : IBaseVersionCalculator
+{
+    private readonly SemanticVersion semanticVersion;
+    private readonly bool shouldIncrement;
+    private readonly ICommit source;
 
-        public BaseVersion GetBaseVersion() => new("Test source", this.shouldIncrement, this.semanticVersion, this.source, null);
+    public TestBaseVersionCalculator(bool shouldIncrement, SemanticVersion semanticVersion, ICommit source)
+    {
+        this.semanticVersion = semanticVersion;
+        this.source = source;
+        this.shouldIncrement = shouldIncrement;
     }
-}
+
+    public BaseVersion GetBaseVersion() => new("Test source", this.shouldIncrement, this.semanticVersion, this.source, null);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/TestMainlineVersionCalculator.cs b/src/GitVersion.Core.Tests/VersionCalculation/TestMainlineVersionCalculator.cs
index 5cc446e8c5..5fa0305c27 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/TestMainlineVersionCalculator.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/TestMainlineVersionCalculator.cs
@@ -1,15 +1,14 @@
 using GitVersion.VersionCalculation;
 
-namespace GitVersion.Core.Tests.VersionCalculation
+namespace GitVersion.Core.Tests.VersionCalculation;
+
+public class TestMainlineVersionCalculator : IMainlineVersionCalculator
 {
-    public class TestMainlineVersionCalculator : IMainlineVersionCalculator
-    {
-        private readonly SemanticVersionBuildMetaData metaData;
+    private readonly SemanticVersionBuildMetaData metaData;
 
-        public TestMainlineVersionCalculator(SemanticVersionBuildMetaData metaData) => this.metaData = metaData;
+    public TestMainlineVersionCalculator(SemanticVersionBuildMetaData metaData) => this.metaData = metaData;
 
-        public SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion) => throw new System.NotImplementedException();
+    public SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion) => throw new System.NotImplementedException();
 
-        public SemanticVersionBuildMetaData CreateVersionBuildMetaData(ICommit baseVersionSource) => this.metaData;
-    }
-}
+    public SemanticVersionBuildMetaData CreateVersionBuildMetaData(ICommit baseVersionSource) => this.metaData;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs
index 32ce031268..506dd0bb50 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs
@@ -7,303 +7,302 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class VariableProviderTests : TestBase
 {
-    [TestFixture]
-    public class VariableProviderTests : TestBase
-    {
-        private IVariableProvider variableProvider;
-        private List<string> logMessages;
+    private IVariableProvider variableProvider;
+    private List<string> logMessages;
 
-        [SetUp]
-        public void Setup()
-        {
-            ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
+    [SetUp]
+    public void Setup()
+    {
+        ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
 
-            this.logMessages = new List<string>();
+        this.logMessages = new List<string>();
 
-            var sp = ConfigureServices(services =>
-            {
-                var log = new Log(new TestLogAppender(this.logMessages.Add));
-                services.AddSingleton<ILog>(log);
-            });
+        var sp = ConfigureServices(services =>
+        {
+            var log = new Log(new TestLogAppender(this.logMessages.Add));
+            services.AddSingleton<ILog>(log);
+        });
 
-            this.variableProvider = sp.GetService<IVariableProvider>();
-        }
+        this.variableProvider = sp.GetService<IVariableProvider>();
+    }
 
-        [Test]
-        public void ShouldLogWarningWhenUsingDefaultInformationalVersionInCustomFormat()
+    [Test]
+    public void ShouldLogWarningWhenUsingDefaultInformationalVersionInCustomFormat()
+    {
+        var semVer = new SemanticVersion
         {
-            var semVer = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-            };
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+        };
 
 #pragma warning disable CS0618 // Type or member is obsolete
-            var propertyName = nameof(SemanticVersionFormatValues.DefaultInformationalVersion);
+        var propertyName = nameof(SemanticVersionFormatValues.DefaultInformationalVersion);
 #pragma warning restore CS0618 // Type or member is obsolete
-            var config = new TestEffectiveConfiguration(assemblyInformationalFormat: $"{{{propertyName}}}");
-            this.variableProvider.GetVariablesFor(semVer, config, false);
-            this.logMessages.ShouldContain(message => message.Trim().StartsWith("WARN") && message.Contains(propertyName), 1, $"Expected a warning to be logged when using the variable {propertyName} in a configuration format template");
-        }
-
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void ProvidesVariablesInContinuousDeliveryModeForPreRelease()
+        var config = new TestEffectiveConfiguration(assemblyInformationalFormat: $"{{{propertyName}}}");
+        this.variableProvider.GetVariablesFor(semVer, config, false);
+        this.logMessages.ShouldContain(message => message.Trim().StartsWith("WARN") && message.Contains(propertyName), 1, $"Expected a warning to be logged when using the variable {propertyName} in a configuration format template");
+    }
+
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void ProvidesVariablesInContinuousDeliveryModeForPreRelease()
+    {
+        var semVer = new SemanticVersion
         {
-            var semVer = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = "unstable.4",
-                BuildMetaData = "5.Branch.develop"
-            };
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = "unstable.4",
+            BuildMetaData = "5.Branch.develop"
+        };
 
-            semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
-            semVer.BuildMetaData.Sha = "commitSha";
-            semVer.BuildMetaData.ShortSha = "commitShortSha";
-            semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
+        semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
+        semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
+        semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
 
-            var config = new TestEffectiveConfiguration();
+        var config = new TestEffectiveConfiguration();
 
-            var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
+        var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
 
-            vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
-        }
+        vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
+    }
 
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding()
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding()
+    {
+        var semVer = new SemanticVersion
         {
-            var semVer = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = "unstable.4",
-                BuildMetaData = "5.Branch.develop"
-            };
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = "unstable.4",
+            BuildMetaData = "5.Branch.develop"
+        };
 
-            semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
-            semVer.BuildMetaData.Sha = "commitSha";
-            semVer.BuildMetaData.ShortSha = "commitShortSha";
-            semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
+        semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
+        semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
+        semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
 
-            var config = new TestEffectiveConfiguration(buildMetaDataPadding: 2, legacySemVerPadding: 5);
+        var config = new TestEffectiveConfiguration(buildMetaDataPadding: 2, legacySemVerPadding: 5);
 
-            var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
+        var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
 
-            vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
-        }
+        vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
+    }
 
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void ProvidesVariablesInContinuousDeploymentModeForPreRelease()
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void ProvidesVariablesInContinuousDeploymentModeForPreRelease()
+    {
+        var semVer = new SemanticVersion
         {
-            var semVer = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = "unstable.4",
-                BuildMetaData = "5.Branch.develop"
-            };
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = "unstable.4",
+            BuildMetaData = "5.Branch.develop"
+        };
 
-            semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
-            semVer.BuildMetaData.Sha = "commitSha";
-            semVer.BuildMetaData.ShortSha = "commitShortSha";
-            semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
+        semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
+        semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
+        semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
-            var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment);
+        var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment);
 
-            var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
+        var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
 
-            vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
-        }
+        vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
+    }
 
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void ProvidesVariablesInContinuousDeliveryModeForStable()
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void ProvidesVariablesInContinuousDeliveryModeForStable()
+    {
+        var semVer = new SemanticVersion
         {
-            var semVer = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                BuildMetaData = "5.Branch.develop"
-            };
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            BuildMetaData = "5.Branch.develop"
+        };
 
-            semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
-            semVer.BuildMetaData.Sha = "commitSha";
-            semVer.BuildMetaData.ShortSha = "commitShortSha";
-            semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
+        semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
+        semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
+        semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
-            var config = new TestEffectiveConfiguration();
+        var config = new TestEffectiveConfiguration();
 
-            var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
+        var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
 
-            vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
-        }
+        vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
+    }
 
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void ProvidesVariablesInContinuousDeploymentModeForStable()
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void ProvidesVariablesInContinuousDeploymentModeForStable()
+    {
+        var semVer = new SemanticVersion
         {
-            var semVer = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                BuildMetaData = "5.Branch.develop"
-            };
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            BuildMetaData = "5.Branch.develop"
+        };
 
-            semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
-            semVer.BuildMetaData.Sha = "commitSha";
-            semVer.BuildMetaData.ShortSha = "commitShortSha";
-            semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
+        semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
+        semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
+        semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
-            var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment);
+        var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment);
 
-            var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
+        var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
 
-            vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
-        }
+        vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
+    }
 
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged()
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged()
+    {
+        var semVer = new SemanticVersion
         {
-            var semVer = new SemanticVersion
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            BuildMetaData =
             {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                BuildMetaData =
-                {
-                    VersionSourceSha = "versionSourceSha",
-                    CommitsSinceTag = 5,
-                    CommitsSinceVersionSource = 5,
-                    Sha = "commitSha",
-                    ShortSha = "commitShortSha",
-                    CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
-                }
-            };
-
-            var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment);
-
-            var vars = this.variableProvider.GetVariablesFor(semVer, config, true);
-
-            vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
-        }
-
-        [Test]
-        public void ProvidesVariablesInContinuousDeploymentModeWithTagNamePattern()
+                VersionSourceSha = "versionSourceSha",
+                CommitsSinceTag = 5,
+                CommitsSinceVersionSource = 5,
+                Sha = "commitSha",
+                ShortSha = "commitShortSha",
+                CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z")
+            }
+        };
+
+        var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment);
+
+        var vars = this.variableProvider.GetVariablesFor(semVer, config, true);
+
+        vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
+    }
+
+    [Test]
+    public void ProvidesVariablesInContinuousDeploymentModeWithTagNamePattern()
+    {
+        var semVer = new SemanticVersion
         {
-            var semVer = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = "PullRequest",
-                BuildMetaData = "5.Branch.develop"
-            };
-
-            semVer.BuildMetaData.Branch = "pull/2/merge";
-            semVer.BuildMetaData.Sha = "commitSha";
-            semVer.BuildMetaData.ShortSha = "commitShortSha";
-            semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
-
-            var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment, tagNumberPattern: @"[/-](?<number>\d+)[-/]");
-            var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
-
-            vars.FullSemVer.ShouldBe("1.2.3-PullRequest0002.5");
-        }
-
-        [Test]
-        public void ProvidesVariablesInContinuousDeploymentModeWithTagSetToUseBranchName()
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = "PullRequest",
+            BuildMetaData = "5.Branch.develop"
+        };
+
+        semVer.BuildMetaData.Branch = "pull/2/merge";
+        semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
+        semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
+
+        var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment, tagNumberPattern: @"[/-](?<number>\d+)[-/]");
+        var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
+
+        vars.FullSemVer.ShouldBe("1.2.3-PullRequest0002.5");
+    }
+
+    [Test]
+    public void ProvidesVariablesInContinuousDeploymentModeWithTagSetToUseBranchName()
+    {
+        var semVer = new SemanticVersion
         {
-            var semVer = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                BuildMetaData = "5.Branch.develop"
-            };
-
-            semVer.BuildMetaData.Branch = "feature";
-            semVer.BuildMetaData.Sha = "commitSha";
-            semVer.BuildMetaData.ShortSha = "commitShortSha";
-            semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
-
-            var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment, tag: "useBranchName");
-            var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
-
-            vars.FullSemVer.ShouldBe("1.2.3-feature.5");
-        }
-
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void ProvidesVariablesInContinuousDeliveryModeForFeatureBranch()
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            BuildMetaData = "5.Branch.develop"
+        };
+
+        semVer.BuildMetaData.Branch = "feature";
+        semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
+        semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
+
+        var config = new TestEffectiveConfiguration(versioningMode: VersioningMode.ContinuousDeployment, tag: "useBranchName");
+        var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
+
+        vars.FullSemVer.ShouldBe("1.2.3-feature.5");
+    }
+
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void ProvidesVariablesInContinuousDeliveryModeForFeatureBranch()
+    {
+        var semVer = new SemanticVersion
         {
-            var semVer = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                BuildMetaData = "5.Branch.feature/123"
-            };
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            BuildMetaData = "5.Branch.feature/123"
+        };
 
-            semVer.BuildMetaData.Branch = "feature/123";
-            semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
-            semVer.BuildMetaData.Sha = "commitSha";
-            semVer.BuildMetaData.ShortSha = "commitShortSha";
-            semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
+        semVer.BuildMetaData.Branch = "feature/123";
+        semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
+        semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
+        semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
 
-            var config = new TestEffectiveConfiguration();
+        var config = new TestEffectiveConfiguration();
 
-            var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
+        var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
 
-            vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
-        }
+        vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
+    }
 
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomAssemblyInfoFormat()
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomAssemblyInfoFormat()
+    {
+        var semVer = new SemanticVersion
         {
-            var semVer = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                BuildMetaData = "5.Branch.feature/123"
-            };
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            BuildMetaData = "5.Branch.feature/123"
+        };
 
-            semVer.BuildMetaData.Branch = "feature/123";
-            semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
-            semVer.BuildMetaData.Sha = "commitSha";
-            semVer.BuildMetaData.ShortSha = "commitShortSha";
-            semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
+        semVer.BuildMetaData.Branch = "feature/123";
+        semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
+        semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
+        semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
 
-            var config = new TestEffectiveConfiguration(assemblyInformationalFormat: "{Major}.{Minor}.{Patch}+{CommitsSinceVersionSource}.Branch.{BranchName}.Sha.{ShortSha}");
+        var config = new TestEffectiveConfiguration(assemblyInformationalFormat: "{Major}.{Minor}.{Patch}+{CommitsSinceVersionSource}.Branch.{BranchName}.Sha.{ShortSha}");
 
-            var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
+        var vars = this.variableProvider.GetVariablesFor(semVer, config, false);
 
-            vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
-        }
+        vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs
index 22241223e9..bdb4f9b674 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs
@@ -6,68 +6,67 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class VersionSourceTests : TestBase
 {
-    [TestFixture]
-    public class VersionSourceTests : TestBase
+    [Test]
+    public void VersionSourceSha()
     {
-        [Test]
-        public void VersionSourceSha()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            var initialCommit = fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            _ = fixture.Repository.MakeACommit();
-            var featureBranch = fixture.Repository.CreateBranch("feature/foo");
-            Commands.Checkout(fixture.Repository, featureBranch);
-            _ = fixture.Repository.MakeACommit();
+        using var fixture = new EmptyRepositoryFixture();
+        var initialCommit = fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        _ = fixture.Repository.MakeACommit();
+        var featureBranch = fixture.Repository.CreateBranch("feature/foo");
+        Commands.Checkout(fixture.Repository, featureBranch);
+        _ = fixture.Repository.MakeACommit();
 
-            var nextVersionCalculator = GetNextVersionCalculator(fixture);
+        var nextVersionCalculator = GetNextVersionCalculator(fixture);
 
-            var version = nextVersionCalculator.FindVersion();
+        var version = nextVersionCalculator.FindVersion();
 
-            version.BuildMetaData.VersionSourceSha.ShouldBe(initialCommit.Sha);
-            version.BuildMetaData.CommitsSinceVersionSource.ShouldBe(2);
-        }
+        version.BuildMetaData.VersionSourceSha.ShouldBe(initialCommit.Sha);
+        version.BuildMetaData.CommitsSinceVersionSource.ShouldBe(2);
+    }
 
-        [Test]
-        public void VersionSourceShaOneCommit()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            var initialCommit = fixture.Repository.MakeACommit();
+    [Test]
+    public void VersionSourceShaOneCommit()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        var initialCommit = fixture.Repository.MakeACommit();
 
-            var nextVersionCalculator = GetNextVersionCalculator(fixture);
+        var nextVersionCalculator = GetNextVersionCalculator(fixture);
 
-            var version = nextVersionCalculator.FindVersion();
+        var version = nextVersionCalculator.FindVersion();
 
-            version.BuildMetaData.VersionSourceSha.ShouldBe(initialCommit.Sha);
-            version.BuildMetaData.CommitsSinceVersionSource.ShouldBe(0);
-        }
+        version.BuildMetaData.VersionSourceSha.ShouldBe(initialCommit.Sha);
+        version.BuildMetaData.CommitsSinceVersionSource.ShouldBe(0);
+    }
 
-        [Test]
-        public void VersionSourceShaUsingTag()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            _ = fixture.Repository.MakeACommit();
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            var secondCommit = fixture.Repository.MakeACommit();
-            _ = fixture.Repository.Tags.Add("1.0", secondCommit);
-            var featureBranch = fixture.Repository.CreateBranch("feature/foo");
-            Commands.Checkout(fixture.Repository, featureBranch);
-            _ = fixture.Repository.MakeACommit();
+    [Test]
+    public void VersionSourceShaUsingTag()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        _ = fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        var secondCommit = fixture.Repository.MakeACommit();
+        _ = fixture.Repository.Tags.Add("1.0", secondCommit);
+        var featureBranch = fixture.Repository.CreateBranch("feature/foo");
+        Commands.Checkout(fixture.Repository, featureBranch);
+        _ = fixture.Repository.MakeACommit();
 
-            var nextVersionCalculator = GetNextVersionCalculator(fixture);
+        var nextVersionCalculator = GetNextVersionCalculator(fixture);
 
-            var version = nextVersionCalculator.FindVersion();
+        var version = nextVersionCalculator.FindVersion();
 
-            version.BuildMetaData.VersionSourceSha.ShouldBe(secondCommit.Sha);
-            version.BuildMetaData.CommitsSinceVersionSource.ShouldBe(1);
-        }
+        version.BuildMetaData.VersionSourceSha.ShouldBe(secondCommit.Sha);
+        version.BuildMetaData.CommitsSinceVersionSource.ShouldBe(1);
+    }
 
-        private static INextVersionCalculator GetNextVersionCalculator(RepositoryFixtureBase fixture)
-        {
-            var sp = BuildServiceProvider(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), fixture.Repository.Head.CanonicalName);
-            return sp.GetService<INextVersionCalculator>();
-        }
+    private static INextVersionCalculator GetNextVersionCalculator(RepositoryFixtureBase fixture)
+    {
+        var sp = BuildServiceProvider(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), fixture.Repository.Head.CanonicalName);
+        return sp.GetService<INextVersionCalculator>();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionConverters/AssemblyFileVersionTests.cs b/src/GitVersion.Core.Tests/VersionConverters/AssemblyFileVersionTests.cs
index 92ed7e1598..42dc36bc8c 100644
--- a/src/GitVersion.Core.Tests/VersionConverters/AssemblyFileVersionTests.cs
+++ b/src/GitVersion.Core.Tests/VersionConverters/AssemblyFileVersionTests.cs
@@ -3,27 +3,26 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class AssemblyFileVersionTests : TestBase
 {
-    [TestFixture]
-    public class AssemblyFileVersionTests : TestBase
-    {
-        [TestCase(AssemblyFileVersioningScheme.None, 1, 2, 3, 4, null)]
-        [TestCase(AssemblyFileVersioningScheme.Major, 1, 2, 3, 4, "1.0.0.0")]
-        [TestCase(AssemblyFileVersioningScheme.MajorMinor, 1, 2, 3, 4, "1.2.0.0")]
-        [TestCase(AssemblyFileVersioningScheme.MajorMinorPatch, 1, 2, 3, 4, "1.2.3.0")]
-        [TestCase(AssemblyFileVersioningScheme.MajorMinorPatchTag, 1, 2, 3, 4, "1.2.3.4")]
-        public void ValidateAssemblyFileVersionBuilder(AssemblyFileVersioningScheme assemblyFileVersioningScheme, int major, int minor, int patch,
+    [TestCase(AssemblyFileVersioningScheme.None, 1, 2, 3, 4, null)]
+    [TestCase(AssemblyFileVersioningScheme.Major, 1, 2, 3, 4, "1.0.0.0")]
+    [TestCase(AssemblyFileVersioningScheme.MajorMinor, 1, 2, 3, 4, "1.2.0.0")]
+    [TestCase(AssemblyFileVersioningScheme.MajorMinorPatch, 1, 2, 3, 4, "1.2.3.0")]
+    [TestCase(AssemblyFileVersioningScheme.MajorMinorPatchTag, 1, 2, 3, 4, "1.2.3.4")]
+    public void ValidateAssemblyFileVersionBuilder(AssemblyFileVersioningScheme assemblyFileVersioningScheme, int major, int minor, int patch,
         int tag, string versionString)
+    {
+        var semVer = new SemanticVersion(major, minor, patch)
         {
-            var semVer = new SemanticVersion(major, minor, patch)
-            {
-                PreReleaseTag = new SemanticVersionPreReleaseTag("Test", tag)
-            };
+            PreReleaseTag = new SemanticVersionPreReleaseTag("Test", tag)
+        };
 
-            var assemblyFileVersion = semVer.GetAssemblyFileVersion(assemblyFileVersioningScheme);
+        var assemblyFileVersion = semVer.GetAssemblyFileVersion(assemblyFileVersioningScheme);
 
-            assemblyFileVersion.ShouldBe(versionString);
-        }
+        assemblyFileVersion.ShouldBe(versionString);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionConverters/AssemblyInfoFileUpdaterTests.cs b/src/GitVersion.Core.Tests/VersionConverters/AssemblyInfoFileUpdaterTests.cs
index 1973820668..e1b0d99774 100644
--- a/src/GitVersion.Core.Tests/VersionConverters/AssemblyInfoFileUpdaterTests.cs
+++ b/src/GitVersion.Core.Tests/VersionConverters/AssemblyInfoFileUpdaterTests.cs
@@ -13,458 +13,457 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+[Parallelizable(ParallelScope.None)]
+public class AssemblyInfoFileUpdaterTests : TestBase
 {
-    [TestFixture]
-    [Parallelizable(ParallelScope.None)]
-    public class AssemblyInfoFileUpdaterTests : TestBase
+    private IVariableProvider variableProvider;
+    private ILog log;
+    private IFileSystem fileSystem;
+
+    [SetUp]
+    public void Setup()
     {
-        private IVariableProvider variableProvider;
-        private ILog log;
-        private IFileSystem fileSystem;
+        ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestCaseAttribute>();
 
-        [SetUp]
-        public void Setup()
-        {
-            ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestCaseAttribute>();
+        var sp = ConfigureServices();
 
-            var sp = ConfigureServices();
+        this.log = sp.GetService<ILog>();
+        this.fileSystem = sp.GetService<IFileSystem>();
+        this.variableProvider = sp.GetService<IVariableProvider>();
+    }
 
-            this.log = sp.GetService<ILog>();
-            this.fileSystem = sp.GetService<IFileSystem>();
-            this.variableProvider = sp.GetService<IVariableProvider>();
-        }
+    [TestCase("cs")]
+    [TestCase("fs")]
+    [TestCase("vb")]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo(string fileExtension)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = "VersionAssemblyInfo." + fileExtension;
+        var fullPath = Path.Combine(workingDir, assemblyInfoFile);
+        var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
 
-        [TestCase("cs")]
-        [TestCase("fs")]
-        [TestCase("vb")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo(string fileExtension)
-        {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = "VersionAssemblyInfo." + fileExtension;
-            var fullPath = Path.Combine(workingDir, assemblyInfoFile);
-            var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
+        using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
+        assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFile));
 
-            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
-            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFile));
+        this.fileSystem.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
+    }
 
-            this.fileSystem.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
-        }
+    [TestCase("cs")]
+    [TestCase("fs")]
+    [TestCase("vb")]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo(string fileExtension)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = Path.Combine("src", "Project", "Properties", "VersionAssemblyInfo." + fileExtension);
+        var fullPath = Path.Combine(workingDir, assemblyInfoFile);
+        var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
+
+        using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
+        assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFile));
 
-        [TestCase("cs")]
-        [TestCase("fs")]
-        [TestCase("vb")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo(string fileExtension)
+        this.fileSystem.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
+    }
+
+    [TestCase("cs")]
+    [TestCase("fs")]
+    [TestCase("vb")]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInfo(string fileExtension)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFiles = new HashSet<string>
         {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = Path.Combine("src", "Project", "Properties", "VersionAssemblyInfo." + fileExtension);
-            var fullPath = Path.Combine(workingDir, assemblyInfoFile);
-            var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
+            "AssemblyInfo." + fileExtension,
+            Path.Combine("src", "Project", "Properties", "VersionAssemblyInfo." + fileExtension)
+        };
+        var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
 
-            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
-            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFile));
+        using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
+        assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFiles.ToArray()));
 
+        foreach (var item in assemblyInfoFiles)
+        {
+            var fullPath = Path.Combine(workingDir, item);
             this.fileSystem.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
         }
+    }
 
-        [TestCase("cs")]
-        [TestCase("fs")]
-        [TestCase("vb")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInfo(string fileExtension)
-        {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFiles = new HashSet<string>
-            {
-                "AssemblyInfo." + fileExtension,
-                Path.Combine("src", "Project", "Properties", "VersionAssemblyInfo." + fileExtension)
-            };
-            var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
-
-            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
-            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFiles.ToArray()));
-
-            foreach (var item in assemblyInfoFiles)
-            {
-                var fullPath = Path.Combine(workingDir, item);
-                this.fileSystem.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
-            }
-        }
+    [TestCase("cs")]
+    [TestCase("fs")]
+    [TestCase("vb")]
+    public void ShouldNotCreateAssemblyInfoFileWhenNotExistsAndNotEnsureAssemblyInfo(string fileExtension)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = "VersionAssemblyInfo." + fileExtension;
+        var fullPath = Path.Combine(workingDir, assemblyInfoFile);
+        var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
 
-        [TestCase("cs")]
-        [TestCase("fs")]
-        [TestCase("vb")]
-        public void ShouldNotCreateAssemblyInfoFileWhenNotExistsAndNotEnsureAssemblyInfo(string fileExtension)
-        {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = "VersionAssemblyInfo." + fileExtension;
-            var fullPath = Path.Combine(workingDir, assemblyInfoFile);
-            var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
+        using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
+        assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
 
-            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
-            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
+        this.fileSystem.Exists(fullPath).ShouldBeFalse();
+    }
 
-            this.fileSystem.Exists(fullPath).ShouldBeFalse();
-        }
+    [Test]
+    public void ShouldNotCreateAssemblyInfoFileForUnknownSourceCodeAndEnsureAssemblyInfo()
+    {
+        this.fileSystem = Substitute.For<IFileSystem>();
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = "VersionAssemblyInfo.js";
+        var fullPath = Path.Combine(workingDir, assemblyInfoFile);
+        var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
 
-        [Test]
-        public void ShouldNotCreateAssemblyInfoFileForUnknownSourceCodeAndEnsureAssemblyInfo()
-        {
-            this.fileSystem = Substitute.For<IFileSystem>();
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = "VersionAssemblyInfo.js";
-            var fullPath = Path.Combine(workingDir, assemblyInfoFile);
-            var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
+        using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
+        assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFile));
 
-            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
-            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, true, assemblyInfoFile));
+        this.fileSystem.Received(0).WriteAllText(fullPath, Arg.Any<string>());
+    }
 
-            this.fileSystem.Received(0).WriteAllText(fullPath, Arg.Any<string>());
-        }
+    [Test]
+    public void ShouldStartSearchFromWorkingDirectory()
+    {
+        this.fileSystem = Substitute.For<IFileSystem>();
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFiles = Array.Empty<string>();
+        var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
 
-        [Test]
-        public void ShouldStartSearchFromWorkingDirectory()
-        {
-            this.fileSystem = Substitute.For<IFileSystem>();
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFiles = Array.Empty<string>();
-            var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("1.0.0", "v"), new TestEffectiveConfiguration(), false);
+        using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
+        assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFiles.ToArray()));
 
-            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, this.fileSystem);
-            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFiles.ToArray()));
+        this.fileSystem.Received().DirectoryEnumerateFiles(Arg.Is(workingDir), Arg.Any<string>(), Arg.Any<SearchOption>());
+    }
 
-            this.fileSystem.Received().DirectoryEnumerateFiles(Arg.Is(workingDir), Arg.Any<string>(), Arg.Any<SearchOption>());
-        }
+    [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyInformationalVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
+    [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyInformationalVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
+    [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyInformationalVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
+    public void ShouldReplaceAssemblyVersion(string fileExtension, string assemblyFileContent)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = "AssemblyInfo." + fileExtension;
+        var fileName = Path.Combine(workingDir, assemblyInfoFile);
 
-        [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyInformationalVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
-        [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyInformationalVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
-        [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyInformationalVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
-        public void ShouldReplaceAssemblyVersion(string fileExtension, string assemblyFileContent)
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
         {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = "AssemblyInfo." + fileExtension;
-            var fileName = Path.Combine(workingDir, assemblyInfoFile);
-
-            VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
-            {
-                using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
-                assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
-
-                fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
-                    s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
-                    s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
-                    s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
-            });
-        }
+            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
+            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
+
+            fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
+                s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
+                s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
+                s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
+        });
+    }
 
-        [TestCase("cs", "[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
-        [TestCase("fs", "[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
-        [TestCase("vb", "<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone(string fileExtension, string assemblyFileContent)
+    [TestCase("cs", "[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
+    [TestCase("fs", "[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
+    [TestCase("vb", "<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone(string fileExtension, string assemblyFileContent)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = "AssemblyInfo." + fileExtension;
+        var fileName = Path.Combine(workingDir, assemblyInfoFile);
+
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, verify: (fs, variables) =>
         {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = "AssemblyInfo." + fileExtension;
-            var fileName = Path.Combine(workingDir, assemblyInfoFile);
-
-            VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, verify: (fs, variables) =>
-            {
-                using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
-                assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
-
-                assemblyFileContent = fs.ReadAllText(fileName);
-                assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
-            });
-        }
+            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
+            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
+
+            assemblyFileContent = fs.ReadAllText(fileName);
+            assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
+        });
+    }
+
+    [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyInformationalVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
+    [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyInformationalVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
+    [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyInformationalVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
+    public void ShouldReplaceAssemblyVersionInRelativePath(string fileExtension, string assemblyFileContent)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension);
+        var fileName = Path.Combine(workingDir, assemblyInfoFile);
 
-        [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyInformationalVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
-        [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyInformationalVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
-        [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyInformationalVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
-        public void ShouldReplaceAssemblyVersionInRelativePath(string fileExtension, string assemblyFileContent)
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
         {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension);
-            var fileName = Path.Combine(workingDir, assemblyInfoFile);
-
-            VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
-            {
-                using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
-                assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
-
-                fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
-                    s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
-                    s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
-                    s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
-            });
-        }
+            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
+            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
+
+            fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
+                s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
+                s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
+                s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
+        });
+    }
 
-        [TestCase("cs", "[assembly: AssemblyVersion ( \"1.0.0.0\") ]\r\n[assembly: AssemblyInformationalVersion\t(\t\"1.0.0.0\"\t)]\r\n[assembly: AssemblyFileVersion\r\n(\r\n\"1.0.0.0\"\r\n)]")]
-        [TestCase("fs", "[<assembly: AssemblyVersion ( \"1.0.0.0\" )>]\r\n[<assembly: AssemblyInformationalVersion\t(\t\"1.0.0.0\"\t)>]\r\n[<assembly: AssemblyFileVersion\r\n(\r\n\"1.0.0.0\"\r\n)>]")]
-        [TestCase("vb", "<Assembly: AssemblyVersion ( \"1.0.0.0\" )>\r\n<Assembly: AssemblyInformationalVersion\t(\t\"1.0.0.0\"\t)>\r\n<Assembly: AssemblyFileVersion\r\n(\r\n\"1.0.0.0\"\r\n)>")]
-        public void ShouldReplaceAssemblyVersionInRelativePathWithWhiteSpace(string fileExtension, string assemblyFileContent)
+    [TestCase("cs", "[assembly: AssemblyVersion ( \"1.0.0.0\") ]\r\n[assembly: AssemblyInformationalVersion\t(\t\"1.0.0.0\"\t)]\r\n[assembly: AssemblyFileVersion\r\n(\r\n\"1.0.0.0\"\r\n)]")]
+    [TestCase("fs", "[<assembly: AssemblyVersion ( \"1.0.0.0\" )>]\r\n[<assembly: AssemblyInformationalVersion\t(\t\"1.0.0.0\"\t)>]\r\n[<assembly: AssemblyFileVersion\r\n(\r\n\"1.0.0.0\"\r\n)>]")]
+    [TestCase("vb", "<Assembly: AssemblyVersion ( \"1.0.0.0\" )>\r\n<Assembly: AssemblyInformationalVersion\t(\t\"1.0.0.0\"\t)>\r\n<Assembly: AssemblyFileVersion\r\n(\r\n\"1.0.0.0\"\r\n)>")]
+    public void ShouldReplaceAssemblyVersionInRelativePathWithWhiteSpace(string fileExtension, string assemblyFileContent)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension);
+        var fileName = Path.Combine(workingDir, assemblyInfoFile);
+
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
         {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension);
-            var fileName = Path.Combine(workingDir, assemblyInfoFile);
-
-            VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
-            {
-                using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
-                assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
-
-                fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
-                    s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
-                    s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
-                    s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
-            });
-        }
+            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
+            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
+
+            fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
+                s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
+                s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
+                s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
+        });
+    }
 
-        [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.*\")]\r\n[assembly: AssemblyInformationalVersion(\"1.0.0.*\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.*\")]")]
-        [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.*\")>]\r\n[<assembly: AssemblyInformationalVersion(\"1.0.0.*\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.*\")>]")]
-        [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.*\")>\r\n<Assembly: AssemblyInformationalVersion(\"1.0.0.*\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.*\")>")]
-        public void ShouldReplaceAssemblyVersionWithStar(string fileExtension, string assemblyFileContent)
+    [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.*\")]\r\n[assembly: AssemblyInformationalVersion(\"1.0.0.*\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.*\")]")]
+    [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.*\")>]\r\n[<assembly: AssemblyInformationalVersion(\"1.0.0.*\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.*\")>]")]
+    [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.*\")>\r\n<Assembly: AssemblyInformationalVersion(\"1.0.0.*\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.*\")>")]
+    public void ShouldReplaceAssemblyVersionWithStar(string fileExtension, string assemblyFileContent)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = "AssemblyInfo." + fileExtension;
+        var fileName = Path.Combine(workingDir, assemblyInfoFile);
+
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
         {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = "AssemblyInfo." + fileExtension;
-            var fileName = Path.Combine(workingDir, assemblyInfoFile);
-
-            VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
-            {
-                using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
-                assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
-
-                fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
-                    s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
-                    s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
-                    s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
-            });
-        }
+            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
+            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
 
-        [TestCase("cs", "[assembly: AssemblyVersionAttribute(\"1.0.0.0\")]\r\n[assembly: AssemblyInformationalVersionAttribute(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersionAttribute(\"1.0.0.0\")]")]
-        [TestCase("fs", "[<assembly: AssemblyVersionAttribute(\"1.0.0.0\")>]\r\n[<assembly: AssemblyInformationalVersionAttribute(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersionAttribute(\"1.0.0.0\")>]")]
-        [TestCase("vb", "<Assembly: AssemblyVersionAttribute(\"1.0.0.0\")>\r\n<Assembly: AssemblyInformationalVersionAttribute(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersionAttribute(\"1.0.0.0\")>")]
-        public void ShouldReplaceAssemblyVersionWithAtttributeSuffix(string fileExtension, string assemblyFileContent)
+            fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
+                s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
+                s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
+                s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
+        });
+    }
+
+    [TestCase("cs", "[assembly: AssemblyVersionAttribute(\"1.0.0.0\")]\r\n[assembly: AssemblyInformationalVersionAttribute(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersionAttribute(\"1.0.0.0\")]")]
+    [TestCase("fs", "[<assembly: AssemblyVersionAttribute(\"1.0.0.0\")>]\r\n[<assembly: AssemblyInformationalVersionAttribute(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersionAttribute(\"1.0.0.0\")>]")]
+    [TestCase("vb", "<Assembly: AssemblyVersionAttribute(\"1.0.0.0\")>\r\n<Assembly: AssemblyInformationalVersionAttribute(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersionAttribute(\"1.0.0.0\")>")]
+    public void ShouldReplaceAssemblyVersionWithAtttributeSuffix(string fileExtension, string assemblyFileContent)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = "AssemblyInfo." + fileExtension;
+        var fileName = Path.Combine(workingDir, assemblyInfoFile);
+
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) =>
         {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = "AssemblyInfo." + fileExtension;
-            var fileName = Path.Combine(workingDir, assemblyInfoFile);
-
-            VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) =>
-            {
-                using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
-                assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
-
-                fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
-                    !s.Contains(@"AssemblyVersionAttribute(""1.0.0.0"")") &&
-                    !s.Contains(@"AssemblyInformationalVersionAttribute(""1.0.0.0"")") &&
-                    !s.Contains(@"AssemblyFileVersionAttribute(""1.0.0.0"")") &&
-                    s.Contains(@"AssemblyVersion(""2.3.1.0"")") &&
-                    s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
-                    s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
-            });
-        }
+            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
+            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
+
+            fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
+                !s.Contains(@"AssemblyVersionAttribute(""1.0.0.0"")") &&
+                !s.Contains(@"AssemblyInformationalVersionAttribute(""1.0.0.0"")") &&
+                !s.Contains(@"AssemblyFileVersionAttribute(""1.0.0.0"")") &&
+                s.Contains(@"AssemblyVersion(""2.3.1.0"")") &&
+                s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
+                s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
+        });
+    }
 
-        [TestCase("cs")]
-        [TestCase("fs")]
-        [TestCase("vb")]
-        public void ShouldAddAssemblyVersionIfMissingFromInfoFile(string fileExtension)
+    [TestCase("cs")]
+    [TestCase("fs")]
+    [TestCase("vb")]
+    public void ShouldAddAssemblyVersionIfMissingFromInfoFile(string fileExtension)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = "AssemblyInfo." + fileExtension;
+        var fileName = Path.Combine(workingDir, assemblyInfoFile);
+
+        VerifyAssemblyInfoFile("", fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
         {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = "AssemblyInfo." + fileExtension;
-            var fileName = Path.Combine(workingDir, assemblyInfoFile);
-
-            VerifyAssemblyInfoFile("", fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
-            {
-                using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
-                assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
-
-                fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
-                    s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
-                    s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
-                    s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
-            });
-        }
+            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
+            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
+
+            fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
+                s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
+                s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
+                s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
+        });
+    }
+
+    [TestCase("cs", "[assembly: AssemblyVersion(\"2.2.0.0\")]\r\n[assembly: AssemblyInformationalVersion(\"2.2.0+5.Branch.foo.Sha.hash\")]\r\n[assembly: AssemblyFileVersion(\"2.2.0.0\")]")]
+    [TestCase("fs", "[<assembly: AssemblyVersion(\"2.2.0.0\")>]\r\n[<assembly: AssemblyInformationalVersion(\"2.2.0+5.Branch.foo.Sha.hash\")>]\r\n[<assembly: AssemblyFileVersion(\"2.2.0.0\")>]")]
+    [TestCase("vb", "<Assembly: AssemblyVersion(\"2.2.0.0\")>\r\n<Assembly: AssemblyInformationalVersion(\"2.2.0+5.Branch.foo.Sha.hash\")>\r\n<Assembly: AssemblyFileVersion(\"2.2.0.0\")>")]
+    public void ShouldReplaceAlreadySubstitutedValues(string fileExtension, string assemblyFileContent)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = "AssemblyInfo." + fileExtension;
+        var fileName = Path.Combine(workingDir, assemblyInfoFile);
 
-        [TestCase("cs", "[assembly: AssemblyVersion(\"2.2.0.0\")]\r\n[assembly: AssemblyInformationalVersion(\"2.2.0+5.Branch.foo.Sha.hash\")]\r\n[assembly: AssemblyFileVersion(\"2.2.0.0\")]")]
-        [TestCase("fs", "[<assembly: AssemblyVersion(\"2.2.0.0\")>]\r\n[<assembly: AssemblyInformationalVersion(\"2.2.0+5.Branch.foo.Sha.hash\")>]\r\n[<assembly: AssemblyFileVersion(\"2.2.0.0\")>]")]
-        [TestCase("vb", "<Assembly: AssemblyVersion(\"2.2.0.0\")>\r\n<Assembly: AssemblyInformationalVersion(\"2.2.0+5.Branch.foo.Sha.hash\")>\r\n<Assembly: AssemblyFileVersion(\"2.2.0.0\")>")]
-        public void ShouldReplaceAlreadySubstitutedValues(string fileExtension, string assemblyFileContent)
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
         {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = "AssemblyInfo." + fileExtension;
-            var fileName = Path.Combine(workingDir, assemblyInfoFile);
-
-            VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
-            {
-                using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
-                assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
-
-                fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
-                    s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
-                    s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
-                    s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
-            });
-        }
+            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
+            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
+
+            fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
+                s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
+                s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
+                s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
+        });
+    }
+
+    [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyInformationalVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
+    [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyInformationalVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
+    [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyInformationalVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
+    public void ShouldReplaceAssemblyVersionWhenCreatingAssemblyVersionFileAndEnsureAssemblyInfo(string fileExtension, string assemblyFileContent)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = "AssemblyInfo." + fileExtension;
+        var fileName = Path.Combine(workingDir, assemblyInfoFile);
 
-        [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyInformationalVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
-        [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyInformationalVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
-        [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyInformationalVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
-        public void ShouldReplaceAssemblyVersionWhenCreatingAssemblyVersionFileAndEnsureAssemblyInfo(string fileExtension, string assemblyFileContent)
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) =>
         {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = "AssemblyInfo." + fileExtension;
-            var fileName = Path.Combine(workingDir, assemblyInfoFile);
-
-            VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) =>
-            {
-                using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
-                assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
-
-                fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
-                    s.Contains(@"AssemblyVersion(""2.3.1.0"")") &&
-                    s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
-                    s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
-            });
-        }
+            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
+            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
+
+            fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
+                s.Contains(@"AssemblyVersion(""2.3.1.0"")") &&
+                s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
+                s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
+        });
+    }
 
-        [TestCase("cs", "[assembly: AssemblyVersion (AssemblyInfo.Version) ]\r\n[assembly: AssemblyInformationalVersion(AssemblyInfo.InformationalVersion)]\r\n[assembly: AssemblyFileVersion(AssemblyInfo.FileVersion)]")]
-        [TestCase("fs", "[<assembly: AssemblyVersion (AssemblyInfo.Version)>]\r\n[<assembly: AssemblyInformationalVersion(AssemblyInfo.InformationalVersion)>]\r\n[<assembly: AssemblyFileVersion(AssemblyInfo.FileVersion)>]")]
-        [TestCase("vb", "<Assembly: AssemblyVersion (AssemblyInfo.Version)>\r\n<Assembly: AssemblyInformationalVersion(AssemblyInfo.InformationalVersion)>\r\n<Assembly: AssemblyFileVersion(AssemblyInfo.FileVersion)>")]
-        public void ShouldReplaceAssemblyVersionInRelativePathWithVariables(string fileExtension, string assemblyFileContent)
+    [TestCase("cs", "[assembly: AssemblyVersion (AssemblyInfo.Version) ]\r\n[assembly: AssemblyInformationalVersion(AssemblyInfo.InformationalVersion)]\r\n[assembly: AssemblyFileVersion(AssemblyInfo.FileVersion)]")]
+    [TestCase("fs", "[<assembly: AssemblyVersion (AssemblyInfo.Version)>]\r\n[<assembly: AssemblyInformationalVersion(AssemblyInfo.InformationalVersion)>]\r\n[<assembly: AssemblyFileVersion(AssemblyInfo.FileVersion)>]")]
+    [TestCase("vb", "<Assembly: AssemblyVersion (AssemblyInfo.Version)>\r\n<Assembly: AssemblyInformationalVersion(AssemblyInfo.InformationalVersion)>\r\n<Assembly: AssemblyFileVersion(AssemblyInfo.FileVersion)>")]
+    public void ShouldReplaceAssemblyVersionInRelativePathWithVariables(string fileExtension, string assemblyFileContent)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension);
+        var fileName = Path.Combine(workingDir, assemblyInfoFile);
+
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
         {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension);
-            var fileName = Path.Combine(workingDir, assemblyInfoFile);
-
-            VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
-            {
-                using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
-                assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
-
-                fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
-                    s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
-                    s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
-                    s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
-            });
-        }
+            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
+            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
 
-        [TestCase("cs", "[assembly: AssemblyVersion (  AssemblyInfo.VersionInfo  ) ]\r\n[assembly: AssemblyInformationalVersion\t(\tAssemblyInfo.InformationalVersion\t)]\r\n[assembly: AssemblyFileVersion\r\n(\r\nAssemblyInfo.FileVersion\r\n)]")]
-        [TestCase("fs", "[<assembly: AssemblyVersion ( AssemblyInfo.VersionInfo )>]\r\n[<assembly: AssemblyInformationalVersion\t(\tAssemblyInfo.InformationalVersion\t)>]\r\n[<assembly: AssemblyFileVersion\r\n(\r\nAssemblyInfo.FileVersion\r\n)>]")]
-        [TestCase("vb", "<Assembly: AssemblyVersion ( AssemblyInfo.VersionInfo )>\r\n<Assembly: AssemblyInformationalVersion\t(\tAssemblyInfo.InformationalVersion\t)>\r\n<Assembly: AssemblyFileVersion\r\n(\r\nAssemblyInfo.FileVersion\r\n)>")]
-        public void ShouldReplaceAssemblyVersionInRelativePathWithVariablesAndWhiteSpace(string fileExtension, string assemblyFileContent)
+            fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
+                s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
+                s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
+                s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
+        });
+    }
+
+    [TestCase("cs", "[assembly: AssemblyVersion (  AssemblyInfo.VersionInfo  ) ]\r\n[assembly: AssemblyInformationalVersion\t(\tAssemblyInfo.InformationalVersion\t)]\r\n[assembly: AssemblyFileVersion\r\n(\r\nAssemblyInfo.FileVersion\r\n)]")]
+    [TestCase("fs", "[<assembly: AssemblyVersion ( AssemblyInfo.VersionInfo )>]\r\n[<assembly: AssemblyInformationalVersion\t(\tAssemblyInfo.InformationalVersion\t)>]\r\n[<assembly: AssemblyFileVersion\r\n(\r\nAssemblyInfo.FileVersion\r\n)>]")]
+    [TestCase("vb", "<Assembly: AssemblyVersion ( AssemblyInfo.VersionInfo )>\r\n<Assembly: AssemblyInformationalVersion\t(\tAssemblyInfo.InformationalVersion\t)>\r\n<Assembly: AssemblyFileVersion\r\n(\r\nAssemblyInfo.FileVersion\r\n)>")]
+    public void ShouldReplaceAssemblyVersionInRelativePathWithVariablesAndWhiteSpace(string fileExtension, string assemblyFileContent)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension);
+        var fileName = Path.Combine(workingDir, assemblyInfoFile);
+
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
         {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = Path.Combine("Project", "src", "Properties", "AssemblyInfo." + fileExtension);
-            var fileName = Path.Combine(workingDir, assemblyInfoFile);
-
-            VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.MajorMinor, (fs, variables) =>
-            {
-                using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
-                assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
-
-                fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
-                    s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
-                    s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
-                    s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
-            });
-        }
+            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
+            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
+
+            fs.Received().WriteAllText(fileName, Arg.Is<string>(s =>
+                s.Contains(@"AssemblyVersion(""2.3.0.0"")") &&
+                s.Contains(@"AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"")") &&
+                s.Contains(@"AssemblyFileVersion(""2.3.1.0"")")));
+        });
+    }
 
-        [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
-        [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
-        [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile(string fileExtension, string assemblyFileContent)
+    [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
+    [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
+    [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile(string fileExtension, string assemblyFileContent)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = "AssemblyInfo." + fileExtension;
+        var fileName = Path.Combine(workingDir, assemblyInfoFile);
+
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) =>
         {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = "AssemblyInfo." + fileExtension;
-            var fileName = Path.Combine(workingDir, assemblyInfoFile);
-
-            VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) =>
-            {
-                using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
-                assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
-
-                assemblyFileContent = fs.ReadAllText(fileName);
-                assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
-            });
-        }
+            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
+            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
 
-        [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]\r\n// comment\r\n")]
-        [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]\r\ndo\r\n()\r\n")]
-        [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>\r\n' comment\r\n")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes(string fileExtension, string assemblyFileContent)
+            assemblyFileContent = fs.ReadAllText(fileName);
+            assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
+        });
+    }
+
+    [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]\r\n// comment\r\n")]
+    [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]\r\ndo\r\n()\r\n")]
+    [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>\r\n' comment\r\n")]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes(string fileExtension, string assemblyFileContent)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = "AssemblyInfo." + fileExtension;
+        var fileName = Path.Combine(workingDir, assemblyInfoFile);
+
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) =>
         {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = "AssemblyInfo." + fileExtension;
-            var fileName = Path.Combine(workingDir, assemblyInfoFile);
-
-            VerifyAssemblyInfoFile(assemblyFileContent, fileName, verify: (fs, variables) =>
-            {
-                using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
-                assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
-
-                assemblyFileContent = fs.ReadAllText(fileName);
-                assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
-            });
-        }
+            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
+            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
+
+            assemblyFileContent = fs.ReadAllText(fileName);
+            assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
+        });
+    }
+
+    [TestCase("cs", "[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
+    [TestCase("fs", "[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
+    [TestCase("vb", "<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void ShouldNotAddAssemblyInformationalVersionWhenVersionSchemeIsNone(string fileExtension, string assemblyFileContent)
+    {
+        var workingDir = Path.GetTempPath();
+        var assemblyInfoFile = "AssemblyInfo." + fileExtension;
+        var fileName = Path.Combine(workingDir, assemblyInfoFile);
 
-        [TestCase("cs", "[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
-        [TestCase("fs", "[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
-        [TestCase("vb", "<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void ShouldNotAddAssemblyInformationalVersionWhenVersionSchemeIsNone(string fileExtension, string assemblyFileContent)
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, verify: (fs, variables) =>
         {
-            var workingDir = Path.GetTempPath();
-            var assemblyInfoFile = "AssemblyInfo." + fileExtension;
-            var fileName = Path.Combine(workingDir, assemblyInfoFile);
-
-            VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, verify: (fs, variables) =>
-            {
-                using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
-                assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
-
-                assemblyFileContent = fs.ReadAllText(fileName);
-                assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
-            });
-        }
+            using var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(this.log, fs);
+            assemblyInfoFileUpdater.Execute(variables, new AssemblyInfoContext(workingDir, false, assemblyInfoFile));
+
+            assemblyFileContent = fs.ReadAllText(fileName);
+            assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
+        });
+    }
 
-        private void VerifyAssemblyInfoFile(
-            string assemblyFileContent,
-            string fileName,
-            AssemblyVersioningScheme versioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
-            Action<IFileSystem, VersionVariables> verify = null)
+    private void VerifyAssemblyInfoFile(
+        string assemblyFileContent,
+        string fileName,
+        AssemblyVersioningScheme versioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
+        Action<IFileSystem, VersionVariables> verify = null)
+    {
+        this.fileSystem = Substitute.For<IFileSystem>();
+        var version = new SemanticVersion
+        {
+            BuildMetaData = new SemanticVersionBuildMetaData("versionSourceHash", 3, "foo", "hash", "shortHash", DateTimeOffset.Now, 0),
+            Major = 2,
+            Minor = 3,
+            Patch = 1
+        };
+
+        this.fileSystem.Exists(fileName).Returns(true);
+        this.fileSystem.ReadAllText(fileName).Returns(assemblyFileContent);
+        this.fileSystem.When(f => f.WriteAllText(fileName, Arg.Any<string>())).Do(c =>
         {
-            this.fileSystem = Substitute.For<IFileSystem>();
-            var version = new SemanticVersion
-            {
-                BuildMetaData = new SemanticVersionBuildMetaData("versionSourceHash", 3, "foo", "hash", "shortHash", DateTimeOffset.Now, 0),
-                Major = 2,
-                Minor = 3,
-                Patch = 1
-            };
-
-            this.fileSystem.Exists(fileName).Returns(true);
+            assemblyFileContent = c.ArgAt<string>(1);
             this.fileSystem.ReadAllText(fileName).Returns(assemblyFileContent);
-            this.fileSystem.When(f => f.WriteAllText(fileName, Arg.Any<string>())).Do(c =>
-            {
-                assemblyFileContent = c.ArgAt<string>(1);
-                this.fileSystem.ReadAllText(fileName).Returns(assemblyFileContent);
-            });
+        });
 
-            var config = new TestEffectiveConfiguration(assemblyVersioningScheme: versioningScheme);
-            var variables = this.variableProvider.GetVariablesFor(version, config, false);
+        var config = new TestEffectiveConfiguration(assemblyVersioningScheme: versioningScheme);
+        var variables = this.variableProvider.GetVariablesFor(version, config, false);
 
-            verify?.Invoke(this.fileSystem, variables);
-        }
+        verify?.Invoke(this.fileSystem, variables);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs b/src/GitVersion.Core.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs
index 2880a3cd2f..8a3ede8142 100644
--- a/src/GitVersion.Core.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs
+++ b/src/GitVersion.Core.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs
@@ -7,47 +7,46 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+[Parallelizable(ParallelScope.None)]
+public class GitVersionInfoGeneratorTests : TestBase
 {
-    [TestFixture]
-    [Parallelizable(ParallelScope.None)]
-    public class GitVersionInfoGeneratorTests : TestBase
+    [SetUp]
+    public void Setup() => ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestCaseAttribute>();
+
+    [TestCase("cs")]
+    [TestCase("fs")]
+    [TestCase("vb")]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void ShouldCreateFile(string fileExtension)
     {
-        [SetUp]
-        public void Setup() => ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestCaseAttribute>();
-
-        [TestCase("cs")]
-        [TestCase("fs")]
-        [TestCase("vb")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void ShouldCreateFile(string fileExtension)
-        {
-            var directory = Path.GetTempPath();
-            var fileName = "GitVersionInformation.g." + fileExtension;
-            var fullPath = Path.Combine(directory, fileName);
+        var directory = Path.GetTempPath();
+        var fileName = "GitVersionInformation.g." + fileExtension;
+        var fullPath = Path.Combine(directory, fileName);
 
-            var semanticVersion = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                PreReleaseTag = "unstable4",
-                BuildMetaData = new SemanticVersionBuildMetaData("versionSourceSha", 5,
-                    "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"), 0)
-            };
+        var semanticVersion = new SemanticVersion
+        {
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = "unstable4",
+            BuildMetaData = new SemanticVersionBuildMetaData("versionSourceSha", 5,
+                "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"), 0)
+        };
 
-            var sp = ConfigureServices();
+        var sp = ConfigureServices();
 
-            var fileSystem = sp.GetService<IFileSystem>();
-            var variableProvider = sp.GetService<IVariableProvider>();
+        var fileSystem = sp.GetService<IFileSystem>();
+        var variableProvider = sp.GetService<IVariableProvider>();
 
-            var variables = variableProvider.GetVariablesFor(semanticVersion, new TestEffectiveConfiguration(), false);
-            using var generator = sp.GetService<IGitVersionInfoGenerator>();
+        var variables = variableProvider.GetVariablesFor(semanticVersion, new TestEffectiveConfiguration(), false);
+        using var generator = sp.GetService<IGitVersionInfoGenerator>();
 
-            generator.Execute(variables, new GitVersionInfoContext(directory, fileName, fileExtension));
+        generator.Execute(variables, new GitVersionInfoContext(directory, fileName, fileExtension));
 
-            fileSystem.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
-        }
+        fileSystem.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionConverters/InformationalVersionBuilderTests.cs b/src/GitVersion.Core.Tests/VersionConverters/InformationalVersionBuilderTests.cs
index 2af14b3bb6..a90384146f 100644
--- a/src/GitVersion.Core.Tests/VersionConverters/InformationalVersionBuilderTests.cs
+++ b/src/GitVersion.Core.Tests/VersionConverters/InformationalVersionBuilderTests.cs
@@ -2,39 +2,38 @@
 using GitVersion.Core.Tests.Helpers;
 using NUnit.Framework;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+public class InformationalVersionBuilderTests : TestBase
 {
-    [TestFixture]
-    public class InformationalVersionBuilderTests : TestBase
+    [TestCase("feature1", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable", "1c6609bcf", 1, "1.2.3-unstable+1.Branch.feature1.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "alpha645", null, null, "1.2.3-alpha.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable645", null, null, "1.2.3-unstable.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "beta645", null, null, "1.2.3-beta.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "alpha645", null, null, "1.2.3-alpha.645+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "beta645", null, null, "1.2.3-beta.645+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, null, null, null, "1.2.3+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase(MainBranch, "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, null, null, null, "1.2.3+Branch." + MainBranch + ".Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("myPullRequest", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable3", null, null, "1.2.3-unstable.3+Branch.myPullRequest.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "beta2", null, null, "1.2.0-beta.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "alpha2", null, null, "1.2.0-alpha.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("release/1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "beta2", null, null, "1.2.0-beta.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    [TestCase("release/1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "alpha2", null, null, "1.2.0-alpha.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
+    public void ValidateInformationalVersionBuilder(string branchName, string sha, string shortSha, int major, int minor, int patch,
+        string tag, string versionSourceSha, int? commitsSinceTag, string versionString)
     {
-        [TestCase("feature1", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable", "1c6609bcf", 1, "1.2.3-unstable+1.Branch.feature1.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-        [TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "alpha645", null, null, "1.2.3-alpha.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-        [TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable645", null, null, "1.2.3-unstable.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-        [TestCase("develop", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "beta645", null, null, "1.2.3-beta.645+Branch.develop.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-        [TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "alpha645", null, null, "1.2.3-alpha.645+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-        [TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "beta645", null, null, "1.2.3-beta.645+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-        [TestCase("hotfix-foo", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, null, null, null, "1.2.3+Branch.hotfix-foo.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-        [TestCase(MainBranch, "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, null, null, null, "1.2.3+Branch." + MainBranch + ".Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-        [TestCase("myPullRequest", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 3, "unstable3", null, null, "1.2.3-unstable.3+Branch.myPullRequest.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-        [TestCase("release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "beta2", null, null, "1.2.0-beta.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-        [TestCase("release-1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "alpha2", null, null, "1.2.0-alpha.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-        [TestCase("release/1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "beta2", null, null, "1.2.0-beta.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-        [TestCase("release/1.2", "a682956dc1a2752aa24597a0f5cd939f93614509", "a682956d", 1, 2, 0, "alpha2", null, null, "1.2.0-alpha.2+Branch.release-1.2.Sha.a682956dc1a2752aa24597a0f5cd939f93614509")]
-        public void ValidateInformationalVersionBuilder(string branchName, string sha, string shortSha, int major, int minor, int patch,
-            string tag, string versionSourceSha, int? commitsSinceTag, string versionString)
+        var semanticVersion = new SemanticVersion
         {
-            var semanticVersion = new SemanticVersion
-            {
-                Major = major,
-                Minor = minor,
-                Patch = patch,
-                PreReleaseTag = tag,
-                BuildMetaData = new SemanticVersionBuildMetaData(versionSourceSha, commitsSinceTag, branchName, sha, shortSha, DateTimeOffset.MinValue, 0),
-            };
-            var informationalVersion = semanticVersion.ToString("i");
-
-            Assert.AreEqual(versionString, informationalVersion);
-        }
+            Major = major,
+            Minor = minor,
+            Patch = patch,
+            PreReleaseTag = tag,
+            BuildMetaData = new SemanticVersionBuildMetaData(versionSourceSha, commitsSinceTag, branchName, sha, shortSha, DateTimeOffset.MinValue, 0),
+        };
+        var informationalVersion = semanticVersion.ToString("i");
 
+        Assert.AreEqual(versionString, informationalVersion);
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionConverters/ProjectFileUpdaterTests.cs b/src/GitVersion.Core.Tests/VersionConverters/ProjectFileUpdaterTests.cs
index 1111354109..2579cf2628 100644
--- a/src/GitVersion.Core.Tests/VersionConverters/ProjectFileUpdaterTests.cs
+++ b/src/GitVersion.Core.Tests/VersionConverters/ProjectFileUpdaterTests.cs
@@ -12,27 +12,27 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+[Parallelizable(ParallelScope.None)]
+public class ProjectFileUpdaterTests : TestBase
 {
-    [TestFixture]
-    [Parallelizable(ParallelScope.None)]
-    public class ProjectFileUpdaterTests : TestBase
+    private IVariableProvider variableProvider;
+    private ILog log;
+    private IFileSystem fileSystem;
+
+    [SetUp]
+    public void Setup()
     {
-        private IVariableProvider variableProvider;
-        private ILog log;
-        private IFileSystem fileSystem;
+        ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestCaseAttribute>();
+        var sp = ConfigureServices();
+        this.log = Substitute.For<ILog>();
+        this.fileSystem = sp.GetService<IFileSystem>();
+        this.variableProvider = sp.GetService<IVariableProvider>();
+    }
 
-        [SetUp]
-        public void Setup()
-        {
-            ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestCaseAttribute>();
-            var sp = ConfigureServices();
-            this.log = Substitute.For<ILog>();
-            this.fileSystem = sp.GetService<IFileSystem>();
-            this.variableProvider = sp.GetService<IVariableProvider>();
-        }
-
-        [TestCase(@"
+    [TestCase(@"
 <Project Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -40,18 +40,18 @@ public void Setup()
   </PropertyGroup>
 </Project>
 ")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void CanUpdateProjectFileWithStandardProjectFileXml(string xml)
-        {
-            using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void CanUpdateProjectFileWithStandardProjectFileXml(string xml)
+    {
+        using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
 
-            var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
+        var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
 
-            canUpdate.ShouldBe(true);
-        }
+        canUpdate.ShouldBe(true);
+    }
 
-        [TestCase(@"
+    [TestCase(@"
 <Project Sdk=""Microsoft.NET.Sdk.Worker"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -59,18 +59,18 @@ public void CanUpdateProjectFileWithStandardProjectFileXml(string xml)
   </PropertyGroup>
 </Project>
 ")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void CanUpdateProjectFileWithStandardWorkerProjectFileXml(string xml)
-        {
-            using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void CanUpdateProjectFileWithStandardWorkerProjectFileXml(string xml)
+    {
+        using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
 
-            var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
+        var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
 
-            canUpdate.ShouldBe(true);
-        }
+        canUpdate.ShouldBe(true);
+    }
 
-        [TestCase(@"
+    [TestCase(@"
 <Project Sdk=""Microsoft.NET.Sdk.Web"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -78,18 +78,18 @@ public void CanUpdateProjectFileWithStandardWorkerProjectFileXml(string xml)
   </PropertyGroup>
 </Project>
 ")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void CanUpdateProjectFileWithStandardWebProjectFileXml(string xml)
-        {
-            using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void CanUpdateProjectFileWithStandardWebProjectFileXml(string xml)
+    {
+        using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
 
-            var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
+        var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
 
-            canUpdate.ShouldBe(true);
-        }
+        canUpdate.ShouldBe(true);
+    }
 
-        [TestCase(@"
+    [TestCase(@"
 <Project Sdk=""Microsoft.NET.Sdk.WindowsDesktop"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -97,36 +97,36 @@ public void CanUpdateProjectFileWithStandardWebProjectFileXml(string xml)
   </PropertyGroup>
 </Project>
 ")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void CanUpdateProjectFileWithStandardDesktopProjectFileXml(string xml)
-        {
-            using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void CanUpdateProjectFileWithStandardDesktopProjectFileXml(string xml)
+    {
+        using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
 
-            var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
+        var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
 
-            canUpdate.ShouldBe(true);
-        }
+        canUpdate.ShouldBe(true);
+    }
 
-        [TestCase(@"
+    [TestCase(@"
 <Project Sdk=""Microsoft.NET.Sdk.Razor"">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 </Project>
 ")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void CanUpdateProjectFileWithRazorClassLibraryProjectFileXml(string xml)
-        {
-            using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void CanUpdateProjectFileWithRazorClassLibraryProjectFileXml(string xml)
+    {
+        using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
 
-            var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
+        var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
 
-            canUpdate.ShouldBe(true);
-        }
+        canUpdate.ShouldBe(true);
+    }
 
-        [TestCase(@"
+    [TestCase(@"
 <Project Sdk=""SomeOtherProject.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -134,18 +134,18 @@ public void CanUpdateProjectFileWithRazorClassLibraryProjectFileXml(string xml)
   </PropertyGroup>
 </Project>
 ")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void CannotUpdateProjectFileWithIncorrectProjectSdk(string xml)
-        {
-            using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void CannotUpdateProjectFileWithIncorrectProjectSdk(string xml)
+    {
+        using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
 
-            var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
+        var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
 
-            canUpdate.ShouldBe(false);
-        }
+        canUpdate.ShouldBe(false);
+    }
 
-        [TestCase(@"
+    [TestCase(@"
 <Project>
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -153,18 +153,18 @@ public void CannotUpdateProjectFileWithIncorrectProjectSdk(string xml)
   </PropertyGroup>
 </Project>
 ")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void CannotUpdateProjectFileWithMissingProjectSdk(string xml)
-        {
-            using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void CannotUpdateProjectFileWithMissingProjectSdk(string xml)
+    {
+        using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
 
-            var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
+        var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
 
-            canUpdate.ShouldBe(false);
-        }
+        canUpdate.ShouldBe(false);
+    }
 
-        [TestCase(@"
+    [TestCase(@"
 <Project Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -173,51 +173,51 @@ public void CannotUpdateProjectFileWithMissingProjectSdk(string xml)
   </PropertyGroup>
 </Project>
 ")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void CannotUpdateProjectFileWithoutAssemblyInfoGeneration(string xml)
-        {
-            using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void CannotUpdateProjectFileWithoutAssemblyInfoGeneration(string xml)
+    {
+        using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
 
-            var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
+        var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
 
-            canUpdate.ShouldBe(false);
-        }
+        canUpdate.ShouldBe(false);
+    }
 
-        [TestCase(@"
+    [TestCase(@"
 <Project Sdk=""Microsoft.NET.Sdk"">
 </Project>
 ")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void CannotUpdateProjectFileWithoutAPropertyGroup(string xml)
-        {
-            using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void CannotUpdateProjectFileWithoutAPropertyGroup(string xml)
+    {
+        using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
 
-            var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
+        var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
 
-            canUpdate.ShouldBe(false);
-        }
+        canUpdate.ShouldBe(false);
+    }
 
-        [TestCase(@"
+    [TestCase(@"
 <Project Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 </Project>"
-        )]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void UpdateProjectXmlVersionElementWithStandardXmlInsertsElement(string xml)
-        {
-            using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
+    )]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void UpdateProjectXmlVersionElementWithStandardXmlInsertsElement(string xml)
+    {
+        using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
 
-            var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
-            var xmlRoot = XElement.Parse(xml);
-            ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
+        var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
+        var xmlRoot = XElement.Parse(xml);
+        ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
 
-            var expectedXml = XElement.Parse(@"
+        var expectedXml = XElement.Parse(@"
 <Project Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -225,10 +225,10 @@ public void UpdateProjectXmlVersionElementWithStandardXmlInsertsElement(string x
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
   </PropertyGroup>
 </Project>");
-            xmlRoot.ToString().ShouldBe(expectedXml.ToString());
-        }
+        xmlRoot.ToString().ShouldBe(expectedXml.ToString());
+    }
 
-        [TestCase(@"
+    [TestCase(@"
 <Project Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -236,18 +236,18 @@ public void UpdateProjectXmlVersionElementWithStandardXmlInsertsElement(string x
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
   </PropertyGroup>
 </Project>"
-        )]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void UpdateProjectXmlVersionElementWithStandardXmlModifiesElement(string xml)
-        {
-            using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
+    )]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void UpdateProjectXmlVersionElementWithStandardXmlModifiesElement(string xml)
+    {
+        using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
 
-            var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
-            var xmlRoot = XElement.Parse(xml);
-            ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
+        var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
+        var xmlRoot = XElement.Parse(xml);
+        ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
 
-            var expectedXml = XElement.Parse(@"
+        var expectedXml = XElement.Parse(@"
 <Project Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -255,10 +255,10 @@ public void UpdateProjectXmlVersionElementWithStandardXmlModifiesElement(string
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
   </PropertyGroup>
 </Project>");
-            xmlRoot.ToString().ShouldBe(expectedXml.ToString());
-        }
+        xmlRoot.ToString().ShouldBe(expectedXml.ToString());
+    }
 
-        [TestCase(@"
+    [TestCase(@"
 <Project Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -269,18 +269,18 @@ public void UpdateProjectXmlVersionElementWithStandardXmlModifiesElement(string
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
   </PropertyGroup>
 </Project>"
-        )]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void UpdateProjectXmlVersionElementWithDuplicatePropertyGroupsModifiesLastElement(string xml)
-        {
-            using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
+    )]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void UpdateProjectXmlVersionElementWithDuplicatePropertyGroupsModifiesLastElement(string xml)
+    {
+        using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
 
-            var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
-            var xmlRoot = XElement.Parse(xml);
-            ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
+        var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
+        var xmlRoot = XElement.Parse(xml);
+        ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
 
-            var expectedXml = XElement.Parse(@"
+        var expectedXml = XElement.Parse(@"
 <Project Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -291,10 +291,10 @@ public void UpdateProjectXmlVersionElementWithDuplicatePropertyGroupsModifiesLas
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
   </PropertyGroup>
 </Project>");
-            xmlRoot.ToString().ShouldBe(expectedXml.ToString());
-        }
+        xmlRoot.ToString().ShouldBe(expectedXml.ToString());
+    }
 
-        [TestCase(@"
+    [TestCase(@"
 <Project Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -303,18 +303,18 @@ public void UpdateProjectXmlVersionElementWithDuplicatePropertyGroupsModifiesLas
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
   </PropertyGroup>
 </Project>"
-        )]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void UpdateProjectXmlVersionElementWithMultipleVersionElementsLastOneIsModified(string xml)
-        {
-            using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
+    )]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void UpdateProjectXmlVersionElementWithMultipleVersionElementsLastOneIsModified(string xml)
+    {
+        using var projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
 
-            var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
-            var xmlRoot = XElement.Parse(xml);
-            ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
+        var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
+        var xmlRoot = XElement.Parse(xml);
+        ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
 
-            var expectedXml = XElement.Parse(@"
+        var expectedXml = XElement.Parse(@"
 <Project Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -323,28 +323,28 @@ public void UpdateProjectXmlVersionElementWithMultipleVersionElementsLastOneIsMo
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
   </PropertyGroup>
 </Project>");
-            xmlRoot.ToString().ShouldBe(expectedXml.ToString());
-        }
+        xmlRoot.ToString().ShouldBe(expectedXml.ToString());
+    }
 
-        [TestCase(@"
+    [TestCase(@"
 <Project Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 </Project>")]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void UpdateProjectFileAddsVersionToFile(string xml)
-        {
-            var fileName = Path.Combine(Path.GetTempPath(), "TestProject.csproj");
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void UpdateProjectFileAddsVersionToFile(string xml)
+    {
+        var fileName = Path.Combine(Path.GetTempPath(), "TestProject.csproj");
 
-            VerifyAssemblyInfoFile(xml, fileName, AssemblyVersioningScheme.MajorMinorPatch, verify: (fs, variables) =>
-            {
-                using var projectFileUpdater = new ProjectFileUpdater(this.log, fs);
-                projectFileUpdater.Execute(variables, new AssemblyInfoContext(Path.GetTempPath(), false, fileName));
+        VerifyAssemblyInfoFile(xml, fileName, AssemblyVersioningScheme.MajorMinorPatch, verify: (fs, variables) =>
+        {
+            using var projectFileUpdater = new ProjectFileUpdater(this.log, fs);
+            projectFileUpdater.Execute(variables, new AssemblyInfoContext(Path.GetTempPath(), false, fileName));
 
-                var expectedXml = @"
+            var expectedXml = @"
 <Project Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -355,38 +355,37 @@ public void UpdateProjectFileAddsVersionToFile(string xml)
     <Version>2.3.1</Version>
   </PropertyGroup>
 </Project>";
-                var transformedXml = fs.ReadAllText(fileName);
-                transformedXml.ShouldBe(XElement.Parse(expectedXml).ToString());
-            });
-        }
-
-        private void VerifyAssemblyInfoFile(
-            string projectFileContent,
-            string fileName,
-            AssemblyVersioningScheme versioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
-            Action<IFileSystem, VersionVariables> verify = null)
+            var transformedXml = fs.ReadAllText(fileName);
+            transformedXml.ShouldBe(XElement.Parse(expectedXml).ToString());
+        });
+    }
+
+    private void VerifyAssemblyInfoFile(
+        string projectFileContent,
+        string fileName,
+        AssemblyVersioningScheme versioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
+        Action<IFileSystem, VersionVariables> verify = null)
+    {
+        this.fileSystem = Substitute.For<IFileSystem>();
+        var version = new SemanticVersion
+        {
+            BuildMetaData = new SemanticVersionBuildMetaData("versionSourceHash", 3, "foo", "hash", "shortHash", DateTimeOffset.Now, 0),
+            Major = 2,
+            Minor = 3,
+            Patch = 1
+        };
+
+        this.fileSystem.Exists(fileName).Returns(true);
+        this.fileSystem.ReadAllText(fileName).Returns(projectFileContent);
+        this.fileSystem.When(f => f.WriteAllText(fileName, Arg.Any<string>())).Do(c =>
         {
-            this.fileSystem = Substitute.For<IFileSystem>();
-            var version = new SemanticVersion
-            {
-                BuildMetaData = new SemanticVersionBuildMetaData("versionSourceHash", 3, "foo", "hash", "shortHash", DateTimeOffset.Now, 0),
-                Major = 2,
-                Minor = 3,
-                Patch = 1
-            };
-
-            this.fileSystem.Exists(fileName).Returns(true);
+            projectFileContent = c.ArgAt<string>(1);
             this.fileSystem.ReadAllText(fileName).Returns(projectFileContent);
-            this.fileSystem.When(f => f.WriteAllText(fileName, Arg.Any<string>())).Do(c =>
-            {
-                projectFileContent = c.ArgAt<string>(1);
-                this.fileSystem.ReadAllText(fileName).Returns(projectFileContent);
-            });
+        });
 
-            var config = new TestEffectiveConfiguration(assemblyVersioningScheme: versioningScheme);
-            var variables = this.variableProvider.GetVariablesFor(version, config, false);
+        var config = new TestEffectiveConfiguration(assemblyVersioningScheme: versioningScheme);
+        var variables = this.variableProvider.GetVariablesFor(version, config, false);
 
-            verify?.Invoke(this.fileSystem, variables);
-        }
+        verify?.Invoke(this.fileSystem, variables);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core.Tests/VersionConverters/WixFileTests.cs b/src/GitVersion.Core.Tests/VersionConverters/WixFileTests.cs
index 1791c45497..8d60aaf35e 100644
--- a/src/GitVersion.Core.Tests/VersionConverters/WixFileTests.cs
+++ b/src/GitVersion.Core.Tests/VersionConverters/WixFileTests.cs
@@ -9,103 +9,102 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.Core.Tests
+namespace GitVersion.Core.Tests;
+
+[TestFixture]
+[Parallelizable(ParallelScope.None)]
+internal class WixFileTests : TestBase
 {
-    [TestFixture]
-    [Parallelizable(ParallelScope.None)]
-    internal class WixFileTests : TestBase
-    {
-        [SetUp]
-        public void Setup() => ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
+    [SetUp]
+    public void Setup() => ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
 
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void UpdateWixVersionFile()
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void UpdateWixVersionFile()
+    {
+        var workingDir = Path.GetTempPath();
+        var semVer = new SemanticVersion
         {
-            var workingDir = Path.GetTempPath();
-            var semVer = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                BuildMetaData = "5.Branch.develop"
-            };
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            BuildMetaData = "5.Branch.develop"
+        };
 
-            semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
-            semVer.BuildMetaData.Sha = "commitSha";
-            semVer.BuildMetaData.ShortSha = "commitShortSha";
-            semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2019-02-20 23:59:59Z");
+        semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
+        semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
+        semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2019-02-20 23:59:59Z");
 
-            var config = new TestEffectiveConfiguration(buildMetaDataPadding: 2, legacySemVerPadding: 5);
+        var config = new TestEffectiveConfiguration(buildMetaDataPadding: 2, legacySemVerPadding: 5);
 
-            var stringBuilder = new StringBuilder();
-            void Action(string s) => stringBuilder.AppendLine(s);
+        var stringBuilder = new StringBuilder();
+        void Action(string s) => stringBuilder.AppendLine(s);
 
-            var logAppender = new TestLogAppender(Action);
-            var log = new Log(logAppender);
+        var logAppender = new TestLogAppender(Action);
+        var log = new Log(logAppender);
 
-            var sp = ConfigureServices(service => service.AddSingleton<ILog>(log));
+        var sp = ConfigureServices(service => service.AddSingleton<ILog>(log));
 
-            var fileSystem = sp.GetService<IFileSystem>();
-            var variableProvider = sp.GetService<IVariableProvider>();
-            var versionVariables = variableProvider.GetVariablesFor(semVer, config, false);
+        var fileSystem = sp.GetService<IFileSystem>();
+        var variableProvider = sp.GetService<IVariableProvider>();
+        var versionVariables = variableProvider.GetVariablesFor(semVer, config, false);
 
-            using var wixVersionFileUpdater = sp.GetService<IWixVersionFileUpdater>();
+        using var wixVersionFileUpdater = sp.GetService<IWixVersionFileUpdater>();
 
-            wixVersionFileUpdater.Execute(versionVariables, new WixVersionContext(workingDir));
+        wixVersionFileUpdater.Execute(versionVariables, new WixVersionContext(workingDir));
 
-            var file = Path.Combine(workingDir, WixVersionFileUpdater.WixVersionFileName);
-            fileSystem
-                .ReadAllText(file)
-                .ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved")));
-        }
+        var file = Path.Combine(workingDir, WixVersionFileUpdater.WixVersionFileName);
+        fileSystem
+            .ReadAllText(file)
+            .ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved")));
+    }
 
-        [Test]
-        [Category(NoMono)]
-        [Description(NoMonoDescription)]
-        public void UpdateWixVersionFileWhenFileAlreadyExists()
+    [Test]
+    [Category(NoMono)]
+    [Description(NoMonoDescription)]
+    public void UpdateWixVersionFileWhenFileAlreadyExists()
+    {
+        var workingDir = Path.GetTempPath();
+        var semVer = new SemanticVersion
         {
-            var workingDir = Path.GetTempPath();
-            var semVer = new SemanticVersion
-            {
-                Major = 1,
-                Minor = 2,
-                Patch = 3,
-                BuildMetaData = "5.Branch.develop"
-            };
-
-            semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
-            semVer.BuildMetaData.Sha = "commitSha";
-            semVer.BuildMetaData.ShortSha = "commitShortSha";
-            semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2019-02-20 23:59:59Z");
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            BuildMetaData = "5.Branch.develop"
+        };
 
-            var config = new TestEffectiveConfiguration(buildMetaDataPadding: 2, legacySemVerPadding: 5);
+        semVer.BuildMetaData.VersionSourceSha = "versionSourceSha";
+        semVer.BuildMetaData.Sha = "commitSha";
+        semVer.BuildMetaData.ShortSha = "commitShortSha";
+        semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2019-02-20 23:59:59Z");
 
-            var stringBuilder = new StringBuilder();
-            void Action(string s) => stringBuilder.AppendLine(s);
+        var config = new TestEffectiveConfiguration(buildMetaDataPadding: 2, legacySemVerPadding: 5);
 
-            var logAppender = new TestLogAppender(Action);
-            var log = new Log(logAppender);
+        var stringBuilder = new StringBuilder();
+        void Action(string s) => stringBuilder.AppendLine(s);
 
-            var sp = ConfigureServices(service => service.AddSingleton<ILog>(log));
+        var logAppender = new TestLogAppender(Action);
+        var log = new Log(logAppender);
 
-            var fileSystem = sp.GetService<IFileSystem>();
-            var variableProvider = sp.GetService<IVariableProvider>();
-            var versionVariables = variableProvider.GetVariablesFor(semVer, config, false);
+        var sp = ConfigureServices(service => service.AddSingleton<ILog>(log));
 
-            using var wixVersionFileUpdater = sp.GetService<IWixVersionFileUpdater>();
+        var fileSystem = sp.GetService<IFileSystem>();
+        var variableProvider = sp.GetService<IVariableProvider>();
+        var versionVariables = variableProvider.GetVariablesFor(semVer, config, false);
 
-            // fake an already existing file
-            var file = Path.Combine(workingDir, WixVersionFileUpdater.WixVersionFileName);
-            fileSystem.WriteAllText(file, new string('x', 1024 * 1024));
+        using var wixVersionFileUpdater = sp.GetService<IWixVersionFileUpdater>();
 
-            wixVersionFileUpdater.Execute(versionVariables, new WixVersionContext(workingDir));
+        // fake an already existing file
+        var file = Path.Combine(workingDir, WixVersionFileUpdater.WixVersionFileName);
+        fileSystem.WriteAllText(file, new string('x', 1024 * 1024));
 
-            fileSystem
-                .ReadAllText(file)
-                .ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved")));
-        }
+        wixVersionFileUpdater.Execute(versionVariables, new WixVersionContext(workingDir));
 
+        fileSystem
+            .ReadAllText(file)
+            .ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved")));
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgent.cs b/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgent.cs
index e187972c3e..d7e1a9ed61 100644
--- a/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgent.cs
+++ b/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgent.cs
@@ -1,16 +1,15 @@
 using System;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.BuildAgents
-{
-    public interface IBuildAgent
-    {
-        bool CanApplyToCurrentContext();
-        void WriteIntegration(Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true);
-        string? GetCurrentBranch(bool usingDynamicRepos);
-        bool PreventFetch();
-        bool ShouldCleanUpRemotes();
-    }
+namespace GitVersion.BuildAgents;
 
-    public interface ICurrentBuildAgent : IBuildAgent { }
+public interface IBuildAgent
+{
+    bool CanApplyToCurrentContext();
+    void WriteIntegration(Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true);
+    string? GetCurrentBranch(bool usingDynamicRepos);
+    bool PreventFetch();
+    bool ShouldCleanUpRemotes();
 }
+
+public interface ICurrentBuildAgent : IBuildAgent { }
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgentResolver.cs b/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgentResolver.cs
index 3235f9dbba..0e725757d5 100644
--- a/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgentResolver.cs
+++ b/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgentResolver.cs
@@ -1,7 +1,6 @@
-namespace GitVersion.BuildAgents
+namespace GitVersion.BuildAgents;
+
+public interface IBuildAgentResolver
 {
-    public interface IBuildAgentResolver
-    {
-        ICurrentBuildAgent? Resolve();
-    }
-}
+    ICurrentBuildAgent? Resolve();
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/AppVeyor.cs b/src/GitVersion.Core/BuildAgents/AppVeyor.cs
index d68e743d1a..24b1bb6d3e 100644
--- a/src/GitVersion.Core/BuildAgents/AppVeyor.cs
+++ b/src/GitVersion.Core/BuildAgents/AppVeyor.cs
@@ -6,77 +6,76 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.BuildAgents
+namespace GitVersion.BuildAgents;
+
+public class AppVeyor : BuildAgentBase
 {
-    public class AppVeyor : BuildAgentBase
+    public AppVeyor(IEnvironment environment, ILog log) : base(environment, log)
     {
-        public AppVeyor(IEnvironment environment, ILog log) : base(environment, log)
-        {
-        }
+    }
+
+    public const string EnvironmentVariableName = "APPVEYOR";
 
-        public const string EnvironmentVariableName = "APPVEYOR";
+    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
 
-        protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    public override string GenerateSetVersionMessage(VersionVariables variables)
+    {
+        var buildNumber = Environment.GetEnvironmentVariable("APPVEYOR_BUILD_NUMBER");
+
+        using var httpClient = GetHttpClient();
 
-        public override string GenerateSetVersionMessage(VersionVariables variables)
+        var body = new
         {
-            var buildNumber = Environment.GetEnvironmentVariable("APPVEYOR_BUILD_NUMBER");
+            version = $"{variables.FullSemVer}.build.{buildNumber}",
+        };
 
-            using var httpClient = GetHttpClient();
+        var stringContent = new StringContent(JsonSerializer.Serialize(body), Encoding.UTF8, "application/json");
+        var response = httpClient.PutAsync("api/build", stringContent).GetAwaiter().GetResult();
+        response.EnsureSuccessStatusCode();
 
-            var body = new
-            {
-                version = $"{variables.FullSemVer}.build.{buildNumber}",
-            };
+        return $"Set AppVeyor build number to '{variables.FullSemVer}'.";
+    }
 
-            var stringContent = new StringContent(JsonSerializer.Serialize(body), Encoding.UTF8, "application/json");
-            var response = httpClient.PutAsync("api/build", stringContent).GetAwaiter().GetResult();
-            response.EnsureSuccessStatusCode();
+    public override string[] GenerateSetParameterMessage(string name, string value)
+    {
+        var httpClient = GetHttpClient();
 
-            return $"Set AppVeyor build number to '{variables.FullSemVer}'.";
-        }
+        var body = new
+        {
+            name = $"GitVersion_{name}",
+            value = $"{value}"
+        };
+
+        var stringContent = new StringContent(JsonSerializer.Serialize(body), Encoding.UTF8, "application/json");
+        var response = httpClient.PostAsync("api/build/variables", stringContent).GetAwaiter().GetResult();
+        response.EnsureSuccessStatusCode();
 
-        public override string[] GenerateSetParameterMessage(string name, string value)
+        return new[]
         {
-            var httpClient = GetHttpClient();
-
-            var body = new
-            {
-                name = $"GitVersion_{name}",
-                value = $"{value}"
-            };
-
-            var stringContent = new StringContent(JsonSerializer.Serialize(body), Encoding.UTF8, "application/json");
-            var response = httpClient.PostAsync("api/build/variables", stringContent).GetAwaiter().GetResult();
-            response.EnsureSuccessStatusCode();
-
-            return new[]
-            {
-                $"Adding Environment Variable. name='GitVersion_{name}' value='{value}']"
-            };
-        }
+            $"Adding Environment Variable. name='GitVersion_{name}' value='{value}']"
+        };
+    }
 
-        private HttpClient GetHttpClient()
+    private HttpClient GetHttpClient()
+    {
+        var httpClient = new HttpClient
         {
-            var httpClient = new HttpClient
-            {
-                BaseAddress = new Uri(Environment.GetEnvironmentVariable("APPVEYOR_API_URL"))
-            };
+            BaseAddress = new Uri(Environment.GetEnvironmentVariable("APPVEYOR_API_URL"))
+        };
 
-            return httpClient;
-        }
+        return httpClient;
+    }
 
 
-        public override string? GetCurrentBranch(bool usingDynamicRepos)
+    public override string? GetCurrentBranch(bool usingDynamicRepos)
+    {
+        var pullRequestBranchName = Environment.GetEnvironmentVariable("APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH");
+        if (!pullRequestBranchName.IsNullOrWhiteSpace())
         {
-            var pullRequestBranchName = Environment.GetEnvironmentVariable("APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH");
-            if (!pullRequestBranchName.IsNullOrWhiteSpace())
-            {
-                return pullRequestBranchName;
-            }
-            return Environment.GetEnvironmentVariable("APPVEYOR_REPO_BRANCH");
+            return pullRequestBranchName;
         }
-
-        public override bool PreventFetch() => false;
+        return Environment.GetEnvironmentVariable("APPVEYOR_REPO_BRANCH");
     }
-}
+
+    public override bool PreventFetch() => false;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/AzurePipelines.cs b/src/GitVersion.Core/BuildAgents/AzurePipelines.cs
index a95066e345..ae44403749 100644
--- a/src/GitVersion.Core/BuildAgents/AzurePipelines.cs
+++ b/src/GitVersion.Core/BuildAgents/AzurePipelines.cs
@@ -5,56 +5,55 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.BuildAgents
+namespace GitVersion.BuildAgents;
+
+public class AzurePipelines : BuildAgentBase
 {
-    public class AzurePipelines : BuildAgentBase
+    public AzurePipelines(IEnvironment environment, ILog log) : base(environment, log)
     {
-        public AzurePipelines(IEnvironment environment, ILog log) : base(environment, log)
-        {
-        }
-
-        public const string EnvironmentVariableName = "TF_BUILD";
+    }
 
-        protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    public const string EnvironmentVariableName = "TF_BUILD";
 
-        public override string[] GenerateSetParameterMessage(string name, string value) => new[]
-            {
-                $"##vso[task.setvariable variable=GitVersion.{name}]{value}",
-                $"##vso[task.setvariable variable=GitVersion.{name};isOutput=true]{value}"
-            };
+    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
 
-        public override string? GetCurrentBranch(bool usingDynamicRepos) => Environment.GetEnvironmentVariable("BUILD_SOURCEBRANCH");
+    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    {
+        $"##vso[task.setvariable variable=GitVersion.{name}]{value}",
+        $"##vso[task.setvariable variable=GitVersion.{name};isOutput=true]{value}"
+    };
 
-        public override bool PreventFetch() => true;
+    public override string? GetCurrentBranch(bool usingDynamicRepos) => Environment.GetEnvironmentVariable("BUILD_SOURCEBRANCH");
 
-        public override string GenerateSetVersionMessage(VersionVariables variables)
-        {
-            // For AzurePipelines, we'll get the Build Number and insert GitVersion variables where
-            // specified
-            var buildNumberEnv = Environment.GetEnvironmentVariable("BUILD_BUILDNUMBER");
-            if (buildNumberEnv.IsNullOrWhiteSpace())
-                return variables.FullSemVer;
+    public override bool PreventFetch() => true;
 
-            var newBuildNumber = variables.Aggregate(buildNumberEnv, ReplaceVariables);
+    public override string GenerateSetVersionMessage(VersionVariables variables)
+    {
+        // For AzurePipelines, we'll get the Build Number and insert GitVersion variables where
+        // specified
+        var buildNumberEnv = Environment.GetEnvironmentVariable("BUILD_BUILDNUMBER");
+        if (buildNumberEnv.IsNullOrWhiteSpace())
+            return variables.FullSemVer;
 
-            // If no variable substitution has happened, use FullSemVer
-            if (buildNumberEnv == newBuildNumber)
-            {
-                var buildNumber = variables.FullSemVer.EndsWith("+0")
-                                ? variables.FullSemVer.Substring(0, variables.FullSemVer.Length - 2)
-                                : variables.FullSemVer;
+        var newBuildNumber = variables.Aggregate(buildNumberEnv, ReplaceVariables);
 
-                return $"##vso[build.updatebuildnumber]{buildNumber}";
-            }
+        // If no variable substitution has happened, use FullSemVer
+        if (buildNumberEnv == newBuildNumber)
+        {
+            var buildNumber = variables.FullSemVer.EndsWith("+0")
+                ? variables.FullSemVer.Substring(0, variables.FullSemVer.Length - 2)
+                : variables.FullSemVer;
 
-            return $"##vso[build.updatebuildnumber]{newBuildNumber}";
+            return $"##vso[build.updatebuildnumber]{buildNumber}";
         }
 
-        private static string ReplaceVariables(string buildNumberEnv, KeyValuePair<string, string> variable)
-        {
-            var pattern = $@"\$\(GITVERSION[_\.]{variable.Key}\)";
-            var replacement = variable.Value ?? string.Empty;
-            return buildNumberEnv.RegexReplace(pattern, replacement, RegexOptions.IgnoreCase);
-        }
+        return $"##vso[build.updatebuildnumber]{newBuildNumber}";
+    }
+
+    private static string ReplaceVariables(string buildNumberEnv, KeyValuePair<string, string> variable)
+    {
+        var pattern = $@"\$\(GITVERSION[_\.]{variable.Key}\)";
+        var replacement = variable.Value ?? string.Empty;
+        return buildNumberEnv.RegexReplace(pattern, replacement, RegexOptions.IgnoreCase);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/BuildAgentBase.cs b/src/GitVersion.Core/BuildAgents/BuildAgentBase.cs
index 489ae54af8..ad1a27a5ed 100644
--- a/src/GitVersion.Core/BuildAgents/BuildAgentBase.cs
+++ b/src/GitVersion.Core/BuildAgents/BuildAgentBase.cs
@@ -4,60 +4,59 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.BuildAgents
+namespace GitVersion.BuildAgents;
+
+public abstract class BuildAgentBase : ICurrentBuildAgent
 {
-    public abstract class BuildAgentBase : ICurrentBuildAgent
-    {
-        protected readonly ILog Log;
-        protected IEnvironment Environment { get; }
+    protected readonly ILog Log;
+    protected IEnvironment Environment { get; }
 
-        protected BuildAgentBase(IEnvironment environment, ILog log)
-        {
-            this.Log = log;
-            Environment = environment;
-        }
+    protected BuildAgentBase(IEnvironment environment, ILog log)
+    {
+        this.Log = log;
+        Environment = environment;
+    }
 
-        protected abstract string EnvironmentVariable { get; }
+    protected abstract string EnvironmentVariable { get; }
 
-        public abstract string? GenerateSetVersionMessage(VersionVariables variables);
-        public abstract string[] GenerateSetParameterMessage(string name, string value);
+    public abstract string? GenerateSetVersionMessage(VersionVariables variables);
+    public abstract string[] GenerateSetParameterMessage(string name, string value);
 
-        public virtual bool CanApplyToCurrentContext() => !Environment.GetEnvironmentVariable(EnvironmentVariable).IsNullOrEmpty();
+    public virtual bool CanApplyToCurrentContext() => !Environment.GetEnvironmentVariable(EnvironmentVariable).IsNullOrEmpty();
 
-        public virtual string? GetCurrentBranch(bool usingDynamicRepos) => null;
+    public virtual string? GetCurrentBranch(bool usingDynamicRepos) => null;
 
-        public virtual bool PreventFetch() => true;
-        public virtual bool ShouldCleanUpRemotes() => false;
+    public virtual bool PreventFetch() => true;
+    public virtual bool ShouldCleanUpRemotes() => false;
 
-        public virtual void WriteIntegration(Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true)
+    public virtual void WriteIntegration(Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true)
+    {
+        if (writer == null)
         {
-            if (writer == null)
-            {
-                return;
-            }
-
-            if (updateBuildNumber)
-            {
-                writer($"Executing GenerateSetVersionMessage for '{GetType().Name}'.");
-                writer(GenerateSetVersionMessage(variables));
-            }
-            writer($"Executing GenerateBuildLogOutput for '{GetType().Name}'.");
-            foreach (var buildParameter in GenerateBuildLogOutput(variables))
-            {
-                writer(buildParameter);
-            }
+            return;
         }
 
-        protected IEnumerable<string> GenerateBuildLogOutput(VersionVariables variables)
+        if (updateBuildNumber)
         {
-            var output = new List<string>();
+            writer($"Executing GenerateSetVersionMessage for '{GetType().Name}'.");
+            writer(GenerateSetVersionMessage(variables));
+        }
+        writer($"Executing GenerateBuildLogOutput for '{GetType().Name}'.");
+        foreach (var buildParameter in GenerateBuildLogOutput(variables))
+        {
+            writer(buildParameter);
+        }
+    }
 
-            foreach (var variable in variables)
-            {
-                output.AddRange(GenerateSetParameterMessage(variable.Key, variable.Value));
-            }
+    protected IEnumerable<string> GenerateBuildLogOutput(VersionVariables variables)
+    {
+        var output = new List<string>();
 
-            return output;
+        foreach (var variable in variables)
+        {
+            output.AddRange(GenerateSetParameterMessage(variable.Key, variable.Value));
         }
+
+        return output;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/BuildAgentResolver.cs b/src/GitVersion.Core/BuildAgents/BuildAgentResolver.cs
index 4f19d2e86b..843fbac3b7 100644
--- a/src/GitVersion.Core/BuildAgents/BuildAgentResolver.cs
+++ b/src/GitVersion.Core/BuildAgents/BuildAgentResolver.cs
@@ -2,38 +2,37 @@
 using System.Collections.Generic;
 using GitVersion.Logging;
 
-namespace GitVersion.BuildAgents
+namespace GitVersion.BuildAgents;
+
+public class BuildAgentResolver : IBuildAgentResolver
 {
-    public class BuildAgentResolver : IBuildAgentResolver
+    private readonly IEnumerable<IBuildAgent> buildAgents;
+    private readonly ILog log;
+    public BuildAgentResolver(IEnumerable<IBuildAgent> buildAgents, ILog log)
     {
-        private readonly IEnumerable<IBuildAgent> buildAgents;
-        private readonly ILog log;
-        public BuildAgentResolver(IEnumerable<IBuildAgent> buildAgents, ILog log)
-        {
-            this.log = log;
-            this.buildAgents = buildAgents ?? Array.Empty<IBuildAgent>();
-        }
+        this.log = log;
+        this.buildAgents = buildAgents ?? Array.Empty<IBuildAgent>();
+    }
 
-        public ICurrentBuildAgent? Resolve()
+    public ICurrentBuildAgent? Resolve()
+    {
+        ICurrentBuildAgent? instance = null;
+        foreach (var buildAgent in this.buildAgents)
         {
-            ICurrentBuildAgent? instance = null;
-            foreach (var buildAgent in this.buildAgents)
+            var agentName = buildAgent.GetType().Name;
+            try
             {
-                var agentName = buildAgent.GetType().Name;
-                try
-                {
-                    if (!buildAgent.CanApplyToCurrentContext()) continue;
+                if (!buildAgent.CanApplyToCurrentContext()) continue;
 
-                    this.log.Info($"Applicable build agent found: '{agentName}'.");
-                    instance = (ICurrentBuildAgent)buildAgent;
-                }
-                catch (Exception ex)
-                {
-                    this.log.Warning($"Failed to check build agent '{agentName}': {ex.Message}");
-                }
+                this.log.Info($"Applicable build agent found: '{agentName}'.");
+                instance = (ICurrentBuildAgent)buildAgent;
+            }
+            catch (Exception ex)
+            {
+                this.log.Warning($"Failed to check build agent '{agentName}': {ex.Message}");
             }
-
-            return instance;
         }
+
+        return instance;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/BuildServerModule.cs b/src/GitVersion.Core/BuildAgents/BuildServerModule.cs
index e5756df823..cd43a37466 100644
--- a/src/GitVersion.Core/BuildAgents/BuildServerModule.cs
+++ b/src/GitVersion.Core/BuildAgents/BuildServerModule.cs
@@ -1,23 +1,22 @@
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GitVersion.BuildAgents
+namespace GitVersion.BuildAgents;
+
+public class BuildServerModule : GitVersionModule
 {
-    public class BuildServerModule : GitVersionModule
+    public override void RegisterTypes(IServiceCollection services)
     {
-        public override void RegisterTypes(IServiceCollection services)
-        {
-            var buildAgents = FindAllDerivedTypes<BuildAgentBase>(Assembly.GetAssembly(GetType()));
+        var buildAgents = FindAllDerivedTypes<BuildAgentBase>(Assembly.GetAssembly(GetType()));
 
-            foreach (var buildAgent in buildAgents)
-            {
-                services.AddSingleton(typeof(IBuildAgent), buildAgent);
-            }
+        foreach (var buildAgent in buildAgents)
+        {
+            services.AddSingleton(typeof(IBuildAgent), buildAgent);
+        }
 
-            services.AddSingleton<IBuildAgentResolver, BuildAgentResolver>();
+        services.AddSingleton<IBuildAgentResolver, BuildAgentResolver>();
 #pragma warning disable CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint.
-            services.AddSingleton(sp => sp.GetService<IBuildAgentResolver>()?.Resolve());
+        services.AddSingleton(sp => sp.GetService<IBuildAgentResolver>()?.Resolve());
 #pragma warning restore CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint.
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/CodeBuild.cs b/src/GitVersion.Core/BuildAgents/CodeBuild.cs
index f234fb9fc2..256d6707e0 100644
--- a/src/GitVersion.Core/BuildAgents/CodeBuild.cs
+++ b/src/GitVersion.Core/BuildAgents/CodeBuild.cs
@@ -4,50 +4,49 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.BuildAgents
-{
-    public sealed class CodeBuild : BuildAgentBase
-    {
-        private string? file;
-        public const string WebHookEnvironmentVariableName = "CODEBUILD_WEBHOOK_HEAD_REF";
-        public const string SourceVersionEnvironmentVariableName = "CODEBUILD_SOURCE_VERSION";
-
-        public CodeBuild(IEnvironment environment, ILog log) : base(environment, log) => WithPropertyFile("gitversion.properties");
+namespace GitVersion.BuildAgents;
 
-        public void WithPropertyFile(string propertiesFileName) => this.file = propertiesFileName;
+public sealed class CodeBuild : BuildAgentBase
+{
+    private string? file;
+    public const string WebHookEnvironmentVariableName = "CODEBUILD_WEBHOOK_HEAD_REF";
+    public const string SourceVersionEnvironmentVariableName = "CODEBUILD_SOURCE_VERSION";
 
-        protected override string EnvironmentVariable => throw new NotSupportedException($"Accessing {nameof(EnvironmentVariable)} is not supported as {nameof(CodeBuild)} supports two environment variables for branch names.");
+    public CodeBuild(IEnvironment environment, ILog log) : base(environment, log) => WithPropertyFile("gitversion.properties");
 
-        public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
+    public void WithPropertyFile(string propertiesFileName) => this.file = propertiesFileName;
 
-        public override string[] GenerateSetParameterMessage(string name, string value) => new[]
-            {
-                $"GitVersion_{name}={value}"
-            };
+    protected override string EnvironmentVariable => throw new NotSupportedException($"Accessing {nameof(EnvironmentVariable)} is not supported as {nameof(CodeBuild)} supports two environment variables for branch names.");
 
-        public override string? GetCurrentBranch(bool usingDynamicRepos)
-        {
+    public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
 
-            var currentBranch = Environment.GetEnvironmentVariable(WebHookEnvironmentVariableName);
+    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    {
+        $"GitVersion_{name}={value}"
+    };
 
-            if (currentBranch.IsNullOrEmpty())
-            {
-                return Environment.GetEnvironmentVariable(SourceVersionEnvironmentVariableName);
-            }
+    public override string? GetCurrentBranch(bool usingDynamicRepos)
+    {
 
-            return currentBranch;
-        }
+        var currentBranch = Environment.GetEnvironmentVariable(WebHookEnvironmentVariableName);
 
-        public override void WriteIntegration(Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true)
+        if (currentBranch.IsNullOrEmpty())
         {
-            base.WriteIntegration(writer, variables, updateBuildNumber);
-            writer($"Outputting variables to '{this.file}' ... ");
-            File.WriteAllLines(this.file, GenerateBuildLogOutput(variables));
+            return Environment.GetEnvironmentVariable(SourceVersionEnvironmentVariableName);
         }
 
-        public override bool PreventFetch() => true;
+        return currentBranch;
+    }
 
-        public override bool CanApplyToCurrentContext()
-            => !Environment.GetEnvironmentVariable(WebHookEnvironmentVariableName).IsNullOrEmpty() || !Environment.GetEnvironmentVariable(SourceVersionEnvironmentVariableName).IsNullOrEmpty();
+    public override void WriteIntegration(Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true)
+    {
+        base.WriteIntegration(writer, variables, updateBuildNumber);
+        writer($"Outputting variables to '{this.file}' ... ");
+        File.WriteAllLines(this.file, GenerateBuildLogOutput(variables));
     }
-}
+
+    public override bool PreventFetch() => true;
+
+    public override bool CanApplyToCurrentContext()
+        => !Environment.GetEnvironmentVariable(WebHookEnvironmentVariableName).IsNullOrEmpty() || !Environment.GetEnvironmentVariable(SourceVersionEnvironmentVariableName).IsNullOrEmpty();
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/ContinuaCi.cs b/src/GitVersion.Core/BuildAgents/ContinuaCi.cs
index 4654744ccc..7feab42186 100644
--- a/src/GitVersion.Core/BuildAgents/ContinuaCi.cs
+++ b/src/GitVersion.Core/BuildAgents/ContinuaCi.cs
@@ -1,25 +1,24 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.BuildAgents
+namespace GitVersion.BuildAgents;
+
+public class ContinuaCi : BuildAgentBase
 {
-    public class ContinuaCi : BuildAgentBase
+    public ContinuaCi(IEnvironment environment, ILog log) : base(environment, log)
     {
-        public ContinuaCi(IEnvironment environment, ILog log) : base(environment, log)
-        {
-        }
+    }
 
-        public const string EnvironmentVariableName = "ContinuaCI.Version";
+    public const string EnvironmentVariableName = "ContinuaCI.Version";
 
-        protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
 
-        public override string[] GenerateSetParameterMessage(string name, string value) => new[]
-            {
-                $"@@continua[setVariable name='GitVersion_{name}' value='{value}' skipIfNotDefined='true']"
-            };
+    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    {
+        $"@@continua[setVariable name='GitVersion_{name}' value='{value}' skipIfNotDefined='true']"
+    };
 
-        public override string GenerateSetVersionMessage(VersionVariables variables) => $"@@continua[setBuildVersion value='{variables.FullSemVer}']";
+    public override string GenerateSetVersionMessage(VersionVariables variables) => $"@@continua[setBuildVersion value='{variables.FullSemVer}']";
 
-        public override bool PreventFetch() => false;
-    }
-}
+    public override bool PreventFetch() => false;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/Drone.cs b/src/GitVersion.Core/BuildAgents/Drone.cs
index b7ba2e8f67..8db3ced3fc 100644
--- a/src/GitVersion.Core/BuildAgents/Drone.cs
+++ b/src/GitVersion.Core/BuildAgents/Drone.cs
@@ -3,55 +3,54 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.BuildAgents
+namespace GitVersion.BuildAgents;
+
+public class Drone : BuildAgentBase
 {
-    public class Drone : BuildAgentBase
+    public Drone(IEnvironment environment, ILog log) : base(environment, log)
     {
-        public Drone(IEnvironment environment, ILog log) : base(environment, log)
-        {
-        }
+    }
 
-        public const string EnvironmentVariableName = "DRONE";
-        protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
-        public override bool CanApplyToCurrentContext() => Environment.GetEnvironmentVariable(EnvironmentVariable)?.Equals("true", StringComparison.OrdinalIgnoreCase) ?? false;
+    public const string EnvironmentVariableName = "DRONE";
+    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    public override bool CanApplyToCurrentContext() => Environment.GetEnvironmentVariable(EnvironmentVariable)?.Equals("true", StringComparison.OrdinalIgnoreCase) ?? false;
 
-        public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
+    public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
 
-        public override string[] GenerateSetParameterMessage(string name, string value) => new[]
-            {
-                $"GitVersion_{name}={value}"
-            };
+    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    {
+        $"GitVersion_{name}={value}"
+    };
 
-        public override string? GetCurrentBranch(bool usingDynamicRepos)
+    public override string? GetCurrentBranch(bool usingDynamicRepos)
+    {
+        // In Drone DRONE_BRANCH variable is equal to destination branch in case of pull request
+        // https://discourse.drone.io/t/getting-the-branch-a-pull-request-is-created-from/670
+        // Unfortunately, DRONE_REFSPEC isn't populated, however CI_COMMIT_REFSPEC can be used instead of.
+        var pullRequestNumber = Environment.GetEnvironmentVariable("DRONE_PULL_REQUEST");
+        if (!pullRequestNumber.IsNullOrWhiteSpace())
         {
-            // In Drone DRONE_BRANCH variable is equal to destination branch in case of pull request
-            // https://discourse.drone.io/t/getting-the-branch-a-pull-request-is-created-from/670
-            // Unfortunately, DRONE_REFSPEC isn't populated, however CI_COMMIT_REFSPEC can be used instead of.
-            var pullRequestNumber = Environment.GetEnvironmentVariable("DRONE_PULL_REQUEST");
-            if (!pullRequestNumber.IsNullOrWhiteSpace())
+            // DRONE_SOURCE_BRANCH is available in Drone 1.x.x version
+            var sourceBranch = Environment.GetEnvironmentVariable("DRONE_SOURCE_BRANCH");
+            if (!sourceBranch.IsNullOrWhiteSpace())
+                return sourceBranch;
+
+            // In drone lower than 1.x.x source branch can be parsed from CI_COMMIT_REFSPEC
+            // CI_COMMIT_REFSPEC - {sourceBranch}:{destinationBranch}
+            // https://github.com/drone/drone/issues/2222
+            var ciCommitRefSpec = Environment.GetEnvironmentVariable("CI_COMMIT_REFSPEC");
+            if (!ciCommitRefSpec.IsNullOrWhiteSpace())
             {
-                // DRONE_SOURCE_BRANCH is available in Drone 1.x.x version
-                var sourceBranch = Environment.GetEnvironmentVariable("DRONE_SOURCE_BRANCH");
-                if (!sourceBranch.IsNullOrWhiteSpace())
-                    return sourceBranch;
-
-                // In drone lower than 1.x.x source branch can be parsed from CI_COMMIT_REFSPEC
-                // CI_COMMIT_REFSPEC - {sourceBranch}:{destinationBranch}
-                // https://github.com/drone/drone/issues/2222
-                var ciCommitRefSpec = Environment.GetEnvironmentVariable("CI_COMMIT_REFSPEC");
-                if (!ciCommitRefSpec.IsNullOrWhiteSpace())
+                var colonIndex = ciCommitRefSpec.IndexOf(':');
+                if (colonIndex > 0)
                 {
-                    var colonIndex = ciCommitRefSpec.IndexOf(':');
-                    if (colonIndex > 0)
-                    {
-                        return ciCommitRefSpec.Substring(0, colonIndex);
-                    }
+                    return ciCommitRefSpec.Substring(0, colonIndex);
                 }
             }
-
-            return Environment.GetEnvironmentVariable("DRONE_BRANCH");
         }
 
-        public override bool PreventFetch() => false;
+        return Environment.GetEnvironmentVariable("DRONE_BRANCH");
     }
-}
+
+    public override bool PreventFetch() => false;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/EnvRun.cs b/src/GitVersion.Core/BuildAgents/EnvRun.cs
index 201eabb076..5fd601d811 100644
--- a/src/GitVersion.Core/BuildAgents/EnvRun.cs
+++ b/src/GitVersion.Core/BuildAgents/EnvRun.cs
@@ -3,39 +3,38 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.BuildAgents
+namespace GitVersion.BuildAgents;
+
+public class EnvRun : BuildAgentBase
 {
-    public class EnvRun : BuildAgentBase
+    public EnvRun(IEnvironment environment, ILog log) : base(environment, log)
     {
-        public EnvRun(IEnvironment environment, ILog log) : base(environment, log)
-        {
-        }
+    }
 
-        public const string EnvironmentVariableName = "ENVRUN_DATABASE";
-        protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
-        public override bool CanApplyToCurrentContext()
+    public const string EnvironmentVariableName = "ENVRUN_DATABASE";
+    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    public override bool CanApplyToCurrentContext()
+    {
+        var envRunDatabasePath = Environment.GetEnvironmentVariable(EnvironmentVariableName);
+        if (!envRunDatabasePath.IsNullOrEmpty())
         {
-            var envRunDatabasePath = Environment.GetEnvironmentVariable(EnvironmentVariableName);
-            if (!envRunDatabasePath.IsNullOrEmpty())
+            if (!File.Exists(envRunDatabasePath))
             {
-                if (!File.Exists(envRunDatabasePath))
-                {
-                    this.Log.Error($"The database file of EnvRun.exe was not found at {envRunDatabasePath}.");
-                    return false;
-                }
-
-                return true;
+                this.Log.Error($"The database file of EnvRun.exe was not found at {envRunDatabasePath}.");
+                return false;
             }
 
-            return false;
+            return true;
         }
 
-        public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
-
-        public override string[] GenerateSetParameterMessage(string name, string value) => new[]
-            {
-                $"@@envrun[set name='GitVersion_{name}' value='{value}']"
-            };
-        public override bool PreventFetch() => true;
+        return false;
     }
-}
+
+    public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
+
+    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    {
+        $"@@envrun[set name='GitVersion_{name}' value='{value}']"
+    };
+    public override bool PreventFetch() => true;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/GitHubActions.cs b/src/GitVersion.Core/BuildAgents/GitHubActions.cs
index 54b2ce33b7..003b482f02 100644
--- a/src/GitVersion.Core/BuildAgents/GitHubActions.cs
+++ b/src/GitVersion.Core/BuildAgents/GitHubActions.cs
@@ -3,62 +3,61 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.BuildAgents
+namespace GitVersion.BuildAgents;
+
+public class GitHubActions : BuildAgentBase
 {
-    public class GitHubActions : BuildAgentBase
-    {
-        // https://help.github.com/en/actions/automating-your-workflow-with-github-actions/using-environment-variables#default-environment-variables
+    // https://help.github.com/en/actions/automating-your-workflow-with-github-actions/using-environment-variables#default-environment-variables
 
-        public GitHubActions(IEnvironment environment, ILog log) : base(environment, log)
-        {
-        }
+    public GitHubActions(IEnvironment environment, ILog log) : base(environment, log)
+    {
+    }
 
-        public const string EnvironmentVariableName = "GITHUB_ACTIONS";
-        public const string GitHubSetEnvTempFileEnvironmentVariableName = "GITHUB_ENV";
+    public const string EnvironmentVariableName = "GITHUB_ACTIONS";
+    public const string GitHubSetEnvTempFileEnvironmentVariableName = "GITHUB_ENV";
 
-        protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
 
-        public override string GenerateSetVersionMessage(VersionVariables variables) =>
-            string.Empty; // There is no equivalent function in GitHub Actions.
+    public override string GenerateSetVersionMessage(VersionVariables variables) =>
+        string.Empty; // There is no equivalent function in GitHub Actions.
 
-        public override string[] GenerateSetParameterMessage(string name, string value) =>
-            System.Array.Empty<string>(); // There is no equivalent function in GitHub Actions.
+    public override string[] GenerateSetParameterMessage(string name, string value) =>
+        System.Array.Empty<string>(); // There is no equivalent function in GitHub Actions.
 
-        public override void WriteIntegration(System.Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true)
-        {
-            base.WriteIntegration(writer, variables, updateBuildNumber);
+    public override void WriteIntegration(System.Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true)
+    {
+        base.WriteIntegration(writer, variables, updateBuildNumber);
 
-            // https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files
-            // The outgoing environment variables must be written to a temporary file (identified by the $GITHUB_ENV environment
-            // variable, which changes for every step in a workflow) which is then parsed. That file must also be UTF-8 or it will fail.
+        // https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files
+        // The outgoing environment variables must be written to a temporary file (identified by the $GITHUB_ENV environment
+        // variable, which changes for every step in a workflow) which is then parsed. That file must also be UTF-8 or it will fail.
 
-            if (writer == null)
-            {
-                return;
-            }
+        if (writer == null)
+        {
+            return;
+        }
 
-            var gitHubSetEnvFilePath = this.Environment.GetEnvironmentVariable(GitHubSetEnvTempFileEnvironmentVariableName);
+        var gitHubSetEnvFilePath = this.Environment.GetEnvironmentVariable(GitHubSetEnvTempFileEnvironmentVariableName);
 
-            if (gitHubSetEnvFilePath != null)
+        if (gitHubSetEnvFilePath != null)
+        {
+            writer($"Writing version variables to $GITHUB_ENV file for '{GetType().Name}'.");
+            using var streamWriter = File.AppendText(gitHubSetEnvFilePath);
+            foreach (var variable in variables)
             {
-                writer($"Writing version variables to $GITHUB_ENV file for '{GetType().Name}'.");
-                using var streamWriter = File.AppendText(gitHubSetEnvFilePath);
-                foreach (var variable in variables)
+                if (!variable.Value.IsNullOrEmpty())
                 {
-                    if (!variable.Value.IsNullOrEmpty())
-                    {
-                        streamWriter.WriteLine($"GitVersion_{variable.Key}={variable.Value}");
-                    }
+                    streamWriter.WriteLine($"GitVersion_{variable.Key}={variable.Value}");
                 }
             }
-            else
-            {
-                writer($"Unable to write GitVersion variables to ${GitHubSetEnvTempFileEnvironmentVariableName} because the environment variable is not set.");
-            }
         }
+        else
+        {
+            writer($"Unable to write GitVersion variables to ${GitHubSetEnvTempFileEnvironmentVariableName} because the environment variable is not set.");
+        }
+    }
 
-        public override string? GetCurrentBranch(bool usingDynamicRepos) => Environment.GetEnvironmentVariable("GITHUB_REF");
+    public override string? GetCurrentBranch(bool usingDynamicRepos) => Environment.GetEnvironmentVariable("GITHUB_REF");
 
-        public override bool PreventFetch() => true;
-    }
-}
+    public override bool PreventFetch() => true;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/GitLabCi.cs b/src/GitVersion.Core/BuildAgents/GitLabCi.cs
index ae83dc3aea..3135d26d54 100644
--- a/src/GitVersion.Core/BuildAgents/GitLabCi.cs
+++ b/src/GitVersion.Core/BuildAgents/GitLabCi.cs
@@ -3,38 +3,37 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.BuildAgents
-{
-    public class GitLabCi : BuildAgentBase
-    {
-        public const string EnvironmentVariableName = "GITLAB_CI";
-        private string? file;
+namespace GitVersion.BuildAgents;
 
-        public GitLabCi(IEnvironment environment, ILog log) : base(environment, log) => WithPropertyFile("gitversion.properties");
+public class GitLabCi : BuildAgentBase
+{
+    public const string EnvironmentVariableName = "GITLAB_CI";
+    private string? file;
 
-        public void WithPropertyFile(string propertiesFileName) => this.file = propertiesFileName;
+    public GitLabCi(IEnvironment environment, ILog log) : base(environment, log) => WithPropertyFile("gitversion.properties");
 
-        protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    public void WithPropertyFile(string propertiesFileName) => this.file = propertiesFileName;
 
+    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
 
-        public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
 
-        public override string[] GenerateSetParameterMessage(string name, string value) => new[]
-            {
-                $"GitVersion_{name}={value}"
-            };
+    public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
 
-        public override string? GetCurrentBranch(bool usingDynamicRepos) => Environment.GetEnvironmentVariable("CI_COMMIT_REF_NAME");
+    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    {
+        $"GitVersion_{name}={value}"
+    };
 
-        public override bool PreventFetch() => true;
+    public override string? GetCurrentBranch(bool usingDynamicRepos) => Environment.GetEnvironmentVariable("CI_COMMIT_REF_NAME");
 
-        public override void WriteIntegration(Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true)
-        {
-            base.WriteIntegration(writer, variables, updateBuildNumber);
-            writer($"Outputting variables to '{this.file}' ... ");
-            WriteVariablesFile(variables);
-        }
+    public override bool PreventFetch() => true;
 
-        private void WriteVariablesFile(VersionVariables variables) => File.WriteAllLines(this.file, GenerateBuildLogOutput(variables));
+    public override void WriteIntegration(Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true)
+    {
+        base.WriteIntegration(writer, variables, updateBuildNumber);
+        writer($"Outputting variables to '{this.file}' ... ");
+        WriteVariablesFile(variables);
     }
-}
+
+    private void WriteVariablesFile(VersionVariables variables) => File.WriteAllLines(this.file, GenerateBuildLogOutput(variables));
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/Jenkins.cs b/src/GitVersion.Core/BuildAgents/Jenkins.cs
index 2c84f11ee6..7b735598bb 100644
--- a/src/GitVersion.Core/BuildAgents/Jenkins.cs
+++ b/src/GitVersion.Core/BuildAgents/Jenkins.cs
@@ -4,47 +4,46 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.BuildAgents
-{
-    public class Jenkins : BuildAgentBase
-    {
-        public const string EnvironmentVariableName = "JENKINS_URL";
-        private string? file;
-        protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+namespace GitVersion.BuildAgents;
 
-        public Jenkins(IEnvironment environment, ILog log) : base(environment, log) => WithPropertyFile("gitversion.properties");
+public class Jenkins : BuildAgentBase
+{
+    public const string EnvironmentVariableName = "JENKINS_URL";
+    private string? file;
+    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
 
-        public void WithPropertyFile(string propertiesFileName) => this.file = propertiesFileName;
+    public Jenkins(IEnvironment environment, ILog log) : base(environment, log) => WithPropertyFile("gitversion.properties");
 
-        public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
+    public void WithPropertyFile(string propertiesFileName) => this.file = propertiesFileName;
 
-        public override string[] GenerateSetParameterMessage(string name, string value) => new[]
-            {
-                $"GitVersion_{name}={value}"
-            };
+    public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
 
-        public override string? GetCurrentBranch(bool usingDynamicRepos) => IsPipelineAsCode()
-                ? Environment.GetEnvironmentVariable("BRANCH_NAME")
-                : Environment.GetEnvironmentVariable("GIT_LOCAL_BRANCH") ?? Environment.GetEnvironmentVariable("GIT_BRANCH");
+    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    {
+        $"GitVersion_{name}={value}"
+    };
 
-        private bool IsPipelineAsCode() => !Environment.GetEnvironmentVariable("BRANCH_NAME").IsNullOrEmpty();
+    public override string? GetCurrentBranch(bool usingDynamicRepos) => IsPipelineAsCode()
+        ? Environment.GetEnvironmentVariable("BRANCH_NAME")
+        : Environment.GetEnvironmentVariable("GIT_LOCAL_BRANCH") ?? Environment.GetEnvironmentVariable("GIT_BRANCH");
 
-        public override bool PreventFetch() => true;
+    private bool IsPipelineAsCode() => !Environment.GetEnvironmentVariable("BRANCH_NAME").IsNullOrEmpty();
 
-        /// <summary>
-        /// When Jenkins uses pipeline-as-code, it creates two remotes: "origin" and "origin1".
-        /// This should be cleaned up, so that normizaling the Git repo will not fail.
-        /// </summary>
-        /// <returns></returns>
-        public override bool ShouldCleanUpRemotes() => IsPipelineAsCode();
+    public override bool PreventFetch() => true;
 
-        public override void WriteIntegration(Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true)
-        {
-            base.WriteIntegration(writer, variables, updateBuildNumber);
-            writer($"Outputting variables to '{this.file}' ... ");
-            WriteVariablesFile(variables);
-        }
+    /// <summary>
+    /// When Jenkins uses pipeline-as-code, it creates two remotes: "origin" and "origin1".
+    /// This should be cleaned up, so that normizaling the Git repo will not fail.
+    /// </summary>
+    /// <returns></returns>
+    public override bool ShouldCleanUpRemotes() => IsPipelineAsCode();
 
-        private void WriteVariablesFile(VersionVariables variables) => File.WriteAllLines(this.file, GenerateBuildLogOutput(variables));
+    public override void WriteIntegration(Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true)
+    {
+        base.WriteIntegration(writer, variables, updateBuildNumber);
+        writer($"Outputting variables to '{this.file}' ... ");
+        WriteVariablesFile(variables);
     }
-}
+
+    private void WriteVariablesFile(VersionVariables variables) => File.WriteAllLines(this.file, GenerateBuildLogOutput(variables));
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/MyGet.cs b/src/GitVersion.Core/BuildAgents/MyGet.cs
index e90539631e..f330672eec 100644
--- a/src/GitVersion.Core/BuildAgents/MyGet.cs
+++ b/src/GitVersion.Core/BuildAgents/MyGet.cs
@@ -5,41 +5,40 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.BuildAgents
+namespace GitVersion.BuildAgents;
+
+public class MyGet : BuildAgentBase
 {
-    public class MyGet : BuildAgentBase
+    public MyGet(IEnvironment environment, ILog log) : base(environment, log)
     {
-        public MyGet(IEnvironment environment, ILog log) : base(environment, log)
-        {
-        }
+    }
 
-        public const string EnvironmentVariableName = "BuildRunner";
-        protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
-        public override bool CanApplyToCurrentContext()
-        {
-            var buildRunner = Environment.GetEnvironmentVariable(EnvironmentVariable);
+    public const string EnvironmentVariableName = "BuildRunner";
+    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    public override bool CanApplyToCurrentContext()
+    {
+        var buildRunner = Environment.GetEnvironmentVariable(EnvironmentVariable);
 
-            return !buildRunner.IsNullOrEmpty()
-                && buildRunner.Equals("MyGet", StringComparison.InvariantCultureIgnoreCase);
-        }
+        return !buildRunner.IsNullOrEmpty()
+               && buildRunner.Equals("MyGet", StringComparison.InvariantCultureIgnoreCase);
+    }
 
-        public override string[] GenerateSetParameterMessage(string name, string value)
+    public override string[] GenerateSetParameterMessage(string name, string value)
+    {
+        var messages = new List<string>
         {
-            var messages = new List<string>
-            {
-                $"##myget[setParameter name='GitVersion.{name}' value='{ServiceMessageEscapeHelper.EscapeValue(value)}']"
-            };
+            $"##myget[setParameter name='GitVersion.{name}' value='{ServiceMessageEscapeHelper.EscapeValue(value)}']"
+        };
 
-            if (string.Equals(name, "LegacySemVerPadded", StringComparison.InvariantCultureIgnoreCase))
-            {
-                messages.Add($"##myget[buildNumber '{ServiceMessageEscapeHelper.EscapeValue(value)}']");
-            }
-
-            return messages.ToArray();
+        if (string.Equals(name, "LegacySemVerPadded", StringComparison.InvariantCultureIgnoreCase))
+        {
+            messages.Add($"##myget[buildNumber '{ServiceMessageEscapeHelper.EscapeValue(value)}']");
         }
 
-        public override string? GenerateSetVersionMessage(VersionVariables variables) => null;
-
-        public override bool PreventFetch() => false;
+        return messages.ToArray();
     }
-}
+
+    public override string? GenerateSetVersionMessage(VersionVariables variables) => null;
+
+    public override bool PreventFetch() => false;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/SpaceAutomation.cs b/src/GitVersion.Core/BuildAgents/SpaceAutomation.cs
index 8e15fa20d5..ea5df2564d 100644
--- a/src/GitVersion.Core/BuildAgents/SpaceAutomation.cs
+++ b/src/GitVersion.Core/BuildAgents/SpaceAutomation.cs
@@ -1,22 +1,21 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.BuildAgents
+namespace GitVersion.BuildAgents;
+
+public class SpaceAutomation : BuildAgentBase
 {
-    public class SpaceAutomation : BuildAgentBase
+    public SpaceAutomation(IEnvironment environment, ILog log) : base(environment, log)
     {
-        public SpaceAutomation(IEnvironment environment, ILog log) : base(environment, log)
-        {
-        }
+    }
 
-        public const string EnvironmentVariableName = "JB_SPACE_PROJECT_KEY";
+    public const string EnvironmentVariableName = "JB_SPACE_PROJECT_KEY";
 
-        protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
 
-        public override string? GetCurrentBranch(bool usingDynamicRepos) => Environment.GetEnvironmentVariable("JB_SPACE_GIT_BRANCH");
+    public override string? GetCurrentBranch(bool usingDynamicRepos) => Environment.GetEnvironmentVariable("JB_SPACE_GIT_BRANCH");
 
-        public override string[] GenerateSetParameterMessage(string name, string value) => System.Array.Empty<string>();
+    public override string[] GenerateSetParameterMessage(string name, string value) => System.Array.Empty<string>();
 
-        public override string GenerateSetVersionMessage(VersionVariables variables) => string.Empty;
-    }
-}
+    public override string GenerateSetVersionMessage(VersionVariables variables) => string.Empty;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/TeamCity.cs b/src/GitVersion.Core/BuildAgents/TeamCity.cs
index e115bd36e8..95fd049b3e 100644
--- a/src/GitVersion.Core/BuildAgents/TeamCity.cs
+++ b/src/GitVersion.Core/BuildAgents/TeamCity.cs
@@ -3,48 +3,47 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.BuildAgents
+namespace GitVersion.BuildAgents;
+
+public class TeamCity : BuildAgentBase
 {
-    public class TeamCity : BuildAgentBase
+    public TeamCity(IEnvironment environment, ILog log) : base(environment, log)
     {
-        public TeamCity(IEnvironment environment, ILog log) : base(environment, log)
-        {
-        }
+    }
 
-        public const string EnvironmentVariableName = "TEAMCITY_VERSION";
+    public const string EnvironmentVariableName = "TEAMCITY_VERSION";
 
-        protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
 
-        public override string? GetCurrentBranch(bool usingDynamicRepos)
-        {
-            var branchName = Environment.GetEnvironmentVariable("Git_Branch");
+    public override string? GetCurrentBranch(bool usingDynamicRepos)
+    {
+        var branchName = Environment.GetEnvironmentVariable("Git_Branch");
 
-            if (branchName.IsNullOrEmpty())
+        if (branchName.IsNullOrEmpty())
+        {
+            if (!usingDynamicRepos)
             {
-                if (!usingDynamicRepos)
-                {
-                    WriteBranchEnvVariableWarning();
-                }
-
-                return base.GetCurrentBranch(usingDynamicRepos);
+                WriteBranchEnvVariableWarning();
             }
 
-            return branchName;
+            return base.GetCurrentBranch(usingDynamicRepos);
         }
 
-        private void WriteBranchEnvVariableWarning() => this.Log.Warning(@"TeamCity doesn't make the current branch available through environmental variables.
+        return branchName;
+    }
+
+    private void WriteBranchEnvVariableWarning() => this.Log.Warning(@"TeamCity doesn't make the current branch available through environmental variables.
 Depending on your authentication and transport setup of your git VCS root things may work. In that case, ignore this warning.
 In your TeamCity build configuration, add a parameter called `env.Git_Branch` with value %teamcity.build.vcs.branch.<vcsid>%
 See https://gitversion.net/docs/reference/build-servers/teamcity for more info");
 
-        public override bool PreventFetch() => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("Git_Branch"));
+    public override bool PreventFetch() => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("Git_Branch"));
 
-        public override string[] GenerateSetParameterMessage(string name, string value) => new[]
-            {
-                $"##teamcity[setParameter name='GitVersion.{name}' value='{ServiceMessageEscapeHelper.EscapeValue(value)}']",
-                $"##teamcity[setParameter name='system.GitVersion.{name}' value='{ServiceMessageEscapeHelper.EscapeValue(value)}']"
-            };
+    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    {
+        $"##teamcity[setParameter name='GitVersion.{name}' value='{ServiceMessageEscapeHelper.EscapeValue(value)}']",
+        $"##teamcity[setParameter name='system.GitVersion.{name}' value='{ServiceMessageEscapeHelper.EscapeValue(value)}']"
+    };
 
-        public override string GenerateSetVersionMessage(VersionVariables variables) => $"##teamcity[buildNumber '{ServiceMessageEscapeHelper.EscapeValue(variables.FullSemVer)}']";
-    }
-}
+    public override string GenerateSetVersionMessage(VersionVariables variables) => $"##teamcity[buildNumber '{ServiceMessageEscapeHelper.EscapeValue(variables.FullSemVer)}']";
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/BuildAgents/TravisCI.cs b/src/GitVersion.Core/BuildAgents/TravisCI.cs
index 6f3b280e50..1b5403fd12 100644
--- a/src/GitVersion.Core/BuildAgents/TravisCI.cs
+++ b/src/GitVersion.Core/BuildAgents/TravisCI.cs
@@ -1,27 +1,25 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.BuildAgents
+namespace GitVersion.BuildAgents;
+
+public class TravisCi : BuildAgentBase
 {
-    public class TravisCi : BuildAgentBase
+    public TravisCi(IEnvironment environment, ILog log) : base(environment, log)
     {
-        public TravisCi(IEnvironment environment, ILog log) : base(environment, log)
-        {
-        }
-
-        public const string EnvironmentVariableName = "TRAVIS";
-        protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    }
 
-        public override bool CanApplyToCurrentContext() => "true".Equals(Environment.GetEnvironmentVariable(EnvironmentVariable)) && "true".Equals(Environment.GetEnvironmentVariable("CI"));
+    public const string EnvironmentVariableName = "TRAVIS";
+    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
 
-        public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
+    public override bool CanApplyToCurrentContext() => "true".Equals(Environment.GetEnvironmentVariable(EnvironmentVariable)) && "true".Equals(Environment.GetEnvironmentVariable("CI"));
 
-        public override string[] GenerateSetParameterMessage(string name, string value) => new[]
-            {
-                $"GitVersion_{name}={value}"
-            };
+    public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
 
-        public override bool PreventFetch() => true;
-    }
-}
+    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    {
+        $"GitVersion_{name}={value}"
+    };
 
+    public override bool PreventFetch() => true;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Abstractions/IBranchConfigurationCalculator.cs b/src/GitVersion.Core/Configuration/Abstractions/IBranchConfigurationCalculator.cs
index 96c17b3489..7e6092e773 100644
--- a/src/GitVersion.Core/Configuration/Abstractions/IBranchConfigurationCalculator.cs
+++ b/src/GitVersion.Core/Configuration/Abstractions/IBranchConfigurationCalculator.cs
@@ -1,13 +1,12 @@
 using System.Collections.Generic;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration
+namespace GitVersion.Configuration;
+
+public interface IBranchConfigurationCalculator
 {
-    public interface IBranchConfigurationCalculator
-    {
-        /// <summary>
-        /// Gets the <see cref="BranchConfig"/> for the current commit.
-        /// </summary>
-        BranchConfig GetBranchConfiguration(IBranch targetBranch, ICommit? currentCommit, Config configuration, IList<IBranch>? excludedInheritBranches = null);
-    }
-}
+    /// <summary>
+    /// Gets the <see cref="BranchConfig"/> for the current commit.
+    /// </summary>
+    BranchConfig GetBranchConfiguration(IBranch targetBranch, ICommit? currentCommit, Config configuration, IList<IBranch>? excludedInheritBranches = null);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Abstractions/IConfigFileLocator.cs b/src/GitVersion.Core/Configuration/Abstractions/IConfigFileLocator.cs
index d245fe2853..5951d88096 100644
--- a/src/GitVersion.Core/Configuration/Abstractions/IConfigFileLocator.cs
+++ b/src/GitVersion.Core/Configuration/Abstractions/IConfigFileLocator.cs
@@ -1,15 +1,14 @@
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration
+namespace GitVersion.Configuration;
+
+public interface IConfigFileLocator
 {
-    public interface IConfigFileLocator
-    {
-        string FilePath { get; }
-        bool HasConfigFileAt(string? workingDirectory);
-        string GetConfigFilePath(string workingDirectory);
-        void Verify(GitVersionOptions gitVersionOptions, IGitRepositoryInfo repositoryInfo);
-        void Verify(string workingDirectory, string projectRootDirectory);
-        string SelectConfigFilePath(GitVersionOptions gitVersionOptions, IGitRepositoryInfo repositoryInfo);
-        Config ReadConfig(string? workingDirectory);
-    }
-}
+    string FilePath { get; }
+    bool HasConfigFileAt(string? workingDirectory);
+    string GetConfigFilePath(string workingDirectory);
+    void Verify(GitVersionOptions gitVersionOptions, IGitRepositoryInfo repositoryInfo);
+    void Verify(string workingDirectory, string projectRootDirectory);
+    string SelectConfigFilePath(GitVersionOptions gitVersionOptions, IGitRepositoryInfo repositoryInfo);
+    Config ReadConfig(string? workingDirectory);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Abstractions/IConfigProvider.cs b/src/GitVersion.Core/Configuration/Abstractions/IConfigProvider.cs
index a11743f814..0c4bb44a92 100644
--- a/src/GitVersion.Core/Configuration/Abstractions/IConfigProvider.cs
+++ b/src/GitVersion.Core/Configuration/Abstractions/IConfigProvider.cs
@@ -1,11 +1,10 @@
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration
+namespace GitVersion.Configuration;
+
+public interface IConfigProvider
 {
-    public interface IConfigProvider
-    {
-        Config Provide(Config? overrideConfig = null);
-        Config Provide(string workingDirectory, Config? overrideConfig = null);
-        void Init(string workingDirectory);
-    }
-}
+    Config Provide(Config? overrideConfig = null);
+    Config Provide(string workingDirectory, Config? overrideConfig = null);
+    void Init(string workingDirectory);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/BranchConfigurationCalculator.cs b/src/GitVersion.Core/Configuration/BranchConfigurationCalculator.cs
index 850a6a8f9d..9422d80c0e 100644
--- a/src/GitVersion.Core/Configuration/BranchConfigurationCalculator.cs
+++ b/src/GitVersion.Core/Configuration/BranchConfigurationCalculator.cs
@@ -7,259 +7,258 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration
+namespace GitVersion.Configuration;
+
+public class BranchConfigurationCalculator : IBranchConfigurationCalculator
 {
-    public class BranchConfigurationCalculator : IBranchConfigurationCalculator
+    private const string FallbackConfigName = "Fallback";
+
+    private readonly ILog log;
+    private readonly IRepositoryStore repositoryStore;
+
+    public BranchConfigurationCalculator(ILog log, IRepositoryStore repositoryStore)
     {
-        private const string FallbackConfigName = "Fallback";
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
+        this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
+    }
 
-        private readonly ILog log;
-        private readonly IRepositoryStore repositoryStore;
+    /// <summary>
+    /// Gets the <see cref="BranchConfig"/> for the current commit.
+    /// </summary>
+    public BranchConfig GetBranchConfiguration(IBranch targetBranch, ICommit? currentCommit, Config configuration, IList<IBranch>? excludedInheritBranches = null)
+    {
+        var matchingBranches = configuration.GetConfigForBranch(targetBranch.Name.WithoutRemote);
 
-        public BranchConfigurationCalculator(ILog log, IRepositoryStore repositoryStore)
+        if (matchingBranches == null)
         {
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
+            this.log.Info($"No branch configuration found for branch {targetBranch}, falling back to default configuration");
+
+            matchingBranches = BranchConfig.CreateDefaultBranchConfig(FallbackConfigName)
+                .Apply(new BranchConfig
+                {
+                    Regex = "",
+                    VersioningMode = configuration.VersioningMode,
+                    Increment = configuration.Increment ?? IncrementStrategy.Inherit,
+                });
         }
 
-        /// <summary>
-        /// Gets the <see cref="BranchConfig"/> for the current commit.
-        /// </summary>
-        public BranchConfig GetBranchConfiguration(IBranch targetBranch, ICommit? currentCommit, Config configuration, IList<IBranch>? excludedInheritBranches = null)
+        if (matchingBranches.Increment == IncrementStrategy.Inherit)
         {
-            var matchingBranches = configuration.GetConfigForBranch(targetBranch.Name.WithoutRemote);
-
-            if (matchingBranches == null)
+            matchingBranches = InheritBranchConfiguration(targetBranch, matchingBranches, currentCommit, configuration, excludedInheritBranches);
+            if (matchingBranches.Name!.IsEquivalentTo(FallbackConfigName) && matchingBranches.Increment == IncrementStrategy.Inherit)
             {
-                this.log.Info($"No branch configuration found for branch {targetBranch}, falling back to default configuration");
-
-                matchingBranches = BranchConfig.CreateDefaultBranchConfig(FallbackConfigName)
-                                               .Apply(new BranchConfig
-                                               {
-                                                   Regex = "",
-                                                   VersioningMode = configuration.VersioningMode,
-                                                   Increment = configuration.Increment ?? IncrementStrategy.Inherit,
-                                               });
+                // We tried, and failed to inherit, just fall back to patch
+                matchingBranches.Increment = IncrementStrategy.Patch;
             }
+        }
+
+        return matchingBranches;
+    }
 
-            if (matchingBranches.Increment == IncrementStrategy.Inherit)
+    // TODO I think we need to take a fresh approach to this.. it's getting really complex with heaps of edge cases
+    private BranchConfig InheritBranchConfiguration(IBranch targetBranch, BranchConfig branchConfiguration, ICommit? currentCommit, Config configuration, IList<IBranch>? excludedInheritBranches)
+    {
+        using (this.log.IndentLog("Attempting to inherit branch configuration from parent branch"))
+        {
+            var excludedBranches = new[] { targetBranch };
+            // Check if we are a merge commit. If so likely we are a pull request
+            var parentCount = currentCommit?.Parents.Count();
+            if (parentCount == 2)
             {
-                matchingBranches = InheritBranchConfiguration(targetBranch, matchingBranches, currentCommit, configuration, excludedInheritBranches);
-                if (matchingBranches.Name!.IsEquivalentTo(FallbackConfigName) && matchingBranches.Increment == IncrementStrategy.Inherit)
-                {
-                    // We tried, and failed to inherit, just fall back to patch
-                    matchingBranches.Increment = IncrementStrategy.Patch;
-                }
+                excludedBranches = CalculateWhenMultipleParents(currentCommit!, ref targetBranch, excludedBranches);
             }
 
-            return matchingBranches;
-        }
+            excludedInheritBranches ??= this.repositoryStore.GetExcludedInheritBranches(configuration).ToList();
 
-        // TODO I think we need to take a fresh approach to this.. it's getting really complex with heaps of edge cases
-        private BranchConfig InheritBranchConfiguration(IBranch targetBranch, BranchConfig branchConfiguration, ICommit? currentCommit, Config configuration, IList<IBranch>? excludedInheritBranches)
-        {
-            using (this.log.IndentLog("Attempting to inherit branch configuration from parent branch"))
+            excludedBranches = excludedBranches.Where(b => excludedInheritBranches.All(bte => !b.Equals(bte))).ToArray();
+            // Add new excluded branches.
+            foreach (var excludedBranch in excludedBranches)
             {
-                var excludedBranches = new[] { targetBranch };
-                // Check if we are a merge commit. If so likely we are a pull request
-                var parentCount = currentCommit?.Parents.Count();
-                if (parentCount == 2)
-                {
-                    excludedBranches = CalculateWhenMultipleParents(currentCommit!, ref targetBranch, excludedBranches);
-                }
-
-                excludedInheritBranches ??= this.repositoryStore.GetExcludedInheritBranches(configuration).ToList();
+                excludedInheritBranches.Add(excludedBranch);
+            }
+            var branchesToEvaluate = this.repositoryStore.ExcludingBranches(excludedInheritBranches)
+                .Distinct(new LocalRemoteBranchEqualityComparer())
+                .ToList();
 
-                excludedBranches = excludedBranches.Where(b => excludedInheritBranches.All(bte => !b.Equals(bte))).ToArray();
-                // Add new excluded branches.
-                foreach (var excludedBranch in excludedBranches)
-                {
-                    excludedInheritBranches.Add(excludedBranch);
-                }
-                var branchesToEvaluate = this.repositoryStore.ExcludingBranches(excludedInheritBranches)
-                    .Distinct(new LocalRemoteBranchEqualityComparer())
+            var branchPoint = this.repositoryStore
+                .FindCommitBranchWasBranchedFrom(targetBranch, configuration, excludedInheritBranches.ToArray());
+            List<IBranch> possibleParents;
+            if (branchPoint == BranchCommit.Empty)
+            {
+                possibleParents = this.repositoryStore.GetBranchesContainingCommit(targetBranch.Tip, branchesToEvaluate)
+                    // It fails to inherit Increment branch configuration if more than 1 parent;
+                    // therefore no point to get more than 2 parents
+                    .Take(2)
                     .ToList();
-
-                var branchPoint = this.repositoryStore
-                    .FindCommitBranchWasBranchedFrom(targetBranch, configuration, excludedInheritBranches.ToArray());
-                List<IBranch> possibleParents;
-                if (branchPoint == BranchCommit.Empty)
+            }
+            else
+            {
+                var branches = this.repositoryStore.GetBranchesContainingCommit(branchPoint.Commit, branchesToEvaluate).ToList();
+                if (branches.Count > 1)
                 {
-                    possibleParents = this.repositoryStore.GetBranchesContainingCommit(targetBranch.Tip, branchesToEvaluate)
-                        // It fails to inherit Increment branch configuration if more than 1 parent;
-                        // therefore no point to get more than 2 parents
-                        .Take(2)
-                        .ToList();
+                    var currentTipBranches = this.repositoryStore.GetBranchesContainingCommit(currentCommit, branchesToEvaluate).ToList();
+                    possibleParents = branches.Except(currentTipBranches).ToList();
                 }
                 else
                 {
-                    var branches = this.repositoryStore.GetBranchesContainingCommit(branchPoint.Commit, branchesToEvaluate).ToList();
-                    if (branches.Count > 1)
-                    {
-                        var currentTipBranches = this.repositoryStore.GetBranchesContainingCommit(currentCommit, branchesToEvaluate).ToList();
-                        possibleParents = branches.Except(currentTipBranches).ToList();
-                    }
-                    else
-                    {
-                        possibleParents = branches;
-                    }
+                    possibleParents = branches;
                 }
+            }
 
-                this.log.Info("Found possible parent branches: " + string.Join(", ", possibleParents.Select(p => p.ToString())));
+            this.log.Info("Found possible parent branches: " + string.Join(", ", possibleParents.Select(p => p.ToString())));
 
-                if (possibleParents.Count == 1)
+            if (possibleParents.Count == 1)
+            {
+                var branchConfig = GetBranchConfiguration(possibleParents[0], currentCommit, configuration, excludedInheritBranches);
+                // If we have resolved a fallback config we should not return that we have got config
+                if (branchConfig.Name != FallbackConfigName)
                 {
-                    var branchConfig = GetBranchConfiguration(possibleParents[0], currentCommit, configuration, excludedInheritBranches);
-                    // If we have resolved a fallback config we should not return that we have got config
-                    if (branchConfig.Name != FallbackConfigName)
+                    return new BranchConfig(branchConfiguration)
                     {
-                        return new BranchConfig(branchConfiguration)
-                        {
-                            Increment = branchConfig.Increment,
-                            PreventIncrementOfMergedBranchVersion = branchConfig.PreventIncrementOfMergedBranchVersion,
-                            // If we are inheriting from develop then we should behave like develop
-                            TracksReleaseBranches = branchConfig.TracksReleaseBranches
-                        };
-                    }
+                        Increment = branchConfig.Increment,
+                        PreventIncrementOfMergedBranchVersion = branchConfig.PreventIncrementOfMergedBranchVersion,
+                        // If we are inheriting from develop then we should behave like develop
+                        TracksReleaseBranches = branchConfig.TracksReleaseBranches
+                    };
                 }
+            }
 
-                // If we fail to inherit it is probably because the branch has been merged and we can't do much. So we will fall back to develop's config
-                // if develop exists and main if not
-                var errorMessage = possibleParents.Count == 0
-                    ? "Failed to inherit Increment branch configuration, no branches found."
-                    : "Failed to inherit Increment branch configuration, ended up with: " + string.Join(", ", possibleParents.Select(p => p.ToString()));
+            // If we fail to inherit it is probably because the branch has been merged and we can't do much. So we will fall back to develop's config
+            // if develop exists and main if not
+            var errorMessage = possibleParents.Count == 0
+                ? "Failed to inherit Increment branch configuration, no branches found."
+                : "Failed to inherit Increment branch configuration, ended up with: " + string.Join(", ", possibleParents.Select(p => p.ToString()));
 
-                var chosenBranch = this.repositoryStore.GetChosenBranch(configuration);
-                if (chosenBranch == null)
-                {
-                    // TODO We should call the build server to generate this exception, each build server works differently
-                    // for fetch issues and we could give better warnings.
-                    throw new InvalidOperationException("Gitversion could not determine which branch to treat as the development branch (default is 'develop') nor releaseable branch (default is 'main' or 'master'), either locally or remotely. Ensure the local clone and checkout match the requirements or considering using 'GitVersion Dynamic Repositories'");
-                }
+            var chosenBranch = this.repositoryStore.GetChosenBranch(configuration);
+            if (chosenBranch == null)
+            {
+                // TODO We should call the build server to generate this exception, each build server works differently
+                // for fetch issues and we could give better warnings.
+                throw new InvalidOperationException("Gitversion could not determine which branch to treat as the development branch (default is 'develop') nor releaseable branch (default is 'main' or 'master'), either locally or remotely. Ensure the local clone and checkout match the requirements or considering using 'GitVersion Dynamic Repositories'");
+            }
 
-                this.log.Warning($"{errorMessage}{System.Environment.NewLine}Falling back to {chosenBranch} branch config");
+            this.log.Warning($"{errorMessage}{System.Environment.NewLine}Falling back to {chosenBranch} branch config");
 
-                // To prevent infinite loops, make sure that a new branch was chosen.
-                if (targetBranch.Equals(chosenBranch))
+            // To prevent infinite loops, make sure that a new branch was chosen.
+            if (targetBranch.Equals(chosenBranch))
+            {
+                var developOrMainConfig =
+                    ChooseMainOrDevelopIncrementStrategyIfTheChosenBranchIsOneOfThem(
+                        chosenBranch, branchConfiguration, configuration);
+                if (developOrMainConfig != null)
                 {
-                    var developOrMainConfig =
-                        ChooseMainOrDevelopIncrementStrategyIfTheChosenBranchIsOneOfThem(
-                            chosenBranch, branchConfiguration, configuration);
-                    if (developOrMainConfig != null)
-                    {
-                        return developOrMainConfig;
-                    }
-
-                    this.log.Warning("Fallback branch wants to inherit Increment branch configuration from itself. Using patch increment instead.");
-                    return new BranchConfig(branchConfiguration)
-                    {
-                        Increment = IncrementStrategy.Patch
-                    };
+                    return developOrMainConfig;
                 }
 
-                var inheritingBranchConfig = GetBranchConfiguration(chosenBranch, currentCommit, configuration, excludedInheritBranches)!;
-                var configIncrement = inheritingBranchConfig.Increment;
-                if (inheritingBranchConfig.Name!.IsEquivalentTo(FallbackConfigName) && configIncrement == IncrementStrategy.Inherit)
-                {
-                    this.log.Warning("Fallback config inherits by default, dropping to patch increment");
-                    configIncrement = IncrementStrategy.Patch;
-                }
+                this.log.Warning("Fallback branch wants to inherit Increment branch configuration from itself. Using patch increment instead.");
                 return new BranchConfig(branchConfiguration)
                 {
-                    Increment = configIncrement,
-                    PreventIncrementOfMergedBranchVersion = inheritingBranchConfig.PreventIncrementOfMergedBranchVersion,
-                    // If we are inheriting from develop then we should behave like develop
-                    TracksReleaseBranches = inheritingBranchConfig.TracksReleaseBranches
+                    Increment = IncrementStrategy.Patch
                 };
             }
+
+            var inheritingBranchConfig = GetBranchConfiguration(chosenBranch, currentCommit, configuration, excludedInheritBranches)!;
+            var configIncrement = inheritingBranchConfig.Increment;
+            if (inheritingBranchConfig.Name!.IsEquivalentTo(FallbackConfigName) && configIncrement == IncrementStrategy.Inherit)
+            {
+                this.log.Warning("Fallback config inherits by default, dropping to patch increment");
+                configIncrement = IncrementStrategy.Patch;
+            }
+            return new BranchConfig(branchConfiguration)
+            {
+                Increment = configIncrement,
+                PreventIncrementOfMergedBranchVersion = inheritingBranchConfig.PreventIncrementOfMergedBranchVersion,
+                // If we are inheriting from develop then we should behave like develop
+                TracksReleaseBranches = inheritingBranchConfig.TracksReleaseBranches
+            };
         }
+    }
 
-        private IBranch[] CalculateWhenMultipleParents(ICommit currentCommit, ref IBranch currentBranch, IBranch[] excludedBranches)
+    private IBranch[] CalculateWhenMultipleParents(ICommit currentCommit, ref IBranch currentBranch, IBranch[] excludedBranches)
+    {
+        var parents = currentCommit.Parents.ToArray();
+        var branches = this.repositoryStore.GetBranchesForCommit(parents[1]).ToList();
+        if (branches.Count == 1)
         {
-            var parents = currentCommit.Parents.ToArray();
-            var branches = this.repositoryStore.GetBranchesForCommit(parents[1]).ToList();
-            if (branches.Count == 1)
+            var branch = branches[0];
+            excludedBranches = new[]
             {
-                var branch = branches[0];
-                excludedBranches = new[]
-                {
-                    currentBranch,
-                    branch
-                };
-                currentBranch = branch;
-            }
-            else if (branches.Count > 1)
+                currentBranch,
+                branch
+            };
+            currentBranch = branch;
+        }
+        else if (branches.Count > 1)
+        {
+            currentBranch = branches.FirstOrDefault(b => b.Name.WithoutRemote == Config.MainBranchKey) ?? branches.First();
+        }
+        else
+        {
+            var possibleTargetBranches = this.repositoryStore.GetBranchesForCommit(parents[0]).ToList();
+            if (possibleTargetBranches.Count > 1)
             {
-                currentBranch = branches.FirstOrDefault(b => b.Name.WithoutRemote == Config.MainBranchKey) ?? branches.First();
+                currentBranch = possibleTargetBranches.FirstOrDefault(b => b.Name.WithoutRemote == Config.MainBranchKey) ?? possibleTargetBranches.First();
             }
             else
             {
-                var possibleTargetBranches = this.repositoryStore.GetBranchesForCommit(parents[0]).ToList();
-                if (possibleTargetBranches.Count > 1)
-                {
-                    currentBranch = possibleTargetBranches.FirstOrDefault(b => b.Name.WithoutRemote == Config.MainBranchKey) ?? possibleTargetBranches.First();
-                }
-                else
-                {
-                    currentBranch = possibleTargetBranches.FirstOrDefault() ?? currentBranch;
-                }
+                currentBranch = possibleTargetBranches.FirstOrDefault() ?? currentBranch;
             }
+        }
 
-            this.log.Info($"HEAD is merge commit, this is likely a pull request using {currentBranch} as base");
+        this.log.Info($"HEAD is merge commit, this is likely a pull request using {currentBranch} as base");
 
-            return excludedBranches;
-        }
+        return excludedBranches;
+    }
 
 
 
-        private static BranchConfig? ChooseMainOrDevelopIncrementStrategyIfTheChosenBranchIsOneOfThem(IBranch chosenBranch, BranchConfig branchConfiguration, Config config)
+    private static BranchConfig? ChooseMainOrDevelopIncrementStrategyIfTheChosenBranchIsOneOfThem(IBranch chosenBranch, BranchConfig branchConfiguration, Config config)
+    {
+        BranchConfig? mainOrDevelopConfig = null;
+        var developBranchRegex = config.Branches[Config.DevelopBranchKey]?.Regex;
+        var mainBranchRegex = config.Branches[Config.MainBranchKey]?.Regex;
+        if (Regex.IsMatch(chosenBranch.Name.Friendly, developBranchRegex, RegexOptions.IgnoreCase))
         {
-            BranchConfig? mainOrDevelopConfig = null;
-            var developBranchRegex = config.Branches[Config.DevelopBranchKey]?.Regex;
-            var mainBranchRegex = config.Branches[Config.MainBranchKey]?.Regex;
-            if (Regex.IsMatch(chosenBranch.Name.Friendly, developBranchRegex, RegexOptions.IgnoreCase))
+            // Normally we would not expect this to happen but for safety we add a check
+            if (config.Branches[Config.DevelopBranchKey]?.Increment !=
+                IncrementStrategy.Inherit)
             {
-                // Normally we would not expect this to happen but for safety we add a check
-                if (config.Branches[Config.DevelopBranchKey]?.Increment !=
-                    IncrementStrategy.Inherit)
+                mainOrDevelopConfig = new BranchConfig(branchConfiguration)
                 {
-                    mainOrDevelopConfig = new BranchConfig(branchConfiguration)
-                    {
-                        Increment = config.Branches[Config.DevelopBranchKey]?.Increment
-                    };
-                }
+                    Increment = config.Branches[Config.DevelopBranchKey]?.Increment
+                };
             }
-            else if (Regex.IsMatch(chosenBranch.Name.Friendly, mainBranchRegex, RegexOptions.IgnoreCase))
+        }
+        else if (Regex.IsMatch(chosenBranch.Name.Friendly, mainBranchRegex, RegexOptions.IgnoreCase))
+        {
+            // Normally we would not expect this to happen but for safety we add a check
+            if (config.Branches[Config.MainBranchKey]?.Increment !=
+                IncrementStrategy.Inherit)
             {
-                // Normally we would not expect this to happen but for safety we add a check
-                if (config.Branches[Config.MainBranchKey]?.Increment !=
-                    IncrementStrategy.Inherit)
+                mainOrDevelopConfig = new BranchConfig(branchConfiguration)
                 {
-                    mainOrDevelopConfig = new BranchConfig(branchConfiguration)
-                    {
-                        Increment = config.Branches[Config.DevelopBranchKey]?.Increment
-                    };
-                }
+                    Increment = config.Branches[Config.DevelopBranchKey]?.Increment
+                };
             }
-            return mainOrDevelopConfig;
         }
+        return mainOrDevelopConfig;
+    }
 
-        private class LocalRemoteBranchEqualityComparer : IEqualityComparer<IBranch>
+    private class LocalRemoteBranchEqualityComparer : IEqualityComparer<IBranch>
+    {
+        public bool Equals(IBranch b1, IBranch b2)
         {
-            public bool Equals(IBranch b1, IBranch b2)
-            {
-                if (b1 == null && b2 == null)
-                    return true;
-                if (b1 == null || b2 == null)
-                    return false;
+            if (b1 == null && b2 == null)
+                return true;
+            if (b1 == null || b2 == null)
+                return false;
 
-                return b1.Name.WithoutRemote.Equals(b2.Name.WithoutRemote);
-            }
+            return b1.Name.WithoutRemote.Equals(b2.Name.WithoutRemote);
+        }
 
-            public int GetHashCode(IBranch b)
-            {
-                return b.Name.WithoutRemote.GetHashCode();
-            }
+        public int GetHashCode(IBranch b)
+        {
+            return b.Name.WithoutRemote.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/ConfigExtensions.cs b/src/GitVersion.Core/Configuration/ConfigExtensions.cs
index b2f6a6b836..7f4aec2833 100644
--- a/src/GitVersion.Core/Configuration/ConfigExtensions.cs
+++ b/src/GitVersion.Core/Configuration/ConfigExtensions.cs
@@ -6,144 +6,143 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration
+namespace GitVersion.Configuration;
+
+public static class ConfigExtensions
 {
-    public static class ConfigExtensions
+    public static BranchConfig? GetConfigForBranch(this Config config, string? branchName)
     {
-        public static BranchConfig? GetConfigForBranch(this Config config, string? branchName)
-        {
-            if (branchName == null) throw new ArgumentNullException(nameof(branchName));
-            var matches = config.Branches
-                .Where(b => Regex.IsMatch(branchName, b.Value?.Regex, RegexOptions.IgnoreCase))
-                .ToArray();
+        if (branchName == null) throw new ArgumentNullException(nameof(branchName));
+        var matches = config.Branches
+            .Where(b => Regex.IsMatch(branchName, b.Value?.Regex, RegexOptions.IgnoreCase))
+            .ToArray();
 
-            try
-            {
-                return matches
-                    .Select(kvp => kvp.Value)
-                    .SingleOrDefault();
-            }
-            catch (InvalidOperationException)
-            {
-                var matchingConfigs = string.Concat(matches.Select(m => $"{System.Environment.NewLine} - {m.Key}"));
-                var picked = matches
-                    .Select(kvp => kvp.Value)
-                    .First();
+        try
+        {
+            return matches
+                .Select(kvp => kvp.Value)
+                .SingleOrDefault();
+        }
+        catch (InvalidOperationException)
+        {
+            var matchingConfigs = string.Concat(matches.Select(m => $"{System.Environment.NewLine} - {m.Key}"));
+            var picked = matches
+                .Select(kvp => kvp.Value)
+                .First();
 
-                // TODO check how to log this
-                Console.WriteLine(
-                    $"Multiple branch configurations match the current branch branchName of '{branchName}'. " +
-                    $"Using the first matching configuration, '{picked?.Name}'. Matching configurations include:'{matchingConfigs}'");
+            // TODO check how to log this
+            Console.WriteLine(
+                $"Multiple branch configurations match the current branch branchName of '{branchName}'. " +
+                $"Using the first matching configuration, '{picked?.Name}'. Matching configurations include:'{matchingConfigs}'");
 
-                return picked;
-            }
+            return picked;
         }
+    }
 
-        public static bool IsReleaseBranch(this Config config, string branchName) => config.GetConfigForBranch(branchName)?.IsReleaseBranch ?? false;
+    public static bool IsReleaseBranch(this Config config, string branchName) => config.GetConfigForBranch(branchName)?.IsReleaseBranch ?? false;
 
-        public static EffectiveConfiguration CalculateEffectiveConfiguration(this Config configuration, BranchConfig currentBranchConfig)
-        {
-            var name = currentBranchConfig.Name;
-            if (!currentBranchConfig.VersioningMode.HasValue)
-                throw new Exception($"Configuration value for 'Versioning mode' for branch {name} has no value. (this should not happen, please report an issue)");
-            if (!currentBranchConfig.Increment.HasValue)
-                throw new Exception($"Configuration value for 'Increment' for branch {name} has no value. (this should not happen, please report an issue)");
-            if (!currentBranchConfig.PreventIncrementOfMergedBranchVersion.HasValue)
-                throw new Exception($"Configuration value for 'PreventIncrementOfMergedBranchVersion' for branch {name} has no value. (this should not happen, please report an issue)");
-            if (!currentBranchConfig.TrackMergeTarget.HasValue)
-                throw new Exception($"Configuration value for 'TrackMergeTarget' for branch {name} has no value. (this should not happen, please report an issue)");
-            if (!currentBranchConfig.TracksReleaseBranches.HasValue)
-                throw new Exception($"Configuration value for 'TracksReleaseBranches' for branch {name} has no value. (this should not happen, please report an issue)");
-            if (!currentBranchConfig.IsReleaseBranch.HasValue)
-                throw new Exception($"Configuration value for 'IsReleaseBranch' for branch {name} has no value. (this should not happen, please report an issue)");
+    public static EffectiveConfiguration CalculateEffectiveConfiguration(this Config configuration, BranchConfig currentBranchConfig)
+    {
+        var name = currentBranchConfig.Name;
+        if (!currentBranchConfig.VersioningMode.HasValue)
+            throw new Exception($"Configuration value for 'Versioning mode' for branch {name} has no value. (this should not happen, please report an issue)");
+        if (!currentBranchConfig.Increment.HasValue)
+            throw new Exception($"Configuration value for 'Increment' for branch {name} has no value. (this should not happen, please report an issue)");
+        if (!currentBranchConfig.PreventIncrementOfMergedBranchVersion.HasValue)
+            throw new Exception($"Configuration value for 'PreventIncrementOfMergedBranchVersion' for branch {name} has no value. (this should not happen, please report an issue)");
+        if (!currentBranchConfig.TrackMergeTarget.HasValue)
+            throw new Exception($"Configuration value for 'TrackMergeTarget' for branch {name} has no value. (this should not happen, please report an issue)");
+        if (!currentBranchConfig.TracksReleaseBranches.HasValue)
+            throw new Exception($"Configuration value for 'TracksReleaseBranches' for branch {name} has no value. (this should not happen, please report an issue)");
+        if (!currentBranchConfig.IsReleaseBranch.HasValue)
+            throw new Exception($"Configuration value for 'IsReleaseBranch' for branch {name} has no value. (this should not happen, please report an issue)");
 
-            if (!configuration.AssemblyVersioningScheme.HasValue)
-                throw new Exception("Configuration value for 'AssemblyVersioningScheme' has no value. (this should not happen, please report an issue)");
-            if (!configuration.AssemblyFileVersioningScheme.HasValue)
-                throw new Exception("Configuration value for 'AssemblyFileVersioningScheme' has no value. (this should not happen, please report an issue)");
-            if (!configuration.CommitMessageIncrementing.HasValue)
-                throw new Exception("Configuration value for 'CommitMessageIncrementing' has no value. (this should not happen, please report an issue)");
-            if (!configuration.LegacySemVerPadding.HasValue)
-                throw new Exception("Configuration value for 'LegacySemVerPadding' has no value. (this should not happen, please report an issue)");
-            if (!configuration.BuildMetaDataPadding.HasValue)
-                throw new Exception("Configuration value for 'BuildMetaDataPadding' has no value. (this should not happen, please report an issue)");
-            if (!configuration.CommitsSinceVersionSourcePadding.HasValue)
-                throw new Exception("Configuration value for 'CommitsSinceVersionSourcePadding' has no value. (this should not happen, please report an issue)");
-            if (!configuration.TagPreReleaseWeight.HasValue)
-                throw new Exception("Configuration value for 'TagPreReleaseWeight' has no value. (this should not happen, please report an issue)");
+        if (!configuration.AssemblyVersioningScheme.HasValue)
+            throw new Exception("Configuration value for 'AssemblyVersioningScheme' has no value. (this should not happen, please report an issue)");
+        if (!configuration.AssemblyFileVersioningScheme.HasValue)
+            throw new Exception("Configuration value for 'AssemblyFileVersioningScheme' has no value. (this should not happen, please report an issue)");
+        if (!configuration.CommitMessageIncrementing.HasValue)
+            throw new Exception("Configuration value for 'CommitMessageIncrementing' has no value. (this should not happen, please report an issue)");
+        if (!configuration.LegacySemVerPadding.HasValue)
+            throw new Exception("Configuration value for 'LegacySemVerPadding' has no value. (this should not happen, please report an issue)");
+        if (!configuration.BuildMetaDataPadding.HasValue)
+            throw new Exception("Configuration value for 'BuildMetaDataPadding' has no value. (this should not happen, please report an issue)");
+        if (!configuration.CommitsSinceVersionSourcePadding.HasValue)
+            throw new Exception("Configuration value for 'CommitsSinceVersionSourcePadding' has no value. (this should not happen, please report an issue)");
+        if (!configuration.TagPreReleaseWeight.HasValue)
+            throw new Exception("Configuration value for 'TagPreReleaseWeight' has no value. (this should not happen, please report an issue)");
 
-            var versioningMode = currentBranchConfig.VersioningMode.Value;
-            var tag = currentBranchConfig.Tag;
-            var tagNumberPattern = currentBranchConfig.TagNumberPattern;
-            var incrementStrategy = currentBranchConfig.Increment.Value;
-            var preventIncrementForMergedBranchVersion = currentBranchConfig.PreventIncrementOfMergedBranchVersion.Value;
-            var trackMergeTarget = currentBranchConfig.TrackMergeTarget.Value;
-            var preReleaseWeight = currentBranchConfig.PreReleaseWeight ?? 0;
+        var versioningMode = currentBranchConfig.VersioningMode.Value;
+        var tag = currentBranchConfig.Tag;
+        var tagNumberPattern = currentBranchConfig.TagNumberPattern;
+        var incrementStrategy = currentBranchConfig.Increment.Value;
+        var preventIncrementForMergedBranchVersion = currentBranchConfig.PreventIncrementOfMergedBranchVersion.Value;
+        var trackMergeTarget = currentBranchConfig.TrackMergeTarget.Value;
+        var preReleaseWeight = currentBranchConfig.PreReleaseWeight ?? 0;
 
-            var nextVersion = configuration.NextVersion;
-            var assemblyVersioningScheme = configuration.AssemblyVersioningScheme.Value;
-            var assemblyFileVersioningScheme = configuration.AssemblyFileVersioningScheme.Value;
-            var assemblyInformationalFormat = configuration.AssemblyInformationalFormat;
-            var assemblyVersioningFormat = configuration.AssemblyVersioningFormat;
-            var assemblyFileVersioningFormat = configuration.AssemblyFileVersioningFormat;
-            var gitTagPrefix = configuration.TagPrefix;
-            var majorMessage = configuration.MajorVersionBumpMessage;
-            var minorMessage = configuration.MinorVersionBumpMessage;
-            var patchMessage = configuration.PatchVersionBumpMessage;
-            var noBumpMessage = configuration.NoBumpMessage;
-            var commitDateFormat = configuration.CommitDateFormat;
-            var updateBuildNumber = configuration.UpdateBuildNumber ?? true;
-            var tagPreReleaseWeight = configuration.TagPreReleaseWeight.Value;
+        var nextVersion = configuration.NextVersion;
+        var assemblyVersioningScheme = configuration.AssemblyVersioningScheme.Value;
+        var assemblyFileVersioningScheme = configuration.AssemblyFileVersioningScheme.Value;
+        var assemblyInformationalFormat = configuration.AssemblyInformationalFormat;
+        var assemblyVersioningFormat = configuration.AssemblyVersioningFormat;
+        var assemblyFileVersioningFormat = configuration.AssemblyFileVersioningFormat;
+        var gitTagPrefix = configuration.TagPrefix;
+        var majorMessage = configuration.MajorVersionBumpMessage;
+        var minorMessage = configuration.MinorVersionBumpMessage;
+        var patchMessage = configuration.PatchVersionBumpMessage;
+        var noBumpMessage = configuration.NoBumpMessage;
+        var commitDateFormat = configuration.CommitDateFormat;
+        var updateBuildNumber = configuration.UpdateBuildNumber ?? true;
+        var tagPreReleaseWeight = configuration.TagPreReleaseWeight.Value;
 
-            var commitMessageVersionBump = currentBranchConfig.CommitMessageIncrementing ?? configuration.CommitMessageIncrementing.Value;
-            return new EffectiveConfiguration(
-                assemblyVersioningScheme, assemblyFileVersioningScheme, assemblyInformationalFormat, assemblyVersioningFormat, assemblyFileVersioningFormat, versioningMode, gitTagPrefix,
-                tag, nextVersion, incrementStrategy,
-                currentBranchConfig.Regex,
-                preventIncrementForMergedBranchVersion,
-                tagNumberPattern, configuration.ContinuousDeploymentFallbackTag,
-                trackMergeTarget,
-                majorMessage, minorMessage, patchMessage, noBumpMessage,
-                commitMessageVersionBump,
-                configuration.LegacySemVerPadding.Value,
-                configuration.BuildMetaDataPadding.Value,
-                configuration.CommitsSinceVersionSourcePadding.Value,
-                configuration.Ignore.ToFilters(),
-                currentBranchConfig.TracksReleaseBranches.Value,
-                currentBranchConfig.IsReleaseBranch.Value,
-                commitDateFormat,
-                updateBuildNumber,
-                preReleaseWeight,
-                tagPreReleaseWeight);
-        }
+        var commitMessageVersionBump = currentBranchConfig.CommitMessageIncrementing ?? configuration.CommitMessageIncrementing.Value;
+        return new EffectiveConfiguration(
+            assemblyVersioningScheme, assemblyFileVersioningScheme, assemblyInformationalFormat, assemblyVersioningFormat, assemblyFileVersioningFormat, versioningMode, gitTagPrefix,
+            tag, nextVersion, incrementStrategy,
+            currentBranchConfig.Regex,
+            preventIncrementForMergedBranchVersion,
+            tagNumberPattern, configuration.ContinuousDeploymentFallbackTag,
+            trackMergeTarget,
+            majorMessage, minorMessage, patchMessage, noBumpMessage,
+            commitMessageVersionBump,
+            configuration.LegacySemVerPadding.Value,
+            configuration.BuildMetaDataPadding.Value,
+            configuration.CommitsSinceVersionSourcePadding.Value,
+            configuration.Ignore.ToFilters(),
+            currentBranchConfig.TracksReleaseBranches.Value,
+            currentBranchConfig.IsReleaseBranch.Value,
+            commitDateFormat,
+            updateBuildNumber,
+            preReleaseWeight,
+            tagPreReleaseWeight);
+    }
 
-        public static string GetBranchSpecificTag(this EffectiveConfiguration configuration, ILog log, string? branchFriendlyName, string? branchNameOverride)
+    public static string GetBranchSpecificTag(this EffectiveConfiguration configuration, ILog log, string? branchFriendlyName, string? branchNameOverride)
+    {
+        var tagToUse = configuration.Tag!;
+        if (tagToUse == "useBranchName")
         {
-            var tagToUse = configuration.Tag!;
-            if (tagToUse == "useBranchName")
+            tagToUse = "{BranchName}";
+        }
+        if (tagToUse.Contains("{BranchName}"))
+        {
+            log.Info("Using branch name to calculate version tag");
+
+            var branchName = branchNameOverride ?? branchFriendlyName;
+            if (!configuration.BranchPrefixToTrim.IsNullOrWhiteSpace())
             {
-                tagToUse = "{BranchName}";
+                var branchNameTrimmed = branchName?.RegexReplace(configuration.BranchPrefixToTrim, string.Empty, RegexOptions.IgnoreCase);
+                branchName = branchNameTrimmed.IsNullOrEmpty() ? branchName : branchNameTrimmed;
             }
-            if (tagToUse.Contains("{BranchName}"))
-            {
-                log.Info("Using branch name to calculate version tag");
-
-                var branchName = branchNameOverride ?? branchFriendlyName;
-                if (!configuration.BranchPrefixToTrim.IsNullOrWhiteSpace())
-                {
-                    var branchNameTrimmed = branchName?.RegexReplace(configuration.BranchPrefixToTrim, string.Empty, RegexOptions.IgnoreCase);
-                    branchName = branchNameTrimmed.IsNullOrEmpty() ? branchName : branchNameTrimmed;
-                }
-                branchName = branchName?.RegexReplace("[^a-zA-Z0-9-]", "-");
+            branchName = branchName?.RegexReplace("[^a-zA-Z0-9-]", "-");
 
-                tagToUse = tagToUse.Replace("{BranchName}", branchName);
-            }
-            return tagToUse;
+            tagToUse = tagToUse.Replace("{BranchName}", branchName);
         }
-
-        public static List<KeyValuePair<string, BranchConfig?>> GetReleaseBranchConfig(this Config configuration) =>
-            configuration.Branches
-                .Where(b => b.Value?.IsReleaseBranch == true)
-                .ToList();
+        return tagToUse;
     }
-}
+
+    public static List<KeyValuePair<string, BranchConfig?>> GetReleaseBranchConfig(this Config configuration) =>
+        configuration.Branches
+            .Where(b => b.Value?.IsReleaseBranch == true)
+            .ToList();
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/ConfigFileLocator.cs b/src/GitVersion.Core/Configuration/ConfigFileLocator.cs
index 1dfe57cfef..2d478d7c1a 100644
--- a/src/GitVersion.Core/Configuration/ConfigFileLocator.cs
+++ b/src/GitVersion.Core/Configuration/ConfigFileLocator.cs
@@ -5,103 +5,102 @@
 using GitVersion.VersionCalculation;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion.Configuration
+namespace GitVersion.Configuration;
+
+public class ConfigFileLocator : IConfigFileLocator
 {
-    public class ConfigFileLocator : IConfigFileLocator
+    public const string DefaultFileName = "GitVersion.yml";
+    private readonly IFileSystem fileSystem;
+    public ConfigFileLocator(IFileSystem fileSystem, IOptions<GitVersionOptions> options)
     {
-        public const string DefaultFileName = "GitVersion.yml";
-        private readonly IFileSystem fileSystem;
-        public ConfigFileLocator(IFileSystem fileSystem, IOptions<GitVersionOptions> options)
-        {
-            this.fileSystem = fileSystem;
-            var configFile = options?.Value.ConfigInfo.ConfigFile;
-            FilePath = !configFile.IsNullOrWhiteSpace() ? configFile : DefaultFileName;
-        }
+        this.fileSystem = fileSystem;
+        var configFile = options?.Value.ConfigInfo.ConfigFile;
+        FilePath = !configFile.IsNullOrWhiteSpace() ? configFile : DefaultFileName;
+    }
 
-        public string FilePath { get; }
+    public string FilePath { get; }
 
-        public bool HasConfigFileAt(string workingDirectory) => this.fileSystem.Exists(Path.Combine(workingDirectory, FilePath));
+    public bool HasConfigFileAt(string workingDirectory) => this.fileSystem.Exists(Path.Combine(workingDirectory, FilePath));
 
-        public string GetConfigFilePath(string workingDirectory) => Path.Combine(workingDirectory, FilePath);
+    public string GetConfigFilePath(string workingDirectory) => Path.Combine(workingDirectory, FilePath);
 
-        public void Verify(string? workingDirectory, string? projectRootDirectory)
+    public void Verify(string? workingDirectory, string? projectRootDirectory)
+    {
+        if (!Path.IsPathRooted(FilePath) && !this.fileSystem.PathsEqual(workingDirectory, projectRootDirectory))
         {
-            if (!Path.IsPathRooted(FilePath) && !this.fileSystem.PathsEqual(workingDirectory, projectRootDirectory))
-            {
-                WarnAboutAmbiguousConfigFileSelection(workingDirectory, projectRootDirectory);
-            }
+            WarnAboutAmbiguousConfigFileSelection(workingDirectory, projectRootDirectory);
         }
+    }
 
-        public string SelectConfigFilePath(GitVersionOptions gitVersionOptions, IGitRepositoryInfo repositoryInfo)
-        {
-            var workingDirectory = gitVersionOptions.WorkingDirectory;
-            var projectRootDirectory = repositoryInfo.ProjectRootDirectory;
-
-            return GetConfigFilePath(HasConfigFileAt(workingDirectory) ? workingDirectory : projectRootDirectory);
-        }
+    public string SelectConfigFilePath(GitVersionOptions gitVersionOptions, IGitRepositoryInfo repositoryInfo)
+    {
+        var workingDirectory = gitVersionOptions.WorkingDirectory;
+        var projectRootDirectory = repositoryInfo.ProjectRootDirectory;
 
-        public Config ReadConfig(string workingDirectory)
-        {
-            var configFilePath = GetConfigFilePath(workingDirectory);
+        return GetConfigFilePath(HasConfigFileAt(workingDirectory) ? workingDirectory : projectRootDirectory);
+    }
 
-            if (this.fileSystem.Exists(configFilePath))
-            {
-                var readAllText = this.fileSystem.ReadAllText(configFilePath);
-                var readConfig = ConfigSerializer.Read(new StringReader(readAllText));
+    public Config ReadConfig(string workingDirectory)
+    {
+        var configFilePath = GetConfigFilePath(workingDirectory);
 
-                VerifyReadConfig(readConfig);
+        if (this.fileSystem.Exists(configFilePath))
+        {
+            var readAllText = this.fileSystem.ReadAllText(configFilePath);
+            var readConfig = ConfigSerializer.Read(new StringReader(readAllText));
 
-                return readConfig;
-            }
+            VerifyReadConfig(readConfig);
 
-            return new Config();
+            return readConfig;
         }
 
-        public void Verify(GitVersionOptions gitVersionOptions, IGitRepositoryInfo repositoryInfo)
+        return new Config();
+    }
+
+    public void Verify(GitVersionOptions gitVersionOptions, IGitRepositoryInfo repositoryInfo)
+    {
+        if (!gitVersionOptions.RepositoryInfo.TargetUrl.IsNullOrWhiteSpace())
         {
-            if (!gitVersionOptions.RepositoryInfo.TargetUrl.IsNullOrWhiteSpace())
-            {
-                // Assuming this is a dynamic repository. At this stage it's unsure whether we have
-                // any .git info so we need to skip verification
-                return;
-            }
+            // Assuming this is a dynamic repository. At this stage it's unsure whether we have
+            // any .git info so we need to skip verification
+            return;
+        }
 
-            var workingDirectory = gitVersionOptions.WorkingDirectory;
-            var projectRootDirectory = repositoryInfo.ProjectRootDirectory;
+        var workingDirectory = gitVersionOptions.WorkingDirectory;
+        var projectRootDirectory = repositoryInfo.ProjectRootDirectory;
 
-            Verify(workingDirectory, projectRootDirectory);
-        }
+        Verify(workingDirectory, projectRootDirectory);
+    }
 
-        private static void VerifyReadConfig(Config config)
+    private static void VerifyReadConfig(Config config)
+    {
+        // Verify no branches are set to mainline mode
+        if (config.Branches.Any(b => b.Value?.VersioningMode == VersioningMode.Mainline))
         {
-            // Verify no branches are set to mainline mode
-            if (config.Branches.Any(b => b.Value?.VersioningMode == VersioningMode.Mainline))
-            {
-                throw new ConfigurationException(@"Mainline mode only works at the repository level, a single branch cannot be put into mainline mode
+            throw new ConfigurationException(@"Mainline mode only works at the repository level, a single branch cannot be put into mainline mode
 
 This is because mainline mode treats your entire git repository as an event source with each merge into the 'mainline' incrementing the version.
 
 If the docs do not help you decide on the mode open an issue to discuss what you are trying to do.");
-            }
+        }
+    }
+
+    private void WarnAboutAmbiguousConfigFileSelection(string? workingDirectory, string? projectRootDirectory)
+    {
+        var workingConfigFile = GetConfigFilePath(workingDirectory);
+        var projectRootConfigFile = GetConfigFilePath(projectRootDirectory);
+
+        var hasConfigInWorkingDirectory = this.fileSystem.Exists(workingConfigFile);
+        var hasConfigInProjectRootDirectory = this.fileSystem.Exists(projectRootConfigFile);
+        if (hasConfigInProjectRootDirectory && hasConfigInWorkingDirectory)
+        {
+            throw new WarningException($"Ambiguous config file selection from '{workingConfigFile}' and '{projectRootConfigFile}'");
         }
 
-        private void WarnAboutAmbiguousConfigFileSelection(string? workingDirectory, string? projectRootDirectory)
+        if (!hasConfigInProjectRootDirectory && !hasConfigInWorkingDirectory)
         {
-            var workingConfigFile = GetConfigFilePath(workingDirectory);
-            var projectRootConfigFile = GetConfigFilePath(projectRootDirectory);
-
-            var hasConfigInWorkingDirectory = this.fileSystem.Exists(workingConfigFile);
-            var hasConfigInProjectRootDirectory = this.fileSystem.Exists(projectRootConfigFile);
-            if (hasConfigInProjectRootDirectory && hasConfigInWorkingDirectory)
-            {
-                throw new WarningException($"Ambiguous config file selection from '{workingConfigFile}' and '{projectRootConfigFile}'");
-            }
-
-            if (!hasConfigInProjectRootDirectory && !hasConfigInWorkingDirectory)
-            {
-                if (FilePath != DefaultFileName)
-                    throw new WarningException($"The configuration file was not found at '{workingConfigFile}' or '{projectRootConfigFile}'");
-            }
+            if (FilePath != DefaultFileName)
+                throw new WarningException($"The configuration file was not found at '{workingConfigFile}' or '{projectRootConfigFile}'");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/ConfigProvider.cs b/src/GitVersion.Core/Configuration/ConfigProvider.cs
index 5d4e1c6ee9..ce9d6fea35 100644
--- a/src/GitVersion.Core/Configuration/ConfigProvider.cs
+++ b/src/GitVersion.Core/Configuration/ConfigProvider.cs
@@ -5,57 +5,56 @@
 using GitVersion.Model.Configuration;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion.Configuration
+namespace GitVersion.Configuration;
+
+public class ConfigProvider : IConfigProvider
 {
-    public class ConfigProvider : IConfigProvider
+    private readonly IFileSystem fileSystem;
+    private readonly ILog log;
+    private readonly IConfigFileLocator configFileLocator;
+    private readonly IOptions<GitVersionOptions> options;
+    private readonly IConfigInitWizard configInitWizard;
+    private readonly IGitRepositoryInfo repositoryInfo;
+
+    public ConfigProvider(IFileSystem fileSystem, ILog log, IConfigFileLocator configFileLocator,
+        IOptions<GitVersionOptions> options, IConfigInitWizard configInitWizard, IGitRepositoryInfo repositoryInfo)
+    {
+        this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
+        this.configFileLocator = configFileLocator ?? throw new ArgumentNullException(nameof(configFileLocator));
+        this.options = options ?? throw new ArgumentNullException(nameof(options));
+        this.configInitWizard = configInitWizard ?? throw new ArgumentNullException(nameof(this.configInitWizard));
+        this.repositoryInfo = repositoryInfo ?? throw new ArgumentNullException(nameof(this.repositoryInfo));
+    }
+
+    public Config Provide(Config? overrideConfig = null)
     {
-        private readonly IFileSystem fileSystem;
-        private readonly ILog log;
-        private readonly IConfigFileLocator configFileLocator;
-        private readonly IOptions<GitVersionOptions> options;
-        private readonly IConfigInitWizard configInitWizard;
-        private readonly IGitRepositoryInfo repositoryInfo;
-
-        public ConfigProvider(IFileSystem fileSystem, ILog log, IConfigFileLocator configFileLocator,
-            IOptions<GitVersionOptions> options, IConfigInitWizard configInitWizard, IGitRepositoryInfo repositoryInfo)
-        {
-            this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.configFileLocator = configFileLocator ?? throw new ArgumentNullException(nameof(configFileLocator));
-            this.options = options ?? throw new ArgumentNullException(nameof(options));
-            this.configInitWizard = configInitWizard ?? throw new ArgumentNullException(nameof(this.configInitWizard));
-            this.repositoryInfo = repositoryInfo ?? throw new ArgumentNullException(nameof(this.repositoryInfo));
-        }
-
-        public Config Provide(Config? overrideConfig = null)
-        {
-            var gitVersionOptions = this.options.Value;
-            var workingDirectory = gitVersionOptions.WorkingDirectory;
-            var projectRootDirectory = this.repositoryInfo.ProjectRootDirectory;
-
-            var rootDirectory = this.configFileLocator.HasConfigFileAt(workingDirectory) ? workingDirectory : projectRootDirectory;
-            return Provide(rootDirectory, overrideConfig);
-        }
-
-        public Config Provide(string workingDirectory, Config? overrideConfig = null) =>
-            new ConfigurationBuilder()
-                .Add(this.configFileLocator.ReadConfig(workingDirectory))
-                .Add(overrideConfig ?? new Config())
-                .Build();
-
-        public void Init(string workingDirectory)
-        {
-            var configFilePath = this.configFileLocator.GetConfigFilePath(workingDirectory);
-            var currentConfiguration = this.configFileLocator.ReadConfig(workingDirectory);
-
-            var config = this.configInitWizard.Run(currentConfiguration, workingDirectory);
-            if (config == null) return;
-
-            using var stream = this.fileSystem.OpenWrite(configFilePath);
-            using var writer = new StreamWriter(stream);
-            this.log.Info("Saving config file");
-            ConfigSerializer.Write(config, writer);
-            stream.Flush();
-        }
+        var gitVersionOptions = this.options.Value;
+        var workingDirectory = gitVersionOptions.WorkingDirectory;
+        var projectRootDirectory = this.repositoryInfo.ProjectRootDirectory;
+
+        var rootDirectory = this.configFileLocator.HasConfigFileAt(workingDirectory) ? workingDirectory : projectRootDirectory;
+        return Provide(rootDirectory, overrideConfig);
+    }
+
+    public Config Provide(string workingDirectory, Config? overrideConfig = null) =>
+        new ConfigurationBuilder()
+            .Add(this.configFileLocator.ReadConfig(workingDirectory))
+            .Add(overrideConfig ?? new Config())
+            .Build();
+
+    public void Init(string workingDirectory)
+    {
+        var configFilePath = this.configFileLocator.GetConfigFilePath(workingDirectory);
+        var currentConfiguration = this.configFileLocator.ReadConfig(workingDirectory);
+
+        var config = this.configInitWizard.Run(currentConfiguration, workingDirectory);
+        if (config == null) return;
+
+        using var stream = this.fileSystem.OpenWrite(configFilePath);
+        using var writer = new StreamWriter(stream);
+        this.log.Info("Saving config file");
+        ConfigSerializer.Write(config, writer);
+        stream.Flush();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/ConfigSerializer.cs b/src/GitVersion.Core/Configuration/ConfigSerializer.cs
index 2c57fca357..8d87636252 100644
--- a/src/GitVersion.Core/Configuration/ConfigSerializer.cs
+++ b/src/GitVersion.Core/Configuration/ConfigSerializer.cs
@@ -3,26 +3,25 @@
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
-namespace GitVersion.Configuration
+namespace GitVersion.Configuration;
+
+public class ConfigSerializer
 {
-    public class ConfigSerializer
+    public static Config Read(TextReader reader)
     {
-        public static Config Read(TextReader reader)
-        {
-            var deserializer = new DeserializerBuilder()
-                .WithNamingConvention(HyphenatedNamingConvention.Instance)
-                .Build();
-            var deserialize = deserializer.Deserialize<Config>(reader);
-            return deserialize ?? new Config();
-        }
+        var deserializer = new DeserializerBuilder()
+            .WithNamingConvention(HyphenatedNamingConvention.Instance)
+            .Build();
+        var deserialize = deserializer.Deserialize<Config>(reader);
+        return deserialize ?? new Config();
+    }
 
-        public static void Write(Config config, TextWriter writer)
-        {
-            var serializer = new SerializerBuilder()
-                .ConfigureDefaultValuesHandling(DefaultValuesHandling.OmitDefaults)
-                .WithNamingConvention(HyphenatedNamingConvention.Instance)
-                .Build();
-            serializer.Serialize(writer, config);
-        }
+    public static void Write(Config config, TextWriter writer)
+    {
+        var serializer = new SerializerBuilder()
+            .ConfigureDefaultValuesHandling(DefaultValuesHandling.OmitDefaults)
+            .WithNamingConvention(HyphenatedNamingConvention.Instance)
+            .Build();
+        serializer.Serialize(writer, config);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs b/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs
index 17d37d8845..4cd953bdf2 100644
--- a/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs
+++ b/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs
@@ -6,285 +6,284 @@
 using GitVersion.VersionCalculation;
 using JetBrains.Annotations;
 
-namespace GitVersion.Configuration
+namespace GitVersion.Configuration;
+
+public class ConfigurationBuilder
 {
-    public class ConfigurationBuilder
-    {
-        private const int DefaultTagPreReleaseWeight = 60000;
+    private const int DefaultTagPreReleaseWeight = 60000;
 
-        private readonly List<Config> overrides = new();
+    private readonly List<Config> overrides = new();
 
-        public ConfigurationBuilder Add([NotNull] Config config)
-        {
-            if (config == null) throw new ArgumentNullException(nameof(config));
+    public ConfigurationBuilder Add([NotNull] Config config)
+    {
+        if (config == null) throw new ArgumentNullException(nameof(config));
 
-            this.overrides.Add(config);
-            return this;
-        }
+        this.overrides.Add(config);
+        return this;
+    }
 
-        [NotNull]
-        public Config Build()
-        {
-            var config = CreateDefaultConfiguration();
+    [NotNull]
+    public Config Build()
+    {
+        var config = CreateDefaultConfiguration();
 
-            foreach (var overrideConfig in this.overrides)
-            {
-                ApplyOverrides(config, overrideConfig);
-            }
+        foreach (var overrideConfig in this.overrides)
+        {
+            ApplyOverrides(config, overrideConfig);
+        }
 
-            FinalizeConfiguration(config);
-            ValidateConfiguration(config);
+        FinalizeConfiguration(config);
+        ValidateConfiguration(config);
 
-            return config;
-        }
+        return config;
+    }
 
-        private static void ApplyOverrides([NotNull] Config targetConfig, [NotNull] Config overrideConfig)
+    private static void ApplyOverrides([NotNull] Config targetConfig, [NotNull] Config overrideConfig)
+    {
+        targetConfig.AssemblyVersioningScheme = overrideConfig.AssemblyVersioningScheme ?? targetConfig.AssemblyVersioningScheme;
+        targetConfig.AssemblyFileVersioningScheme = overrideConfig.AssemblyFileVersioningScheme ?? targetConfig.AssemblyFileVersioningScheme;
+        targetConfig.AssemblyInformationalFormat = overrideConfig.AssemblyInformationalFormat ?? targetConfig.AssemblyInformationalFormat;
+        targetConfig.AssemblyVersioningFormat = overrideConfig.AssemblyVersioningFormat ?? targetConfig.AssemblyVersioningFormat;
+        targetConfig.AssemblyFileVersioningFormat = overrideConfig.AssemblyFileVersioningFormat ?? targetConfig.AssemblyFileVersioningFormat;
+        targetConfig.VersioningMode = overrideConfig.VersioningMode ?? targetConfig.VersioningMode;
+        targetConfig.TagPrefix = overrideConfig.TagPrefix ?? targetConfig.TagPrefix;
+        targetConfig.ContinuousDeploymentFallbackTag = overrideConfig.ContinuousDeploymentFallbackTag ?? targetConfig.ContinuousDeploymentFallbackTag;
+        targetConfig.NextVersion = overrideConfig.NextVersion ?? targetConfig.NextVersion;
+        targetConfig.MajorVersionBumpMessage = overrideConfig.MajorVersionBumpMessage ?? targetConfig.MajorVersionBumpMessage;
+        targetConfig.MinorVersionBumpMessage = overrideConfig.MinorVersionBumpMessage ?? targetConfig.MinorVersionBumpMessage;
+        targetConfig.PatchVersionBumpMessage = overrideConfig.PatchVersionBumpMessage ?? targetConfig.PatchVersionBumpMessage;
+        targetConfig.NoBumpMessage = overrideConfig.NoBumpMessage ?? targetConfig.NoBumpMessage;
+        targetConfig.LegacySemVerPadding = overrideConfig.LegacySemVerPadding ?? targetConfig.LegacySemVerPadding;
+        targetConfig.BuildMetaDataPadding = overrideConfig.BuildMetaDataPadding ?? targetConfig.BuildMetaDataPadding;
+        targetConfig.CommitsSinceVersionSourcePadding = overrideConfig.CommitsSinceVersionSourcePadding ?? targetConfig.CommitsSinceVersionSourcePadding;
+        targetConfig.TagPreReleaseWeight = overrideConfig.TagPreReleaseWeight ?? targetConfig.TagPreReleaseWeight;
+        targetConfig.CommitMessageIncrementing = overrideConfig.CommitMessageIncrementing ?? targetConfig.CommitMessageIncrementing;
+        targetConfig.Increment = overrideConfig.Increment ?? targetConfig.Increment;
+        targetConfig.CommitDateFormat = overrideConfig.CommitDateFormat ?? targetConfig.CommitDateFormat;
+        targetConfig.MergeMessageFormats = overrideConfig.MergeMessageFormats.Any() ? overrideConfig.MergeMessageFormats : targetConfig.MergeMessageFormats;
+        targetConfig.UpdateBuildNumber = overrideConfig.UpdateBuildNumber ?? targetConfig.UpdateBuildNumber;
+
+        if (overrideConfig.Ignore != null && !overrideConfig.Ignore.IsEmpty)
         {
-            targetConfig.AssemblyVersioningScheme = overrideConfig.AssemblyVersioningScheme ?? targetConfig.AssemblyVersioningScheme;
-            targetConfig.AssemblyFileVersioningScheme = overrideConfig.AssemblyFileVersioningScheme ?? targetConfig.AssemblyFileVersioningScheme;
-            targetConfig.AssemblyInformationalFormat = overrideConfig.AssemblyInformationalFormat ?? targetConfig.AssemblyInformationalFormat;
-            targetConfig.AssemblyVersioningFormat = overrideConfig.AssemblyVersioningFormat ?? targetConfig.AssemblyVersioningFormat;
-            targetConfig.AssemblyFileVersioningFormat = overrideConfig.AssemblyFileVersioningFormat ?? targetConfig.AssemblyFileVersioningFormat;
-            targetConfig.VersioningMode = overrideConfig.VersioningMode ?? targetConfig.VersioningMode;
-            targetConfig.TagPrefix = overrideConfig.TagPrefix ?? targetConfig.TagPrefix;
-            targetConfig.ContinuousDeploymentFallbackTag = overrideConfig.ContinuousDeploymentFallbackTag ?? targetConfig.ContinuousDeploymentFallbackTag;
-            targetConfig.NextVersion = overrideConfig.NextVersion ?? targetConfig.NextVersion;
-            targetConfig.MajorVersionBumpMessage = overrideConfig.MajorVersionBumpMessage ?? targetConfig.MajorVersionBumpMessage;
-            targetConfig.MinorVersionBumpMessage = overrideConfig.MinorVersionBumpMessage ?? targetConfig.MinorVersionBumpMessage;
-            targetConfig.PatchVersionBumpMessage = overrideConfig.PatchVersionBumpMessage ?? targetConfig.PatchVersionBumpMessage;
-            targetConfig.NoBumpMessage = overrideConfig.NoBumpMessage ?? targetConfig.NoBumpMessage;
-            targetConfig.LegacySemVerPadding = overrideConfig.LegacySemVerPadding ?? targetConfig.LegacySemVerPadding;
-            targetConfig.BuildMetaDataPadding = overrideConfig.BuildMetaDataPadding ?? targetConfig.BuildMetaDataPadding;
-            targetConfig.CommitsSinceVersionSourcePadding = overrideConfig.CommitsSinceVersionSourcePadding ?? targetConfig.CommitsSinceVersionSourcePadding;
-            targetConfig.TagPreReleaseWeight = overrideConfig.TagPreReleaseWeight ?? targetConfig.TagPreReleaseWeight;
-            targetConfig.CommitMessageIncrementing = overrideConfig.CommitMessageIncrementing ?? targetConfig.CommitMessageIncrementing;
-            targetConfig.Increment = overrideConfig.Increment ?? targetConfig.Increment;
-            targetConfig.CommitDateFormat = overrideConfig.CommitDateFormat ?? targetConfig.CommitDateFormat;
-            targetConfig.MergeMessageFormats = overrideConfig.MergeMessageFormats.Any() ? overrideConfig.MergeMessageFormats : targetConfig.MergeMessageFormats;
-            targetConfig.UpdateBuildNumber = overrideConfig.UpdateBuildNumber ?? targetConfig.UpdateBuildNumber;
-
-            if (overrideConfig.Ignore != null && !overrideConfig.Ignore.IsEmpty)
-            {
-                targetConfig.Ignore = overrideConfig.Ignore;
-            }
-
-            ApplyBranchOverrides(targetConfig, overrideConfig);
+            targetConfig.Ignore = overrideConfig.Ignore;
         }
 
-        private static void ApplyBranchOverrides(Config targetConfig, Config overrideConfig)
+        ApplyBranchOverrides(targetConfig, overrideConfig);
+    }
+
+    private static void ApplyBranchOverrides(Config targetConfig, Config overrideConfig)
+    {
+        if (overrideConfig.Branches != null && overrideConfig.Branches.Count > 0)
         {
-            if (overrideConfig.Branches != null && overrideConfig.Branches.Count > 0)
-            {
-                // We can't just add new configs to the targetConfig.Branches, and have to create a new dictionary.
-                // The reason is that GitVersion 5.3.x (and earlier) merges default configs into overrides. The new approach is opposite: we merge overrides into default config.
-                // The important difference of these approaches is the order of branches in a dictionary (we should not rely on Dictionary's implementation details, but we already did that):
-                // Old approach: { new-branch-1, new-branch-2, default-branch-1, default-branch-2, ... }
-                // New approach: { default-branch-1, default-branch-2, ..., new-branch-1, new-branch-2 }
-                // In case when several branch configurations match the current branch (by regex), we choose the first one.
-                // So we have to add new branches to the beginning of a dictionary to preserve 5.3.x behavior.
+            // We can't just add new configs to the targetConfig.Branches, and have to create a new dictionary.
+            // The reason is that GitVersion 5.3.x (and earlier) merges default configs into overrides. The new approach is opposite: we merge overrides into default config.
+            // The important difference of these approaches is the order of branches in a dictionary (we should not rely on Dictionary's implementation details, but we already did that):
+            // Old approach: { new-branch-1, new-branch-2, default-branch-1, default-branch-2, ... }
+            // New approach: { default-branch-1, default-branch-2, ..., new-branch-1, new-branch-2 }
+            // In case when several branch configurations match the current branch (by regex), we choose the first one.
+            // So we have to add new branches to the beginning of a dictionary to preserve 5.3.x behavior.
 
-                var newBranches = new Dictionary<string, BranchConfig?>();
+            var newBranches = new Dictionary<string, BranchConfig?>();
 
-                var targetConfigBranches = targetConfig.Branches;
+            var targetConfigBranches = targetConfig.Branches;
 
-                foreach (var (name, branchConfig) in overrideConfig.Branches)
+            foreach (var (name, branchConfig) in overrideConfig.Branches)
+            {
+                // for compatibility reason we check if it's master, we rename it to main
+                var branchName = name == Config.MasterBranchKey ? Config.MainBranchKey : name;
+                if (!targetConfigBranches.TryGetValue(branchName, out var target))
                 {
-                    // for compatibility reason we check if it's master, we rename it to main
-                    var branchName = name == Config.MasterBranchKey ? Config.MainBranchKey : name;
-                    if (!targetConfigBranches.TryGetValue(branchName, out var target))
-                    {
-                        target = BranchConfig.CreateDefaultBranchConfig(branchName);
-                    }
-
-                    branchConfig!.MergeTo(target!);
-                    if (target!.SourceBranches != null && target.SourceBranches.Contains(Config.MasterBranchKey))
-                    {
-                        target.SourceBranches.Remove(Config.MasterBranchKey);
-                        target.SourceBranches.Add(Config.MainBranchKey);
-                    }
-                    newBranches[branchName] = target;
+                    target = BranchConfig.CreateDefaultBranchConfig(branchName);
                 }
 
-                foreach (var (name, branchConfig) in targetConfigBranches)
+                branchConfig!.MergeTo(target!);
+                if (target!.SourceBranches != null && target.SourceBranches.Contains(Config.MasterBranchKey))
                 {
-                    if (!newBranches.ContainsKey(name))
-                    {
-                        newBranches[name] = branchConfig;
-                    }
+                    target.SourceBranches.Remove(Config.MasterBranchKey);
+                    target.SourceBranches.Add(Config.MainBranchKey);
                 }
-
-                targetConfig.Branches = newBranches;
+                newBranches[branchName] = target;
             }
-        }
 
-        private static void FinalizeConfiguration(Config config)
-        {
-            config.Ignore ??= new IgnoreConfig();
-
-            foreach (var (name, branchConfig) in config.Branches)
+            foreach (var (name, branchConfig) in targetConfigBranches)
             {
-                FinalizeBranchConfiguration(config, name, branchConfig);
+                if (!newBranches.ContainsKey(name))
+                {
+                    newBranches[name] = branchConfig;
+                }
             }
+
+            targetConfig.Branches = newBranches;
         }
+    }
+
+    private static void FinalizeConfiguration(Config config)
+    {
+        config.Ignore ??= new IgnoreConfig();
 
-        private static void FinalizeBranchConfiguration(Config config, string name, BranchConfig? branchConfig)
+        foreach (var (name, branchConfig) in config.Branches)
         {
-            branchConfig!.Name = name;
-            branchConfig.Increment ??= config.Increment ?? IncrementStrategy.Inherit;
+            FinalizeBranchConfiguration(config, name, branchConfig);
+        }
+    }
+
+    private static void FinalizeBranchConfiguration(Config config, string name, BranchConfig? branchConfig)
+    {
+        branchConfig!.Name = name;
+        branchConfig.Increment ??= config.Increment ?? IncrementStrategy.Inherit;
 
-            if (branchConfig.VersioningMode == null)
+        if (branchConfig.VersioningMode == null)
+        {
+            if (name == Config.DevelopBranchKey)
             {
-                if (name == Config.DevelopBranchKey)
-                {
-                    branchConfig.VersioningMode = config.VersioningMode == VersioningMode.Mainline ? VersioningMode.Mainline : VersioningMode.ContinuousDeployment;
-                }
-                else
-                {
-                    branchConfig.VersioningMode = config.VersioningMode;
-                }
+                branchConfig.VersioningMode = config.VersioningMode == VersioningMode.Mainline ? VersioningMode.Mainline : VersioningMode.ContinuousDeployment;
             }
-
-            if (branchConfig.IsSourceBranchFor != null)
+            else
             {
-                foreach (var targetBranchName in branchConfig.IsSourceBranchFor)
-                {
-                    var targetBranchConfig = config.Branches[targetBranchName]!;
-                    targetBranchConfig.SourceBranches ??= new HashSet<string>();
-                    targetBranchConfig.SourceBranches.Add(name);
-                }
+                branchConfig.VersioningMode = config.VersioningMode;
             }
         }
 
-        private static void ValidateConfiguration(Config config)
+        if (branchConfig.IsSourceBranchFor != null)
         {
-            foreach (var (name, branchConfig) in config.Branches)
+            foreach (var targetBranchName in branchConfig.IsSourceBranchFor)
             {
-                var regex = branchConfig?.Regex;
-                var helpUrl = $"{System.Environment.NewLine}See https://gitversion.net/docs/reference/configuration for more info";
+                var targetBranchConfig = config.Branches[targetBranchName]!;
+                targetBranchConfig.SourceBranches ??= new HashSet<string>();
+                targetBranchConfig.SourceBranches.Add(name);
+            }
+        }
+    }
 
-                if (regex == null)
-                {
-                    throw new ConfigurationException($"Branch configuration '{name}' is missing required configuration 'regex'{helpUrl}");
-                }
+    private static void ValidateConfiguration(Config config)
+    {
+        foreach (var (name, branchConfig) in config.Branches)
+        {
+            var regex = branchConfig?.Regex;
+            var helpUrl = $"{System.Environment.NewLine}See https://gitversion.net/docs/reference/configuration for more info";
 
-                var sourceBranches = branchConfig?.SourceBranches;
-                if (sourceBranches == null)
-                {
-                    throw new ConfigurationException($"Branch configuration '{name}' is missing required configuration 'source-branches'{helpUrl}");
-                }
+            if (regex == null)
+            {
+                throw new ConfigurationException($"Branch configuration '{name}' is missing required configuration 'regex'{helpUrl}");
+            }
 
-                var missingSourceBranches = sourceBranches.Where(sb => !config.Branches.ContainsKey(sb)).ToArray();
-                if (missingSourceBranches.Any())
-                    throw new ConfigurationException($"Branch configuration '{name}' defines these 'source-branches' that are not configured: '[{string.Join(",", missingSourceBranches)}]'{helpUrl}");
+            var sourceBranches = branchConfig?.SourceBranches;
+            if (sourceBranches == null)
+            {
+                throw new ConfigurationException($"Branch configuration '{name}' is missing required configuration 'source-branches'{helpUrl}");
             }
+
+            var missingSourceBranches = sourceBranches.Where(sb => !config.Branches.ContainsKey(sb)).ToArray();
+            if (missingSourceBranches.Any())
+                throw new ConfigurationException($"Branch configuration '{name}' defines these 'source-branches' that are not configured: '[{string.Join(",", missingSourceBranches)}]'{helpUrl}");
         }
+    }
 
-        private static Config CreateDefaultConfiguration()
+    private static Config CreateDefaultConfiguration()
+    {
+        var config = new Config
         {
-            var config = new Config
+            AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
+            AssemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,
+            TagPrefix = Config.DefaultTagPrefix,
+            VersioningMode = VersioningMode.ContinuousDelivery,
+            ContinuousDeploymentFallbackTag = "ci",
+            MajorVersionBumpMessage = IncrementStrategyFinder.DefaultMajorPattern,
+            MinorVersionBumpMessage = IncrementStrategyFinder.DefaultMinorPattern,
+            PatchVersionBumpMessage = IncrementStrategyFinder.DefaultPatchPattern,
+            NoBumpMessage = IncrementStrategyFinder.DefaultNoBumpPattern,
+            CommitMessageIncrementing = CommitMessageIncrementMode.Enabled,
+            LegacySemVerPadding = 4,
+            BuildMetaDataPadding = 4,
+            CommitsSinceVersionSourcePadding = 4,
+            CommitDateFormat = "yyyy-MM-dd",
+            UpdateBuildNumber = true,
+            TagPreReleaseWeight = DefaultTagPreReleaseWeight
+        };
+
+        AddBranchConfig(Config.DevelopBranchKey,
+            new BranchConfig
             {
-                AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
-                AssemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,
-                TagPrefix = Config.DefaultTagPrefix,
-                VersioningMode = VersioningMode.ContinuousDelivery,
-                ContinuousDeploymentFallbackTag = "ci",
-                MajorVersionBumpMessage = IncrementStrategyFinder.DefaultMajorPattern,
-                MinorVersionBumpMessage = IncrementStrategyFinder.DefaultMinorPattern,
-                PatchVersionBumpMessage = IncrementStrategyFinder.DefaultPatchPattern,
-                NoBumpMessage = IncrementStrategyFinder.DefaultNoBumpPattern,
-                CommitMessageIncrementing = CommitMessageIncrementMode.Enabled,
-                LegacySemVerPadding = 4,
-                BuildMetaDataPadding = 4,
-                CommitsSinceVersionSourcePadding = 4,
-                CommitDateFormat = "yyyy-MM-dd",
-                UpdateBuildNumber = true,
-                TagPreReleaseWeight = DefaultTagPreReleaseWeight
-            };
-
-            AddBranchConfig(Config.DevelopBranchKey,
-                            new BranchConfig
-                            {
-                                Regex = Config.DevelopBranchRegex,
-                                SourceBranches = new HashSet<string>(),
-                                Tag = "alpha",
-                                Increment = IncrementStrategy.Minor,
-                                TrackMergeTarget = true,
-                                TracksReleaseBranches = true,
-                                PreReleaseWeight = 0,
-                            });
-
-            AddBranchConfig(Config.MainBranchKey,
-                            new BranchConfig
-                            {
-                                Regex = Config.MainBranchRegex,
-                                SourceBranches = new HashSet<string> { Config.DevelopBranchKey, Config.ReleaseBranchKey },
-                                Tag = string.Empty,
-                                PreventIncrementOfMergedBranchVersion = true,
-                                Increment = IncrementStrategy.Patch,
-                                IsMainline = true,
-                                PreReleaseWeight = 55000,
-                            });
-
-            AddBranchConfig(Config.ReleaseBranchKey,
-                            new BranchConfig
-                            {
-                                Regex = Config.ReleaseBranchRegex,
-                                SourceBranches = new HashSet<string> { Config.DevelopBranchKey, Config.MainBranchKey, Config.SupportBranchKey, Config.ReleaseBranchKey },
-                                Tag = "beta",
-                                PreventIncrementOfMergedBranchVersion = true,
-                                Increment = IncrementStrategy.None,
-                                IsReleaseBranch = true,
-                                PreReleaseWeight = 30000,
-                            });
-
-            AddBranchConfig(Config.FeatureBranchKey,
-                            new BranchConfig
-                            {
-                                Regex = Config.FeatureBranchRegex,
-                                SourceBranches = new HashSet<string> { Config.DevelopBranchKey, Config.MainBranchKey, Config.ReleaseBranchKey, Config.FeatureBranchKey, Config.SupportBranchKey, Config.HotfixBranchKey },
-                                Increment = IncrementStrategy.Inherit,
-                                PreReleaseWeight = 30000,
-                            });
-
-            AddBranchConfig(Config.PullRequestBranchKey,
-                            new BranchConfig
-                            {
-                                Regex = Config.PullRequestRegex,
-                                SourceBranches = new HashSet<string> { Config.DevelopBranchKey, Config.MainBranchKey, Config.ReleaseBranchKey, Config.FeatureBranchKey, Config.SupportBranchKey, Config.HotfixBranchKey },
-                                Tag = "PullRequest",
-                                TagNumberPattern = @"[/-](?<number>\d+)",
-                                Increment = IncrementStrategy.Inherit,
-                                PreReleaseWeight = 30000,
-                            });
-
-            AddBranchConfig(Config.HotfixBranchKey,
-                            new BranchConfig
-                            {
-                                Regex = Config.HotfixBranchRegex,
-                                SourceBranches = new HashSet<string> { Config.DevelopBranchKey, Config.MainBranchKey, Config.SupportBranchKey },
-                                Tag = "beta",
-                                Increment = IncrementStrategy.Patch,
-                                PreReleaseWeight = 30000,
-                            });
-
-            AddBranchConfig(Config.SupportBranchKey,
-                            new BranchConfig
-                            {
-                                Regex = Config.SupportBranchRegex,
-                                SourceBranches = new HashSet<string> { Config.MainBranchKey },
-                                Tag = string.Empty,
-                                PreventIncrementOfMergedBranchVersion = true,
-                                Increment = IncrementStrategy.Patch,
-                                IsMainline = true,
-                                PreReleaseWeight = 55000,
-                            });
-
-            return config;
-
-            void AddBranchConfig(string name, BranchConfig overrides)
+                Regex = Config.DevelopBranchRegex,
+                SourceBranches = new HashSet<string>(),
+                Tag = "alpha",
+                Increment = IncrementStrategy.Minor,
+                TrackMergeTarget = true,
+                TracksReleaseBranches = true,
+                PreReleaseWeight = 0,
+            });
+
+        AddBranchConfig(Config.MainBranchKey,
+            new BranchConfig
             {
-                config.Branches[name] = BranchConfig.CreateDefaultBranchConfig(name).Apply(overrides);
-            }
+                Regex = Config.MainBranchRegex,
+                SourceBranches = new HashSet<string> { Config.DevelopBranchKey, Config.ReleaseBranchKey },
+                Tag = string.Empty,
+                PreventIncrementOfMergedBranchVersion = true,
+                Increment = IncrementStrategy.Patch,
+                IsMainline = true,
+                PreReleaseWeight = 55000,
+            });
+
+        AddBranchConfig(Config.ReleaseBranchKey,
+            new BranchConfig
+            {
+                Regex = Config.ReleaseBranchRegex,
+                SourceBranches = new HashSet<string> { Config.DevelopBranchKey, Config.MainBranchKey, Config.SupportBranchKey, Config.ReleaseBranchKey },
+                Tag = "beta",
+                PreventIncrementOfMergedBranchVersion = true,
+                Increment = IncrementStrategy.None,
+                IsReleaseBranch = true,
+                PreReleaseWeight = 30000,
+            });
+
+        AddBranchConfig(Config.FeatureBranchKey,
+            new BranchConfig
+            {
+                Regex = Config.FeatureBranchRegex,
+                SourceBranches = new HashSet<string> { Config.DevelopBranchKey, Config.MainBranchKey, Config.ReleaseBranchKey, Config.FeatureBranchKey, Config.SupportBranchKey, Config.HotfixBranchKey },
+                Increment = IncrementStrategy.Inherit,
+                PreReleaseWeight = 30000,
+            });
+
+        AddBranchConfig(Config.PullRequestBranchKey,
+            new BranchConfig
+            {
+                Regex = Config.PullRequestRegex,
+                SourceBranches = new HashSet<string> { Config.DevelopBranchKey, Config.MainBranchKey, Config.ReleaseBranchKey, Config.FeatureBranchKey, Config.SupportBranchKey, Config.HotfixBranchKey },
+                Tag = "PullRequest",
+                TagNumberPattern = @"[/-](?<number>\d+)",
+                Increment = IncrementStrategy.Inherit,
+                PreReleaseWeight = 30000,
+            });
+
+        AddBranchConfig(Config.HotfixBranchKey,
+            new BranchConfig
+            {
+                Regex = Config.HotfixBranchRegex,
+                SourceBranches = new HashSet<string> { Config.DevelopBranchKey, Config.MainBranchKey, Config.SupportBranchKey },
+                Tag = "beta",
+                Increment = IncrementStrategy.Patch,
+                PreReleaseWeight = 30000,
+            });
+
+        AddBranchConfig(Config.SupportBranchKey,
+            new BranchConfig
+            {
+                Regex = Config.SupportBranchRegex,
+                SourceBranches = new HashSet<string> { Config.MainBranchKey },
+                Tag = string.Empty,
+                PreventIncrementOfMergedBranchVersion = true,
+                Increment = IncrementStrategy.Patch,
+                IsMainline = true,
+                PreReleaseWeight = 55000,
+            });
+
+        return config;
+
+        void AddBranchConfig(string name, BranchConfig overrides)
+        {
+            config.Branches[name] = BranchConfig.CreateDefaultBranchConfig(name).Apply(overrides);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/ConfigurationModule.cs b/src/GitVersion.Core/Configuration/ConfigurationModule.cs
index e1f83f2978..ce8448a555 100644
--- a/src/GitVersion.Core/Configuration/ConfigurationModule.cs
+++ b/src/GitVersion.Core/Configuration/ConfigurationModule.cs
@@ -2,17 +2,16 @@
 using GitVersion.Extensions;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GitVersion.Configuration
+namespace GitVersion.Configuration;
+
+public class ConfigurationModule : IGitVersionModule
 {
-    public class ConfigurationModule : IGitVersionModule
+    public void RegisterTypes(IServiceCollection services)
     {
-        public void RegisterTypes(IServiceCollection services)
-        {
-            services.AddModule(new GitVersionInitModule());
+        services.AddModule(new GitVersionInitModule());
 
-            services.AddSingleton<IConfigProvider, ConfigProvider>();
-            services.AddSingleton<IConfigFileLocator, ConfigFileLocator>();
-            services.AddSingleton<IBranchConfigurationCalculator, BranchConfigurationCalculator>();
-        }
+        services.AddSingleton<IConfigProvider, ConfigProvider>();
+        services.AddSingleton<IConfigFileLocator, ConfigFileLocator>();
+        services.AddSingleton<IBranchConfigurationCalculator, BranchConfigurationCalculator>();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/BuildServer/AppVeyorSetup.cs b/src/GitVersion.Core/Configuration/Init/BuildServer/AppVeyorSetup.cs
index 40b9aac869..b561cf52e7 100644
--- a/src/GitVersion.Core/Configuration/Init/BuildServer/AppVeyorSetup.cs
+++ b/src/GitVersion.Core/Configuration/Init/BuildServer/AppVeyorSetup.cs
@@ -6,56 +6,56 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.BuildServer
+namespace GitVersion.Configuration.Init.BuildServer;
+
+internal enum ProjectVisibility
 {
-    internal enum ProjectVisibility
+    Public = 0,
+    Private = 1
+}
+
+internal class AppVeyorSetup : ConfigInitWizardStep
+{
+    private ProjectVisibility projectVisibility;
+
+    public AppVeyorSetup(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        Public = 0,
-        Private = 1
     }
 
-    internal class AppVeyorSetup : ConfigInitWizardStep
+    public AppVeyorSetup WithData(ProjectVisibility visibility)
     {
-        private ProjectVisibility projectVisibility;
-
-        public AppVeyorSetup(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
-
-        public AppVeyorSetup WithData(ProjectVisibility visibility)
-        {
-            this.projectVisibility = visibility;
-            return this;
-        }
+        this.projectVisibility = visibility;
+        return this;
+    }
 
-        protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        var editConfigStep = this.StepFactory.CreateStep<EditConfigStep>()!;
+        switch (result)
         {
-            var editConfigStep = this.StepFactory.CreateStep<EditConfigStep>()!;
-            switch (result)
-            {
-                case "0":
-                    steps.Enqueue(editConfigStep);
-                    return StepResult.Ok();
-                case "1":
-                    GenerateBasicConfig(workingDirectory);
-                    steps.Enqueue(editConfigStep);
-                    return StepResult.Ok();
-                case "2":
-                    GenerateNuGetConfig(workingDirectory);
-                    steps.Enqueue(editConfigStep);
-                    return StepResult.Ok();
-            }
-            return StepResult.InvalidResponseSelected();
+            case "0":
+                steps.Enqueue(editConfigStep);
+                return StepResult.Ok();
+            case "1":
+                GenerateBasicConfig(workingDirectory);
+                steps.Enqueue(editConfigStep);
+                return StepResult.Ok();
+            case "2":
+                GenerateNuGetConfig(workingDirectory);
+                steps.Enqueue(editConfigStep);
+                return StepResult.Ok();
         }
+        return StepResult.InvalidResponseSelected();
+    }
 
-        private static string GetGvCommand(ProjectVisibility visibility) => visibility switch
-        {
-            ProjectVisibility.Public => "  - ps: gitversion /l console /output buildserver /updateAssemblyInfo",
-            ProjectVisibility.Private => "  - ps: gitversion $env:APPVEYOR_BUILD_FOLDER /l console /output buildserver /updateAssemblyInfo /nofetch /b $env:APPVEYOR_REPO_BRANCH",
-            _ => ""
-        };
+    private static string GetGvCommand(ProjectVisibility visibility) => visibility switch
+    {
+        ProjectVisibility.Public => "  - ps: gitversion /l console /output buildserver /updateAssemblyInfo",
+        ProjectVisibility.Private => "  - ps: gitversion $env:APPVEYOR_BUILD_FOLDER /l console /output buildserver /updateAssemblyInfo /nofetch /b $env:APPVEYOR_REPO_BRANCH",
+        _ => ""
+    };
 
-        private void GenerateBasicConfig(string workingDirectory) => WriteConfig(workingDirectory, this.FileSystem, $@"install:
+    private void GenerateBasicConfig(string workingDirectory) => WriteConfig(workingDirectory, this.FileSystem, $@"install:
   - choco install gitversion.portable -pre -y
 
 before_build:
@@ -65,7 +65,7 @@ private void GenerateBasicConfig(string workingDirectory) => WriteConfig(working
 build:
   project: <your sln file>");
 
-        private void GenerateNuGetConfig(string workingDirectory) => WriteConfig(workingDirectory, this.FileSystem, $@"install:
+    private void GenerateNuGetConfig(string workingDirectory) => WriteConfig(workingDirectory, this.FileSystem, $@"install:
   - choco install gitversion.portable -pre -y
 
 assembly_info:
@@ -83,55 +83,54 @@ private void GenerateNuGetConfig(string workingDirectory) => WriteConfig(working
   - cmd: nuget pack <Project>\<NuSpec>.nuspec -version ""%GitVersion_NuGetVersion%"" -prop ""target=%CONFIGURATION%""
   - cmd: appveyor PushArtifact ""<NuSpec>.%GitVersion_NuGetVersion%.nupkg""");
 
-        private void WriteConfig(string workingDirectory, IFileSystem fileSystem, string configContents)
-        {
-            var outputFilename = GetOutputFilename(workingDirectory, fileSystem);
-            fileSystem.WriteAllText(outputFilename, configContents);
-            this.Log.Info($"AppVeyor sample config file written to {outputFilename}");
-        }
+    private void WriteConfig(string workingDirectory, IFileSystem fileSystem, string configContents)
+    {
+        var outputFilename = GetOutputFilename(workingDirectory, fileSystem);
+        fileSystem.WriteAllText(outputFilename, configContents);
+        this.Log.Info($"AppVeyor sample config file written to {outputFilename}");
+    }
 
-        protected override string GetPrompt(Config config, string workingDirectory)
+    protected override string GetPrompt(Config config, string workingDirectory)
+    {
+        var prompt = new StringBuilder();
+        if (AppVeyorConfigExists(workingDirectory, this.FileSystem))
         {
-            var prompt = new StringBuilder();
-            if (AppVeyorConfigExists(workingDirectory, this.FileSystem))
-            {
-                prompt.AppendLine("GitVersion doesn't support modifying existing appveyor config files. We will generate appveyor.gitversion.yml instead");
-                prompt.AppendLine();
-            }
+            prompt.AppendLine("GitVersion doesn't support modifying existing appveyor config files. We will generate appveyor.gitversion.yml instead");
+            prompt.AppendLine();
+        }
 
-            prompt.Append(@"What sort of config template would you like generated?
+        prompt.Append(@"What sort of config template would you like generated?
 
 0) Go Back
 1) Generate basic (gitversion + msbuild) configuration
 2) Generate with NuGet package publish");
 
-            return prompt.ToString();
-        }
+        return prompt.ToString();
+    }
 
-        private static string GetOutputFilename(string workingDirectory, IFileSystem fileSystem)
+    private static string GetOutputFilename(string workingDirectory, IFileSystem fileSystem)
+    {
+        if (AppVeyorConfigExists(workingDirectory, fileSystem))
         {
-            if (AppVeyorConfigExists(workingDirectory, fileSystem))
+            var count = 0;
+            do
             {
-                var count = 0;
-                do
-                {
-                    var path = Path.Combine(workingDirectory, $"appveyor.gitversion{(count == 0 ? string.Empty : "." + count)}.yml");
+                var path = Path.Combine(workingDirectory, $"appveyor.gitversion{(count == 0 ? string.Empty : "." + count)}.yml");
 
-                    if (!fileSystem.Exists(path))
-                    {
-                        return path;
-                    }
-
-                    count++;
-                } while (count < 10);
-                throw new Exception("appveyor.gitversion.yml -> appveyor.gitversion.9.yml all exist. Pretty sure you have enough templates");
-            }
+                if (!fileSystem.Exists(path))
+                {
+                    return path;
+                }
 
-            return Path.Combine(workingDirectory, "appveyor.yml");
+                count++;
+            } while (count < 10);
+            throw new Exception("appveyor.gitversion.yml -> appveyor.gitversion.9.yml all exist. Pretty sure you have enough templates");
         }
 
-        private static bool AppVeyorConfigExists(string workingDirectory, IFileSystem fileSystem) => fileSystem.Exists(Path.Combine(workingDirectory, "appveyor.yml"));
-
-        protected override string DefaultResult => "0";
+        return Path.Combine(workingDirectory, "appveyor.yml");
     }
-}
+
+    private static bool AppVeyorConfigExists(string workingDirectory, IFileSystem fileSystem) => fileSystem.Exists(Path.Combine(workingDirectory, "appveyor.yml"));
+
+    protected override string DefaultResult => "0";
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/BuildServer/AppveyorPublicPrivate.cs b/src/GitVersion.Core/Configuration/Init/BuildServer/AppveyorPublicPrivate.cs
index 108bff8641..53c37a29bd 100644
--- a/src/GitVersion.Core/Configuration/Init/BuildServer/AppveyorPublicPrivate.cs
+++ b/src/GitVersion.Core/Configuration/Init/BuildServer/AppveyorPublicPrivate.cs
@@ -3,32 +3,32 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.BuildServer
+namespace GitVersion.Configuration.Init.BuildServer;
+
+internal class AppveyorPublicPrivate : ConfigInitWizardStep
 {
-    internal class AppveyorPublicPrivate : ConfigInitWizardStep
+    public AppveyorPublicPrivate(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        public AppveyorPublicPrivate(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
+    }
 
-        protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        switch (result)
         {
-            switch (result)
-            {
-                case "0":
-                    steps.Enqueue(this.StepFactory.CreateStep<EditConfigStep>()!);
-                    return StepResult.Ok();
-                case "1":
-                    steps.Enqueue(this.StepFactory.CreateStep<AppVeyorSetup>()!.WithData(ProjectVisibility.Public));
-                    return StepResult.Ok();
-                case "2":
-                    steps.Enqueue(this.StepFactory.CreateStep<AppVeyorSetup>()!.WithData(ProjectVisibility.Private));
-                    return StepResult.Ok();
-            }
-            return StepResult.Ok();
+            case "0":
+                steps.Enqueue(this.StepFactory.CreateStep<EditConfigStep>()!);
+                return StepResult.Ok();
+            case "1":
+                steps.Enqueue(this.StepFactory.CreateStep<AppVeyorSetup>()!.WithData(ProjectVisibility.Public));
+                return StepResult.Ok();
+            case "2":
+                steps.Enqueue(this.StepFactory.CreateStep<AppVeyorSetup>()!.WithData(ProjectVisibility.Private));
+                return StepResult.Ok();
         }
+        return StepResult.Ok();
+    }
 
-        protected override string GetPrompt(Config config, string workingDirectory) => @"Is your project public or private?
+    protected override string GetPrompt(Config config, string workingDirectory) => @"Is your project public or private?
 
 That is ... does it require authentication to clone/pull?
 
@@ -36,6 +36,5 @@ That is ... does it require authentication to clone/pull?
 1) Public
 2) Private";
 
-        protected override string DefaultResult => "0";
-    }
-}
+    protected override string DefaultResult => "0";
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/BuildServer/SetupBuildScripts.cs b/src/GitVersion.Core/Configuration/Init/BuildServer/SetupBuildScripts.cs
index 6f8db2a1f2..1e407870f6 100644
--- a/src/GitVersion.Core/Configuration/Init/BuildServer/SetupBuildScripts.cs
+++ b/src/GitVersion.Core/Configuration/Init/BuildServer/SetupBuildScripts.cs
@@ -3,35 +3,34 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.BuildServer
+namespace GitVersion.Configuration.Init.BuildServer;
+
+internal class SetupBuildScripts : ConfigInitWizardStep
 {
-    internal class SetupBuildScripts : ConfigInitWizardStep
+    public SetupBuildScripts(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        public SetupBuildScripts(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
+    }
 
-        protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        switch (result)
         {
-            switch (result)
-            {
-                case "0":
-                    steps.Enqueue(this.StepFactory.CreateStep<EditConfigStep>()!);
-                    return StepResult.Ok();
-                case "1":
-                    steps.Enqueue(this.StepFactory.CreateStep<AppveyorPublicPrivate>()!);
-                    return StepResult.Ok();
-            }
-            return StepResult.Ok();
+            case "0":
+                steps.Enqueue(this.StepFactory.CreateStep<EditConfigStep>()!);
+                return StepResult.Ok();
+            case "1":
+                steps.Enqueue(this.StepFactory.CreateStep<AppveyorPublicPrivate>()!);
+                return StepResult.Ok();
         }
+        return StepResult.Ok();
+    }
 
-        protected override string GetPrompt(Config config, string workingDirectory) => @"What build server are you using?
+    protected override string GetPrompt(Config config, string workingDirectory) => @"What build server are you using?
 
 Want to see more? Contribute a pull request!
 
 0) Go Back
 1) AppVeyor";
 
-        protected override string DefaultResult => "0";
-    }
-}
+    protected override string DefaultResult => "0";
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/EditConfigStep.cs b/src/GitVersion.Core/Configuration/Init/EditConfigStep.cs
index f7ac50d880..d1873b3d96 100644
--- a/src/GitVersion.Core/Configuration/Init/EditConfigStep.cs
+++ b/src/GitVersion.Core/Configuration/Init/EditConfigStep.cs
@@ -5,49 +5,49 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init
+namespace GitVersion.Configuration.Init;
+
+public class EditConfigStep : ConfigInitWizardStep
 {
-    public class EditConfigStep : ConfigInitWizardStep
+    public EditConfigStep(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        public EditConfigStep(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
+    }
 
-        protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        switch (result)
         {
-            switch (result)
-            {
-                case "0":
-                    return StepResult.SaveAndExit();
-                case "1":
-                    return StepResult.ExitWithoutSaving();
+            case "0":
+                return StepResult.SaveAndExit();
+            case "1":
+                return StepResult.ExitWithoutSaving();
 
-                case "2":
-                    steps.Enqueue(this.StepFactory.CreateStep<PickBranchingStrategyStep>()!);
-                    return StepResult.Ok();
+            case "2":
+                steps.Enqueue(this.StepFactory.CreateStep<PickBranchingStrategyStep>()!);
+                return StepResult.Ok();
 
-                case "3":
-                    steps.Enqueue(this.StepFactory.CreateStep<SetNextVersion>()!);
-                    return StepResult.Ok();
+            case "3":
+                steps.Enqueue(this.StepFactory.CreateStep<SetNextVersion>()!);
+                return StepResult.Ok();
 
-                case "4":
-                    steps.Enqueue(this.StepFactory.CreateStep<ConfigureBranches>()!);
-                    return StepResult.Ok();
-                case "5":
-                    var editConfigStep = this.StepFactory.CreateStep<EditConfigStep>();
-                    steps.Enqueue(this.StepFactory.CreateStep<GlobalModeSetting>()!.WithData(editConfigStep!, false));
-                    return StepResult.Ok();
-                case "6":
-                    steps.Enqueue(this.StepFactory.CreateStep<AssemblyVersioningSchemeSetting>()!);
-                    return StepResult.Ok();
-                case "7":
-                    steps.Enqueue(this.StepFactory.CreateStep<SetupBuildScripts>()!);
-                    return StepResult.Ok();
-            }
-            return StepResult.InvalidResponseSelected();
+            case "4":
+                steps.Enqueue(this.StepFactory.CreateStep<ConfigureBranches>()!);
+                return StepResult.Ok();
+            case "5":
+                var editConfigStep = this.StepFactory.CreateStep<EditConfigStep>();
+                steps.Enqueue(this.StepFactory.CreateStep<GlobalModeSetting>()!.WithData(editConfigStep!, false));
+                return StepResult.Ok();
+            case "6":
+                steps.Enqueue(this.StepFactory.CreateStep<AssemblyVersioningSchemeSetting>()!);
+                return StepResult.Ok();
+            case "7":
+                steps.Enqueue(this.StepFactory.CreateStep<SetupBuildScripts>()!);
+                return StepResult.Ok();
         }
+        return StepResult.InvalidResponseSelected();
+    }
 
-        protected override string GetPrompt(Config config, string workingDirectory) => $@"Which would you like to change?
+    protected override string GetPrompt(Config config, string workingDirectory) => $@"Which would you like to change?
 
 0) Save changes and exit
 1) Exit without saving
@@ -60,6 +60,5 @@ protected override string GetPrompt(Config config, string workingDirectory) => $
 6) Assembly versioning scheme (Current: {config.AssemblyVersioningScheme})
 7) Setup build scripts";
 
-        protected override string? DefaultResult => null;
-    }
-}
+    protected override string? DefaultResult => null;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/GitVersionInitModule.cs b/src/GitVersion.Core/Configuration/Init/GitVersionInitModule.cs
index 4b8e2f902d..b47fc45a2c 100644
--- a/src/GitVersion.Core/Configuration/Init/GitVersionInitModule.cs
+++ b/src/GitVersion.Core/Configuration/Init/GitVersionInitModule.cs
@@ -2,21 +2,20 @@
 using GitVersion.Configuration.Init.Wizard;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GitVersion.Configuration.Init
+namespace GitVersion.Configuration.Init;
+
+public class GitVersionInitModule : GitVersionModule
 {
-    public class GitVersionInitModule : GitVersionModule
+    public override void RegisterTypes(IServiceCollection services)
     {
-        public override void RegisterTypes(IServiceCollection services)
-        {
-            services.AddTransient<IConfigInitWizard, ConfigInitWizard>();
-            services.AddTransient<IConfigInitStepFactory, ConfigInitStepFactory>();
+        services.AddTransient<IConfigInitWizard, ConfigInitWizard>();
+        services.AddTransient<IConfigInitStepFactory, ConfigInitStepFactory>();
 
-            var steps = FindAllDerivedTypes<ConfigInitWizardStep>(Assembly.GetAssembly(GetType()));
+        var steps = FindAllDerivedTypes<ConfigInitWizardStep>(Assembly.GetAssembly(GetType()));
 
-            foreach (var step in steps)
-            {
-                services.AddTransient(step);
-            }
+        foreach (var step in steps)
+        {
+            services.AddTransient(step);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/SetConfig/AssemblyVersioningSchemeSetting.cs b/src/GitVersion.Core/Configuration/Init/SetConfig/AssemblyVersioningSchemeSetting.cs
index d9177e15c0..346a967a5e 100644
--- a/src/GitVersion.Core/Configuration/Init/SetConfig/AssemblyVersioningSchemeSetting.cs
+++ b/src/GitVersion.Core/Configuration/Init/SetConfig/AssemblyVersioningSchemeSetting.cs
@@ -4,48 +4,48 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.SetConfig
+namespace GitVersion.Configuration.Init.SetConfig;
+
+public class AssemblyVersioningSchemeSetting : ConfigInitWizardStep
 {
-    public class AssemblyVersioningSchemeSetting : ConfigInitWizardStep
+    public AssemblyVersioningSchemeSetting(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        public AssemblyVersioningSchemeSetting(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
+    }
 
-        protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        var editConfigStep = this.StepFactory.CreateStep<EditConfigStep>()!;
+        switch (result)
         {
-            var editConfigStep = this.StepFactory.CreateStep<EditConfigStep>()!;
-            switch (result)
-            {
-                case "0":
-                    steps.Enqueue(editConfigStep);
-                    return StepResult.Ok();
-                case "1":
-                    config.AssemblyVersioningScheme = AssemblyVersioningScheme.Major;
-                    steps.Enqueue(editConfigStep);
-                    return StepResult.Ok();
-                case "2":
-                    config.AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinor;
-                    steps.Enqueue(editConfigStep);
-                    return StepResult.Ok();
-                case "3":
-                    config.AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch;
-                    steps.Enqueue(editConfigStep);
-                    return StepResult.Ok();
-                case "4":
-                    config.AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag;
-                    steps.Enqueue(editConfigStep);
-                    return StepResult.Ok();
-                case "5":
-                    config.AssemblyVersioningScheme = AssemblyVersioningScheme.None;
-                    steps.Enqueue(editConfigStep);
-                    return StepResult.Ok();
-            }
-
-            return StepResult.InvalidResponseSelected();
+            case "0":
+                steps.Enqueue(editConfigStep);
+                return StepResult.Ok();
+            case "1":
+                config.AssemblyVersioningScheme = AssemblyVersioningScheme.Major;
+                steps.Enqueue(editConfigStep);
+                return StepResult.Ok();
+            case "2":
+                config.AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinor;
+                steps.Enqueue(editConfigStep);
+                return StepResult.Ok();
+            case "3":
+                config.AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch;
+                steps.Enqueue(editConfigStep);
+                return StepResult.Ok();
+            case "4":
+                config.AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag;
+                steps.Enqueue(editConfigStep);
+                return StepResult.Ok();
+            case "5":
+                config.AssemblyVersioningScheme = AssemblyVersioningScheme.None;
+                steps.Enqueue(editConfigStep);
+                return StepResult.Ok();
         }
 
-        protected override string GetPrompt(Config config, string workingDirectory) => @"What assembly versioning scheme do you want to use:
+        return StepResult.InvalidResponseSelected();
+    }
+
+    protected override string GetPrompt(Config config, string workingDirectory) => @"What assembly versioning scheme do you want to use:
 
 0) Go Back
 1) Major.0.0.0
@@ -54,6 +54,5 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
 4) Major.Minor.Patch.TagCount (Allows different pre-release tags to cause assembly version to change)
 5) None (skip's updating AssemblyVersion)";
 
-        protected override string DefaultResult => "0";
-    }
-}
+    protected override string DefaultResult => "0";
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranch.cs b/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranch.cs
index 21231b72c2..1ee9e75537 100644
--- a/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranch.cs
+++ b/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranch.cs
@@ -3,48 +3,47 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.SetConfig
+namespace GitVersion.Configuration.Init.SetConfig;
+
+public class ConfigureBranch : ConfigInitWizardStep
 {
-    public class ConfigureBranch : ConfigInitWizardStep
+    private string? name;
+    private BranchConfig? branchConfig;
+
+    public ConfigureBranch(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        private string? name;
-        private BranchConfig? branchConfig;
+    }
 
-        public ConfigureBranch(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
+    public ConfigureBranch WithData(string? name, BranchConfig? branchConfig)
+    {
+        this.branchConfig = branchConfig;
+        this.name = name;
+        return this;
+    }
 
-        public ConfigureBranch WithData(string? name, BranchConfig? branchConfig)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        switch (result)
         {
-            this.branchConfig = branchConfig;
-            this.name = name;
-            return this;
+            case "0":
+                steps.Enqueue(this.StepFactory.CreateStep<ConfigureBranches>()!);
+                return StepResult.Ok();
+            case "1":
+                steps.Enqueue(this.StepFactory.CreateStep<SetBranchTag>()!.WithData(name, branchConfig));
+                return StepResult.Ok();
+            case "2":
+                steps.Enqueue(this.StepFactory.CreateStep<SetBranchIncrementMode>()!.WithData(name!, branchConfig!));
+                return StepResult.Ok();
         }
 
-        protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
-        {
-            switch (result)
-            {
-                case "0":
-                    steps.Enqueue(this.StepFactory.CreateStep<ConfigureBranches>()!);
-                    return StepResult.Ok();
-                case "1":
-                    steps.Enqueue(this.StepFactory.CreateStep<SetBranchTag>()!.WithData(name, branchConfig));
-                    return StepResult.Ok();
-                case "2":
-                    steps.Enqueue(this.StepFactory.CreateStep<SetBranchIncrementMode>()!.WithData(name!, branchConfig!));
-                    return StepResult.Ok();
-            }
-
-            return StepResult.InvalidResponseSelected();
-        }
+        return StepResult.InvalidResponseSelected();
+    }
 
-        protected override string GetPrompt(Config config, string workingDirectory) => $@"What would you like to change for '{this.name}':
+    protected override string GetPrompt(Config config, string workingDirectory) => $@"What would you like to change for '{this.name}':
 
 0) Go Back
 1) Branch Pre-release tag (Current: {this.branchConfig!.Tag})
 2) Branch Increment mode (per commit/after tag) (Current: {this.branchConfig.VersioningMode})";
 
-        protected override string DefaultResult => "0";
-    }
-}
+    protected override string DefaultResult => "0";
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranches.cs b/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranches.cs
index 653fcc02b2..fc1114defe 100644
--- a/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranches.cs
+++ b/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranches.cs
@@ -5,59 +5,58 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.SetConfig
+namespace GitVersion.Configuration.Init.SetConfig;
+
+public class ConfigureBranches : ConfigInitWizardStep
 {
-    public class ConfigureBranches : ConfigInitWizardStep
+    public ConfigureBranches(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        public ConfigureBranches(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
+    }
 
-        protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        if (int.TryParse(result, out var parsed))
         {
-            if (int.TryParse(result, out var parsed))
+            if (parsed == 0)
             {
-                if (parsed == 0)
-                {
-                    steps.Enqueue(this.StepFactory.CreateStep<EditConfigStep>()!);
-                    return StepResult.Ok();
-                }
+                steps.Enqueue(this.StepFactory.CreateStep<EditConfigStep>()!);
+                return StepResult.Ok();
+            }
 
-                try
+            try
+            {
+                var foundBranch = OrderedBranches(config).ElementAt(parsed - 1);
+                var branchConfig = foundBranch.Value;
+                if (branchConfig == null)
                 {
-                    var foundBranch = OrderedBranches(config).ElementAt(parsed - 1);
-                    var branchConfig = foundBranch.Value;
-                    if (branchConfig == null)
-                    {
-                        branchConfig = new BranchConfig { Name = foundBranch.Key };
-                        config.Branches.Add(foundBranch.Key, branchConfig);
-                    }
-                    steps.Enqueue(this.StepFactory.CreateStep<ConfigureBranch>()!.WithData(foundBranch.Key, branchConfig));
-                    return StepResult.Ok();
+                    branchConfig = new BranchConfig { Name = foundBranch.Key };
+                    config.Branches.Add(foundBranch.Key, branchConfig);
                 }
-                catch (ArgumentOutOfRangeException)
-                { }
+                steps.Enqueue(this.StepFactory.CreateStep<ConfigureBranch>()!.WithData(foundBranch.Key, branchConfig));
+                return StepResult.Ok();
             }
-
-            return StepResult.InvalidResponseSelected();
+            catch (ArgumentOutOfRangeException)
+            { }
         }
 
-        protected override string GetPrompt(Config config, string workingDirectory) => @"Which branch would you like to configure:
+        return StepResult.InvalidResponseSelected();
+    }
+
+    protected override string GetPrompt(Config config, string workingDirectory) => @"Which branch would you like to configure:
 
 0) Go Back
 " + string.Join(System.Environment.NewLine, OrderedBranches(config).Select((c, i) => $"{i + 1}) {c.Key}"));
 
-        private static IOrderedEnumerable<KeyValuePair<string, BranchConfig?>> OrderedBranches(Config config)
-        {
-            var defaultConfig = new ConfigurationBuilder().Build();
-
-            var defaultConfigurationBranches = defaultConfig.Branches
-                .Where(k => !config.Branches.ContainsKey(k.Key))
-                // Return an empty branch config
-                .Select(v => new KeyValuePair<string, BranchConfig?>(v.Key, null));
-            return config.Branches.Union(defaultConfigurationBranches).OrderBy(b => b.Key);
-        }
+    private static IOrderedEnumerable<KeyValuePair<string, BranchConfig?>> OrderedBranches(Config config)
+    {
+        var defaultConfig = new ConfigurationBuilder().Build();
 
-        protected override string DefaultResult => "0";
+        var defaultConfigurationBranches = defaultConfig.Branches
+            .Where(k => !config.Branches.ContainsKey(k.Key))
+            // Return an empty branch config
+            .Select(v => new KeyValuePair<string, BranchConfig?>(v.Key, null));
+        return config.Branches.Union(defaultConfigurationBranches).OrderBy(b => b.Key);
     }
-}
+
+    protected override string DefaultResult => "0";
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/SetConfig/GlobalModeSetting.cs b/src/GitVersion.Core/Configuration/Init/SetConfig/GlobalModeSetting.cs
index 7d4045e646..6c05d48134 100644
--- a/src/GitVersion.Core/Configuration/Init/SetConfig/GlobalModeSetting.cs
+++ b/src/GitVersion.Core/Configuration/Init/SetConfig/GlobalModeSetting.cs
@@ -4,56 +4,55 @@
 using GitVersion.Model.Configuration;
 using GitVersion.VersionCalculation;
 
-namespace GitVersion.Configuration.Init.SetConfig
+namespace GitVersion.Configuration.Init.SetConfig;
+
+public class GlobalModeSetting : ConfigInitWizardStep
 {
-    public class GlobalModeSetting : ConfigInitWizardStep
+    private ConfigInitWizardStep? returnToStep;
+    private bool isPartOfWizard;
+
+    public GlobalModeSetting(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        private ConfigInitWizardStep? returnToStep;
-        private bool isPartOfWizard;
+    }
 
-        public GlobalModeSetting(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
+    public GlobalModeSetting WithData(ConfigInitWizardStep returnToStep, bool isPartOfWizard)
+    {
+        this.returnToStep = returnToStep;
+        this.isPartOfWizard = isPartOfWizard;
+        return this;
+    }
 
-        public GlobalModeSetting WithData(ConfigInitWizardStep returnToStep, bool isPartOfWizard)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        switch (result)
         {
-            this.returnToStep = returnToStep;
-            this.isPartOfWizard = isPartOfWizard;
-            return this;
+            case "1":
+                config.VersioningMode = VersioningMode.ContinuousDelivery;
+                steps.Enqueue(this.returnToStep!);
+                return StepResult.Ok();
+            case "2":
+                config.VersioningMode = VersioningMode.ContinuousDeployment;
+                steps.Enqueue(this.returnToStep!);
+                return StepResult.Ok();
+            case "3":
+                config.VersioningMode = VersioningMode.Mainline;
+                steps.Enqueue(this.returnToStep!);
+                return StepResult.Ok();
+            case "0":
+            case "4":
+                steps.Enqueue(this.returnToStep!);
+                return StepResult.Ok();
         }
 
-        protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
-        {
-            switch (result)
-            {
-                case "1":
-                    config.VersioningMode = VersioningMode.ContinuousDelivery;
-                    steps.Enqueue(this.returnToStep!);
-                    return StepResult.Ok();
-                case "2":
-                    config.VersioningMode = VersioningMode.ContinuousDeployment;
-                    steps.Enqueue(this.returnToStep!);
-                    return StepResult.Ok();
-                case "3":
-                    config.VersioningMode = VersioningMode.Mainline;
-                    steps.Enqueue(this.returnToStep!);
-                    return StepResult.Ok();
-                case "0":
-                case "4":
-                    steps.Enqueue(this.returnToStep!);
-                    return StepResult.Ok();
-            }
-
-            return StepResult.InvalidResponseSelected();
-        }
+        return StepResult.InvalidResponseSelected();
+    }
 
-        protected override string GetPrompt(Config config, string workingDirectory) => $@"What do you want the default increment mode to be (can be overriden per branch):
+    protected override string GetPrompt(Config config, string workingDirectory) => $@"What do you want the default increment mode to be (can be overriden per branch):
 {(!this.isPartOfWizard ? "0) Go Back" : string.Empty)}
 1) Follow SemVer and only increment when a release has been tagged (continuous delivery mode)
 2) Increment based on branch config every commit (continuous deployment mode)
 3) Each merged branch against main will increment the version (mainline mode)
 {(this.isPartOfWizard ? "4) Skip" : string.Empty)}";
 
-        protected override string DefaultResult => "4";
-    }
-}
+    protected override string DefaultResult => "4";
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchIncrementMode.cs b/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchIncrementMode.cs
index aaa82dfe98..b4cd66c3ee 100644
--- a/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchIncrementMode.cs
+++ b/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchIncrementMode.cs
@@ -4,51 +4,50 @@
 using GitVersion.Model.Configuration;
 using GitVersion.VersionCalculation;
 
-namespace GitVersion.Configuration.Init.SetConfig
+namespace GitVersion.Configuration.Init.SetConfig;
+
+public class SetBranchIncrementMode : ConfigInitWizardStep
 {
-    public class SetBranchIncrementMode : ConfigInitWizardStep
+    private string? name;
+    private BranchConfig? branchConfig;
+
+    public SetBranchIncrementMode(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        private string? name;
-        private BranchConfig? branchConfig;
+    }
 
-        public SetBranchIncrementMode(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
+    public SetBranchIncrementMode WithData(string name, BranchConfig branchConfig)
+    {
+        this.branchConfig = branchConfig;
+        this.name = name;
+        return this;
+    }
 
-        public SetBranchIncrementMode WithData(string name, BranchConfig branchConfig)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        var configureBranchStep = this.StepFactory.CreateStep<ConfigureBranch>()!;
+        switch (result)
         {
-            this.branchConfig = branchConfig;
-            this.name = name;
-            return this;
+            case "0":
+                steps.Enqueue(configureBranchStep.WithData(this.name, this.branchConfig));
+                return StepResult.Ok();
+            case "1":
+                this.branchConfig!.VersioningMode = VersioningMode.ContinuousDelivery;
+                steps.Enqueue(configureBranchStep.WithData(name, this.branchConfig));
+                return StepResult.Ok();
+            case "2":
+                this.branchConfig!.VersioningMode = VersioningMode.ContinuousDeployment;
+                steps.Enqueue(configureBranchStep.WithData(name, this.branchConfig));
+                return StepResult.Ok();
         }
 
-        protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
-        {
-            var configureBranchStep = this.StepFactory.CreateStep<ConfigureBranch>()!;
-            switch (result)
-            {
-                case "0":
-                    steps.Enqueue(configureBranchStep.WithData(this.name, this.branchConfig));
-                    return StepResult.Ok();
-                case "1":
-                    this.branchConfig!.VersioningMode = VersioningMode.ContinuousDelivery;
-                    steps.Enqueue(configureBranchStep.WithData(name, this.branchConfig));
-                    return StepResult.Ok();
-                case "2":
-                    this.branchConfig!.VersioningMode = VersioningMode.ContinuousDeployment;
-                    steps.Enqueue(configureBranchStep.WithData(name, this.branchConfig));
-                    return StepResult.Ok();
-            }
-
-            return StepResult.InvalidResponseSelected();
-        }
+        return StepResult.InvalidResponseSelected();
+    }
 
-        protected override string GetPrompt(Config config, string workingDirectory) => $@"What do you want the increment mode for {this.name} to be?
+    protected override string GetPrompt(Config config, string workingDirectory) => $@"What do you want the increment mode for {this.name} to be?
 
 0) Go Back
 1) Follow SemVer and only increment when a release has been tagged (continuous delivery mode)
 2) Increment based on branch config every commit (continuous deployment mode)";
 
-        protected override string DefaultResult => "0";
-    }
-}
+    protected override string DefaultResult => "0";
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchTag.cs b/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchTag.cs
index 1f6b71fb53..e67120ce47 100644
--- a/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchTag.cs
+++ b/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchTag.cs
@@ -4,55 +4,54 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.SetConfig
+namespace GitVersion.Configuration.Init.SetConfig;
+
+public class SetBranchTag : ConfigInitWizardStep
 {
-    public class SetBranchTag : ConfigInitWizardStep
+    private string? name;
+    private BranchConfig? branchConfig;
+
+    public SetBranchTag(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        private string? name;
-        private BranchConfig? branchConfig;
+    }
 
-        public SetBranchTag(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
+    public SetBranchTag WithData(string? name, BranchConfig? branchConfig)
+    {
+        this.branchConfig = branchConfig;
+        this.name = name;
+        return this;
+    }
 
-        public SetBranchTag WithData(string? name, BranchConfig? branchConfig)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        if (result.IsNullOrWhiteSpace())
         {
-            this.branchConfig = branchConfig;
-            this.name = name;
-            return this;
+            return StepResult.InvalidResponseSelected();
         }
 
-        protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+        var configureBranchStep = this.StepFactory.CreateStep<ConfigureBranch>()!;
+        switch (result)
         {
-            if (result.IsNullOrWhiteSpace())
-            {
-                return StepResult.InvalidResponseSelected();
-            }
-
-            var configureBranchStep = this.StepFactory.CreateStep<ConfigureBranch>()!;
-            switch (result)
-            {
-                case "0":
-                    steps.Enqueue(configureBranchStep.WithData(this.name, this.branchConfig));
-                    return StepResult.Ok();
-                case "1":
-                    this.branchConfig!.Tag = string.Empty;
-                    steps.Enqueue(configureBranchStep.WithData(name, this.branchConfig));
-                    return StepResult.Ok();
-                default:
-                    this.branchConfig!.Tag = result;
-                    steps.Enqueue(configureBranchStep.WithData(name, this.branchConfig));
-                    return StepResult.Ok();
-            }
+            case "0":
+                steps.Enqueue(configureBranchStep.WithData(this.name, this.branchConfig));
+                return StepResult.Ok();
+            case "1":
+                this.branchConfig!.Tag = string.Empty;
+                steps.Enqueue(configureBranchStep.WithData(name, this.branchConfig));
+                return StepResult.Ok();
+            default:
+                this.branchConfig!.Tag = result;
+                steps.Enqueue(configureBranchStep.WithData(name, this.branchConfig));
+                return StepResult.Ok();
         }
+    }
 
-        protected override string GetPrompt(Config config, string workingDirectory) => @"This sets the pre-release tag which will be used for versions on this branch (beta, rc etc)
+    protected override string GetPrompt(Config config, string workingDirectory) => @"This sets the pre-release tag which will be used for versions on this branch (beta, rc etc)
 
 0) Go Back
 1) No tag
 
 Anything else will be used as the tag";
 
-        protected override string DefaultResult => "0";
-    }
-}
+    protected override string DefaultResult => "0";
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/SetNextVersion.cs b/src/GitVersion.Core/Configuration/Init/SetNextVersion.cs
index f19d5b7db5..dd515bc16d 100644
--- a/src/GitVersion.Core/Configuration/Init/SetNextVersion.cs
+++ b/src/GitVersion.Core/Configuration/Init/SetNextVersion.cs
@@ -4,33 +4,32 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init
+namespace GitVersion.Configuration.Init;
+
+public class SetNextVersion : ConfigInitWizardStep
 {
-    public class SetNextVersion : ConfigInitWizardStep
+    public SetNextVersion(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        public SetNextVersion(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
+    }
 
-        protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        var editConfigStep = this.StepFactory.CreateStep<EditConfigStep>()!;
+        if (result.IsNullOrEmpty())
         {
-            var editConfigStep = this.StepFactory.CreateStep<EditConfigStep>()!;
-            if (result.IsNullOrEmpty())
-            {
-                steps.Enqueue(editConfigStep);
-                return StepResult.Ok();
-            }
-
-            if (!SemanticVersion.TryParse(result, string.Empty, out var semVer))
-                return StepResult.InvalidResponseSelected();
-
-            config.NextVersion = semVer.ToString("t");
             steps.Enqueue(editConfigStep);
             return StepResult.Ok();
         }
 
-        protected override string GetPrompt(Config config, string workingDirectory) => @"What would you like to set the next version to (enter nothing to cancel)?";
+        if (!SemanticVersion.TryParse(result, string.Empty, out var semVer))
+            return StepResult.InvalidResponseSelected();
 
-        protected override string? DefaultResult => null;
+        config.NextVersion = semVer.ToString("t");
+        steps.Enqueue(editConfigStep);
+        return StepResult.Ok();
     }
-}
+
+    protected override string GetPrompt(Config config, string workingDirectory) => @"What would you like to set the next version to (enter nothing to cancel)?";
+
+    protected override string? DefaultResult => null;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/StepResult.cs b/src/GitVersion.Core/Configuration/Init/StepResult.cs
index 3a80c13911..e7c6c86a95 100644
--- a/src/GitVersion.Core/Configuration/Init/StepResult.cs
+++ b/src/GitVersion.Core/Configuration/Init/StepResult.cs
@@ -1,32 +1,31 @@
-namespace GitVersion.Configuration.Init
+namespace GitVersion.Configuration.Init;
+
+public class StepResult
 {
-    public class StepResult
-    {
-        private StepResult() { }
+    private StepResult() { }
 
-        public static StepResult Ok() => new();
+    public static StepResult Ok() => new();
 
-        public static StepResult InvalidResponseSelected() => new()
-        {
-            InvalidResponse = true
-        };
+    public static StepResult InvalidResponseSelected() => new()
+    {
+        InvalidResponse = true
+    };
 
-        public static StepResult SaveAndExit() => new()
-        {
-            Save = true,
-            Exit = true
-        };
+    public static StepResult SaveAndExit() => new()
+    {
+        Save = true,
+        Exit = true
+    };
 
-        public static StepResult ExitWithoutSaving() => new()
-        {
-            Save = false,
-            Exit = true
-        };
+    public static StepResult ExitWithoutSaving() => new()
+    {
+        Save = false,
+        Exit = true
+    };
 
-        public bool Exit { get; private set; }
+    public bool Exit { get; private set; }
 
-        public bool Save { get; private set; }
+    public bool Save { get; private set; }
 
-        public bool InvalidResponse { get; private set; }
-    }
-}
+    public bool InvalidResponse { get; private set; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitStepFactory.cs b/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitStepFactory.cs
index 16cbaf15b6..3643a2abff 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitStepFactory.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitStepFactory.cs
@@ -1,18 +1,17 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GitVersion.Configuration.Init.Wizard
+namespace GitVersion.Configuration.Init.Wizard;
+
+public class ConfigInitStepFactory : IConfigInitStepFactory
 {
-    public class ConfigInitStepFactory : IConfigInitStepFactory
-    {
-        private readonly IServiceProvider? sp;
+    private readonly IServiceProvider? sp;
 
-        public ConfigInitStepFactory()
-        {
-        }
+    public ConfigInitStepFactory()
+    {
+    }
 
-        public ConfigInitStepFactory(IServiceProvider sp) => this.sp = sp ?? throw new ArgumentNullException(nameof(sp));
+    public ConfigInitStepFactory(IServiceProvider sp) => this.sp = sp ?? throw new ArgumentNullException(nameof(sp));
 
-        public T? CreateStep<T>() => this.sp!.GetService<T>();
-    }
-}
+    public T? CreateStep<T>() => this.sp!.GetService<T>();
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizard.cs b/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizard.cs
index b25b0397d0..77e9a7188b 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizard.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizard.cs
@@ -3,35 +3,34 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.Wizard
+namespace GitVersion.Configuration.Init.Wizard;
+
+public class ConfigInitWizard : IConfigInitWizard
 {
-    public class ConfigInitWizard : IConfigInitWizard
+    private readonly IConsole console;
+    private readonly IConfigInitStepFactory stepFactory;
+
+    public ConfigInitWizard(IConsole console, IConfigInitStepFactory stepFactory)
     {
-        private readonly IConsole console;
-        private readonly IConfigInitStepFactory stepFactory;
+        this.console = console ?? throw new ArgumentNullException(nameof(console));
+        this.stepFactory = stepFactory ?? throw new ArgumentNullException(nameof(stepFactory));
+    }
 
-        public ConfigInitWizard(IConsole console, IConfigInitStepFactory stepFactory)
-        {
-            this.console = console ?? throw new ArgumentNullException(nameof(console));
-            this.stepFactory = stepFactory ?? throw new ArgumentNullException(nameof(stepFactory));
-        }
+    public Config? Run(Config config, string workingDirectory)
+    {
+        this.console.WriteLine("GitVersion init will guide you through setting GitVersion up to work for you");
+        var steps = new Queue<ConfigInitWizardStep>();
+        steps.Enqueue(this.stepFactory.CreateStep<EditConfigStep>()!);
 
-        public Config? Run(Config config, string workingDirectory)
+        while (steps.Count > 0)
         {
-            this.console.WriteLine("GitVersion init will guide you through setting GitVersion up to work for you");
-            var steps = new Queue<ConfigInitWizardStep>();
-            steps.Enqueue(this.stepFactory.CreateStep<EditConfigStep>()!);
-
-            while (steps.Count > 0)
+            var currentStep = steps.Dequeue();
+            if (!currentStep.Apply(steps, config, workingDirectory))
             {
-                var currentStep = steps.Dequeue();
-                if (!currentStep.Apply(steps, config, workingDirectory))
-                {
-                    return null;
-                }
+                return null;
             }
-
-            return config;
         }
+
+        return config;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizardStep.cs b/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizardStep.cs
index 83e3a69998..d955c05d13 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizardStep.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizardStep.cs
@@ -4,70 +4,69 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.Wizard
+namespace GitVersion.Configuration.Init.Wizard;
+
+public abstract class ConfigInitWizardStep
 {
-    public abstract class ConfigInitWizardStep
-    {
-        protected readonly IConsole Console;
-        protected readonly IFileSystem FileSystem;
-        protected readonly ILog Log;
-        protected readonly IConfigInitStepFactory StepFactory;
+    protected readonly IConsole Console;
+    protected readonly IFileSystem FileSystem;
+    protected readonly ILog Log;
+    protected readonly IConfigInitStepFactory StepFactory;
 
-        protected ConfigInitWizardStep(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory)
-        {
-            this.Console = console ?? throw new ArgumentNullException(nameof(console));
-            this.FileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
-            this.Log = log ?? throw new ArgumentNullException(nameof(log));
-            this.StepFactory = stepFactory ?? throw new ArgumentNullException(nameof(stepFactory));
-        }
+    protected ConfigInitWizardStep(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory)
+    {
+        this.Console = console ?? throw new ArgumentNullException(nameof(console));
+        this.FileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
+        this.Log = log ?? throw new ArgumentNullException(nameof(log));
+        this.StepFactory = stepFactory ?? throw new ArgumentNullException(nameof(stepFactory));
+    }
 
-        public bool Apply(Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    public bool Apply(Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        this.Console.WriteLine();
+        this.Console.WriteLine(GetPrompt(config, workingDirectory));
+        this.Console.WriteLine();
+        this.Console.Write("> ");
+        var input = this.Console.ReadLine();
+        if (input == null)
         {
-            this.Console.WriteLine();
-            this.Console.WriteLine(GetPrompt(config, workingDirectory));
-            this.Console.WriteLine();
-            this.Console.Write("> ");
-            var input = this.Console.ReadLine();
-            if (input == null)
-            {
-                this.Console.WriteLine("Would you like to save changes? (y/n)");
-                input = this.Console.ReadLine();
-                if (input == null || input.ToLower() == "n") return false;
-                if (input.ToLower() == "y")
-                {
-                    steps.Clear();
-                    return true;
-                }
-
-                InvalidResponse(steps);
-                return true;
-            }
-            var resultWithDefaultApplied = input.IsNullOrEmpty() ? DefaultResult : input;
-            var stepResult = HandleResult(resultWithDefaultApplied, steps, config, workingDirectory);
-            if (stepResult.InvalidResponse)
-            {
-                InvalidResponse(steps);
-            }
-            else if (stepResult.Exit)
+            this.Console.WriteLine("Would you like to save changes? (y/n)");
+            input = this.Console.ReadLine();
+            if (input == null || input.ToLower() == "n") return false;
+            if (input.ToLower() == "y")
             {
                 steps.Clear();
-                return stepResult.Save;
+                return true;
             }
+
+            InvalidResponse(steps);
             return true;
         }
-
-        private void InvalidResponse(Queue<ConfigInitWizardStep> steps)
+        var resultWithDefaultApplied = input.IsNullOrEmpty() ? DefaultResult : input;
+        var stepResult = HandleResult(resultWithDefaultApplied, steps, config, workingDirectory);
+        if (stepResult.InvalidResponse)
         {
-            this.Console.WriteLine();
-            using (this.Console.UseColor(ConsoleColor.Red))
-            {
-                this.Console.WriteLine("Invalid response!");
-            }
-            steps.Enqueue(this);
+            InvalidResponse(steps);
+        }
+        else if (stepResult.Exit)
+        {
+            steps.Clear();
+            return stepResult.Save;
         }
+        return true;
+    }
 
-        protected abstract StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory);
-        protected abstract string GetPrompt(Config config, string workingDirectory);
-        protected abstract string? DefaultResult { get; }
+    private void InvalidResponse(Queue<ConfigInitWizardStep> steps)
+    {
+        this.Console.WriteLine();
+        using (this.Console.UseColor(ConsoleColor.Red))
+        {
+            this.Console.WriteLine("Invalid response!");
+        }
+        steps.Enqueue(this);
     }
-}
+
+    protected abstract StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory);
+    protected abstract string GetPrompt(Config config, string workingDirectory);
+    protected abstract string? DefaultResult { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/FinishedSetupStep.cs b/src/GitVersion.Core/Configuration/Init/Wizard/FinishedSetupStep.cs
index 4ecb14e72e..8ec836ba49 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/FinishedSetupStep.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/FinishedSetupStep.cs
@@ -1,14 +1,13 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.Wizard
+namespace GitVersion.Configuration.Init.Wizard;
+
+public class FinishedSetupStep : EditConfigStep
 {
-    public class FinishedSetupStep : EditConfigStep
+    public FinishedSetupStep(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        public FinishedSetupStep(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
-
-        protected override string GetPrompt(Config config, string workingDirectory) => $"Questions are all done, you can now edit GitVersion's configuration further{System.Environment.NewLine}" + base.GetPrompt(config, workingDirectory);
     }
-}
+
+    protected override string GetPrompt(Config config, string workingDirectory) => $"Questions are all done, you can now edit GitVersion's configuration further{System.Environment.NewLine}" + base.GetPrompt(config, workingDirectory);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/GitFlowSetupStep.cs b/src/GitVersion.Core/Configuration/Init/Wizard/GitFlowSetupStep.cs
index 8e3d8f4d62..433ce60f83 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/GitFlowSetupStep.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/GitFlowSetupStep.cs
@@ -2,15 +2,14 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.Wizard
+namespace GitVersion.Configuration.Init.Wizard;
+
+public class GitFlowSetupStep : GlobalModeSetting
 {
-    public class GitFlowSetupStep : GlobalModeSetting
+    public GitFlowSetupStep(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        public GitFlowSetupStep(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
-
-        protected override string GetPrompt(Config config, string workingDirectory) => $"By default GitVersion will only increment the version of the 'develop' branch every commit, all other branches will increment when tagged{System.Environment.NewLine}{System.Environment.NewLine}" +
-                base.GetPrompt(config, workingDirectory);
     }
-}
+
+    protected override string GetPrompt(Config config, string workingDirectory) => $"By default GitVersion will only increment the version of the 'develop' branch every commit, all other branches will increment when tagged{System.Environment.NewLine}{System.Environment.NewLine}" +
+                                                                                   base.GetPrompt(config, workingDirectory);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/GitHubFlowStep.cs b/src/GitVersion.Core/Configuration/Init/Wizard/GitHubFlowStep.cs
index 405eca826a..d692aa3172 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/GitHubFlowStep.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/GitHubFlowStep.cs
@@ -2,14 +2,13 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.Wizard
+namespace GitVersion.Configuration.Init.Wizard;
+
+public class GitHubFlowStep : GlobalModeSetting
 {
-    public class GitHubFlowStep : GlobalModeSetting
+    public GitHubFlowStep(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        public GitHubFlowStep(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
-
-        protected override string GetPrompt(Config config, string workingDirectory) => $"By default GitVersion will only increment the version when tagged{System.Environment.NewLine}{System.Environment.NewLine}" + base.GetPrompt(config, workingDirectory);
     }
-}
+
+    protected override string GetPrompt(Config config, string workingDirectory) => $"By default GitVersion will only increment the version when tagged{System.Environment.NewLine}{System.Environment.NewLine}" + base.GetPrompt(config, workingDirectory);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitStepFactory.cs b/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitStepFactory.cs
index e24225f1b6..5534e4776e 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitStepFactory.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitStepFactory.cs
@@ -1,7 +1,6 @@
-namespace GitVersion.Configuration.Init.Wizard
+namespace GitVersion.Configuration.Init.Wizard;
+
+public interface IConfigInitStepFactory
 {
-    public interface IConfigInitStepFactory
-    {
-        T? CreateStep<T>();
-    }
-}
+    T? CreateStep<T>();
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitWizard.cs b/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitWizard.cs
index 7eccd24aad..5c45e5a9ac 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitWizard.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitWizard.cs
@@ -1,9 +1,8 @@
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.Wizard
+namespace GitVersion.Configuration.Init.Wizard;
+
+public interface IConfigInitWizard
 {
-    public interface IConfigInitWizard
-    {
-        Config? Run(Config config, string workingDirectory);
-    }
-}
+    Config? Run(Config config, string workingDirectory);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy1Step.cs b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy1Step.cs
index e6abe30403..aee342b28b 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy1Step.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy1Step.cs
@@ -2,36 +2,35 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.Wizard
+namespace GitVersion.Configuration.Init.Wizard;
+
+public class PickBranchingStrategy1Step : ConfigInitWizardStep
 {
-    public class PickBranchingStrategy1Step : ConfigInitWizardStep
+    public PickBranchingStrategy1Step(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        public PickBranchingStrategy1Step(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
+    }
 
-        protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        switch (result?.ToLower())
         {
-            switch (result?.ToLower())
-            {
-                case "y":
-                    this.Console.Write(@"Because you need to maintain multiple versions of your product in production at the same time, GitFlow is likely a good fit.
+            case "y":
+                this.Console.Write(@"Because you need to maintain multiple versions of your product in production at the same time, GitFlow is likely a good fit.
 
 GitFlow allows you to have new development happening on the 'develop' branch, patch issues in old minor versions with 'hotfix/' branches and support old major versions with 'support/' branches");
-                    steps.Enqueue(this.StepFactory.CreateStep<PickBranchingStrategyStep>()!);
-                    return StepResult.Ok();
-                case "n":
-                    steps.Enqueue(this.StepFactory.CreateStep<PickBranchingStrategy2Step>()!);
-                    return StepResult.Ok();
-            }
-
-            return StepResult.InvalidResponseSelected();
+                steps.Enqueue(this.StepFactory.CreateStep<PickBranchingStrategyStep>()!);
+                return StepResult.Ok();
+            case "n":
+                steps.Enqueue(this.StepFactory.CreateStep<PickBranchingStrategy2Step>()!);
+                return StepResult.Ok();
         }
 
-        protected override string GetPrompt(Config config, string workingDirectory) => @"GitVersion can try to recommend you a branching strategy based on a few questions. 
+        return StepResult.InvalidResponseSelected();
+    }
+
+    protected override string GetPrompt(Config config, string workingDirectory) => @"GitVersion can try to recommend you a branching strategy based on a few questions. 
 
 Do you need to maintain multiple versions of your application simultaneously in production? (y/n)";
 
-        protected override string? DefaultResult => null;
-    }
-}
+    protected override string? DefaultResult => null;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy2Step.cs b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy2Step.cs
index e142fd0f1d..d46c98d61b 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy2Step.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy2Step.cs
@@ -2,37 +2,36 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.Wizard
+namespace GitVersion.Configuration.Init.Wizard;
+
+public class PickBranchingStrategy2Step : ConfigInitWizardStep
 {
-    public class PickBranchingStrategy2Step : ConfigInitWizardStep
+    public PickBranchingStrategy2Step(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        public PickBranchingStrategy2Step(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
+    }
 
-        protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        switch (result?.ToLower())
         {
-            switch (result?.ToLower())
-            {
-                case "y":
-                    this.Console.WriteLine("GitFlow is likely a good fit, the 'develop' branch can be used " +
-                                      "for active development while stabilising the next release.");
-                    this.Console.WriteLine();
-                    this.Console.WriteLine("GitHubFlow is designed for a lightweight workflow where main is always " +
-                                      "good to deploy to production and feature branches are used to stabilise " +
-                                      "features, once stable they are merged to main and made available in the next release");
-                    steps.Enqueue(this.StepFactory.CreateStep<PickBranchingStrategyStep>()!);
-                    return StepResult.Ok();
-                case "n":
-                    steps.Enqueue(this.StepFactory.CreateStep<PickBranchingStrategy3Step>()!);
-                    return StepResult.Ok();
-            }
-
-            return StepResult.InvalidResponseSelected();
+            case "y":
+                this.Console.WriteLine("GitFlow is likely a good fit, the 'develop' branch can be used " +
+                                       "for active development while stabilising the next release.");
+                this.Console.WriteLine();
+                this.Console.WriteLine("GitHubFlow is designed for a lightweight workflow where main is always " +
+                                       "good to deploy to production and feature branches are used to stabilise " +
+                                       "features, once stable they are merged to main and made available in the next release");
+                steps.Enqueue(this.StepFactory.CreateStep<PickBranchingStrategyStep>()!);
+                return StepResult.Ok();
+            case "n":
+                steps.Enqueue(this.StepFactory.CreateStep<PickBranchingStrategy3Step>()!);
+                return StepResult.Ok();
         }
 
-        protected override string GetPrompt(Config config, string workingDirectory) => "Do you stabilise releases while continuing work on the next version? (y/n)";
-
-        protected override string? DefaultResult => null;
+        return StepResult.InvalidResponseSelected();
     }
-}
+
+    protected override string GetPrompt(Config config, string workingDirectory) => "Do you stabilise releases while continuing work on the next version? (y/n)";
+
+    protected override string? DefaultResult => null;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy3Step.cs b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy3Step.cs
index d9a70d4432..adb783fb79 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy3Step.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy3Step.cs
@@ -2,38 +2,37 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.Wizard
+namespace GitVersion.Configuration.Init.Wizard;
+
+public class PickBranchingStrategy3Step : ConfigInitWizardStep
 {
-    public class PickBranchingStrategy3Step : ConfigInitWizardStep
+    public PickBranchingStrategy3Step(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        public PickBranchingStrategy3Step(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
+    }
 
-        protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        switch (result?.ToLower())
         {
-            switch (result?.ToLower())
-            {
-                case "y":
-                    this.Console.WriteLine("GitFlow could be a better fit than GitHubFlow for you.");
-                    this.Console.WriteLine();
-                    this.Console.WriteLine("GitVersion increments the SemVer for each commit on the develop branch by default, " +
-                                      "this means all packages built from develop can be published to a single NuGet feed.");
-                    break;
-                case "n":
-                    this.Console.WriteLine("We recommend the GitHubFlow branching strategy, it sounds like you will " +
-                                      "not benefit from the additional complexity that GitFlow introduces");
-                    break;
-                default:
-                    return StepResult.InvalidResponseSelected();
-            }
-
-            steps.Enqueue(this.StepFactory.CreateStep<PickBranchingStrategyStep>()!);
-            return StepResult.Ok();
+            case "y":
+                this.Console.WriteLine("GitFlow could be a better fit than GitHubFlow for you.");
+                this.Console.WriteLine();
+                this.Console.WriteLine("GitVersion increments the SemVer for each commit on the develop branch by default, " +
+                                       "this means all packages built from develop can be published to a single NuGet feed.");
+                break;
+            case "n":
+                this.Console.WriteLine("We recommend the GitHubFlow branching strategy, it sounds like you will " +
+                                       "not benefit from the additional complexity that GitFlow introduces");
+                break;
+            default:
+                return StepResult.InvalidResponseSelected();
         }
 
-        protected override string GetPrompt(Config config, string workingDirectory) => "Do you need to build nightlies or consume packages the CI build creates without releasing those versions? (y/n)";
-
-        protected override string? DefaultResult => null;
+        steps.Enqueue(this.StepFactory.CreateStep<PickBranchingStrategyStep>()!);
+        return StepResult.Ok();
     }
-}
+
+    protected override string GetPrompt(Config config, string workingDirectory) => "Do you need to build nightlies or consume packages the CI build creates without releasing those versions? (y/n)";
+
+    protected override string? DefaultResult => null;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategyStep.cs b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategyStep.cs
index fb2191d882..05aa71e43e 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategyStep.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategyStep.cs
@@ -2,41 +2,40 @@
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.Configuration.Init.Wizard
+namespace GitVersion.Configuration.Init.Wizard;
+
+public class PickBranchingStrategyStep : ConfigInitWizardStep
 {
-    public class PickBranchingStrategyStep : ConfigInitWizardStep
+    public PickBranchingStrategyStep(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
-        public PickBranchingStrategyStep(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
-        {
-        }
+    }
 
-        protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
+    {
+        var returnToStep = this.StepFactory.CreateStep<FinishedSetupStep>();
+        switch (result)
         {
-            var returnToStep = this.StepFactory.CreateStep<FinishedSetupStep>();
-            switch (result)
-            {
-                case "1":
-                    steps.Enqueue(this.StepFactory.CreateStep<GitFlowSetupStep>()!.WithData(returnToStep!, true));
-                    break;
-                case "2":
-                    steps.Enqueue(this.StepFactory.CreateStep<GitHubFlowStep>()!.WithData(returnToStep!, true));
-                    break;
-                case "3":
-                    steps.Enqueue(this.StepFactory.CreateStep<PickBranchingStrategy1Step>()!);
-                    break;
-                default:
-                    return StepResult.InvalidResponseSelected();
-            }
-
-            return StepResult.Ok();
+            case "1":
+                steps.Enqueue(this.StepFactory.CreateStep<GitFlowSetupStep>()!.WithData(returnToStep!, true));
+                break;
+            case "2":
+                steps.Enqueue(this.StepFactory.CreateStep<GitHubFlowStep>()!.WithData(returnToStep!, true));
+                break;
+            case "3":
+                steps.Enqueue(this.StepFactory.CreateStep<PickBranchingStrategy1Step>()!);
+                break;
+            default:
+                return StepResult.InvalidResponseSelected();
         }
 
-        protected override string GetPrompt(Config config, string workingDirectory) => @"The way you will use GitVersion will change a lot based on your branching strategy. What branching strategy will you be using:
+        return StepResult.Ok();
+    }
+
+    protected override string GetPrompt(Config config, string workingDirectory) => @"The way you will use GitVersion will change a lot based on your branching strategy. What branching strategy will you be using:
 
 1) GitFlow (or similar)
 2) GitHubFlow
 3) Unsure, tell me more";
 
-        protected override string? DefaultResult => null;
-    }
-}
+    protected override string? DefaultResult => null;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/Abstractions/IEnvironment.cs b/src/GitVersion.Core/Core/Abstractions/IEnvironment.cs
index c3e0557a36..8f0b2aa66c 100644
--- a/src/GitVersion.Core/Core/Abstractions/IEnvironment.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IEnvironment.cs
@@ -1,8 +1,7 @@
-namespace GitVersion
+namespace GitVersion;
+
+public interface IEnvironment
 {
-    public interface IEnvironment
-    {
-        string? GetEnvironmentVariable(string variableName);
-        void SetEnvironmentVariable(string variableName, string value);
-    }
-}
+    string? GetEnvironmentVariable(string variableName);
+    void SetEnvironmentVariable(string variableName, string value);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/Abstractions/IFileSystem.cs b/src/GitVersion.Core/Core/Abstractions/IFileSystem.cs
index fd03c3558c..f938bee23c 100644
--- a/src/GitVersion.Core/Core/Abstractions/IFileSystem.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IFileSystem.cs
@@ -2,24 +2,23 @@
 using System.IO;
 using System.Text;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IFileSystem
 {
-    public interface IFileSystem
-    {
-        void Copy(string from, string to, bool overwrite);
-        void Move(string from, string to);
-        bool Exists(string file);
-        void Delete(string path);
-        string ReadAllText(string path);
-        void WriteAllText(string? file, string fileContents);
-        void WriteAllText(string? file, string fileContents, Encoding encoding);
-        IEnumerable<string> DirectoryEnumerateFiles(string? directory, string searchPattern, SearchOption searchOption);
-        Stream OpenWrite(string path);
-        Stream OpenRead(string path);
-        void CreateDirectory(string path);
-        bool DirectoryExists(string path);
-        long GetLastDirectoryWrite(string path);
+    void Copy(string from, string to, bool overwrite);
+    void Move(string from, string to);
+    bool Exists(string file);
+    void Delete(string path);
+    string ReadAllText(string path);
+    void WriteAllText(string? file, string fileContents);
+    void WriteAllText(string? file, string fileContents, Encoding encoding);
+    IEnumerable<string> DirectoryEnumerateFiles(string? directory, string searchPattern, SearchOption searchOption);
+    Stream OpenWrite(string path);
+    Stream OpenRead(string path);
+    void CreateDirectory(string path);
+    bool DirectoryExists(string path);
+    long GetLastDirectoryWrite(string path);
 
-        bool PathsEqual(string? path, string? otherPath);
-    }
-}
+    bool PathsEqual(string? path, string? otherPath);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/Abstractions/IGitPreparer.cs b/src/GitVersion.Core/Core/Abstractions/IGitPreparer.cs
index 27455292c9..80ace64071 100644
--- a/src/GitVersion.Core/Core/Abstractions/IGitPreparer.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IGitPreparer.cs
@@ -1,8 +1,7 @@
-namespace GitVersion
+namespace GitVersion;
+
+public interface IGitPreparer
 {
-    public interface IGitPreparer
-    {
-        void Prepare();
-        void EnsureLocalBranchExistsForCurrentBranch(IRemote remote, string currentBranch);
-    }
-}
+    void Prepare();
+    void EnsureLocalBranchExistsForCurrentBranch(IRemote remote, string currentBranch);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/Abstractions/IGitVersionCalculateTool.cs b/src/GitVersion.Core/Core/Abstractions/IGitVersionCalculateTool.cs
index 02e1d5af75..390455e5d4 100644
--- a/src/GitVersion.Core/Core/Abstractions/IGitVersionCalculateTool.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IGitVersionCalculateTool.cs
@@ -1,9 +1,8 @@
 using GitVersion.OutputVariables;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IGitVersionCalculateTool
 {
-    public interface IGitVersionCalculateTool
-    {
-        VersionVariables CalculateVersionVariables();
-    }
-}
+    VersionVariables CalculateVersionVariables();
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/Abstractions/IGitVersionContextFactory.cs b/src/GitVersion.Core/Core/Abstractions/IGitVersionContextFactory.cs
index a3746cbf07..4732b8e871 100644
--- a/src/GitVersion.Core/Core/Abstractions/IGitVersionContextFactory.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IGitVersionContextFactory.cs
@@ -1,7 +1,6 @@
-namespace GitVersion
+namespace GitVersion;
+
+public interface IGitVersionContextFactory
 {
-    public interface IGitVersionContextFactory
-    {
-        GitVersionContext Create(GitVersionOptions? gitVersionOptions);
-    }
-}
+    GitVersionContext Create(GitVersionOptions? gitVersionOptions);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/Abstractions/IGitVersionModule.cs b/src/GitVersion.Core/Core/Abstractions/IGitVersionModule.cs
index dfe04fc69b..0b1594ff5c 100644
--- a/src/GitVersion.Core/Core/Abstractions/IGitVersionModule.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IGitVersionModule.cs
@@ -1,9 +1,8 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IGitVersionModule
 {
-    public interface IGitVersionModule
-    {
-        void RegisterTypes(IServiceCollection services);
-    }
-}
+    void RegisterTypes(IServiceCollection services);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/Abstractions/IGitVersionOutputTool.cs b/src/GitVersion.Core/Core/Abstractions/IGitVersionOutputTool.cs
index 31fe90a253..e9875b9fe6 100644
--- a/src/GitVersion.Core/Core/Abstractions/IGitVersionOutputTool.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IGitVersionOutputTool.cs
@@ -1,12 +1,11 @@
 using GitVersion.OutputVariables;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IGitVersionOutputTool
 {
-    public interface IGitVersionOutputTool
-    {
-        void OutputVariables(VersionVariables variables, bool updateBuildNumber);
-        void UpdateAssemblyInfo(VersionVariables variables);
-        void UpdateWixVersionFile(VersionVariables variables);
-        void GenerateGitVersionInformation(VersionVariables variables, FileWriteInfo fileWriteInfo);
-    }
-}
+    void OutputVariables(VersionVariables variables, bool updateBuildNumber);
+    void UpdateAssemblyInfo(VersionVariables variables);
+    void UpdateWixVersionFile(VersionVariables variables);
+    void GenerateGitVersionInformation(VersionVariables variables, FileWriteInfo fileWriteInfo);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs b/src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs
index 64188e3b8c..02890307a2 100644
--- a/src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs
@@ -3,45 +3,44 @@
 using GitVersion.Model.Configuration;
 using GitVersion.VersionCalculation;
 
-namespace GitVersion.Common
+namespace GitVersion.Common;
+
+public interface IRepositoryStore
 {
-    public interface IRepositoryStore
-    {
-        /// <summary>
-        /// Find the merge base of the two branches, i.e. the best common ancestor of the two branches' tips.
-        /// </summary>
-        ICommit? FindMergeBase(IBranch branch, IBranch? otherBranch);
-        ICommit FindMergeBase(ICommit commit, ICommit mainlineTip);
-        ICommit? GetCurrentCommit(IBranch currentBranch, string? commitId);
-        ICommit GetBaseVersionSource(ICommit currentBranchTip);
-        IEnumerable<ICommit> GetMainlineCommitLog(ICommit? baseVersionSource, ICommit? mainlineTip);
-        IEnumerable<ICommit> GetMergeBaseCommits(ICommit? mergeCommit, ICommit? mergedHead, ICommit? findMergeBase);
-        IEnumerable<ICommit> GetCommitLog(ICommit? baseVersionSource, ICommit? currentCommit);
+    /// <summary>
+    /// Find the merge base of the two branches, i.e. the best common ancestor of the two branches' tips.
+    /// </summary>
+    ICommit? FindMergeBase(IBranch branch, IBranch? otherBranch);
+    ICommit FindMergeBase(ICommit commit, ICommit mainlineTip);
+    ICommit? GetCurrentCommit(IBranch currentBranch, string? commitId);
+    ICommit GetBaseVersionSource(ICommit currentBranchTip);
+    IEnumerable<ICommit> GetMainlineCommitLog(ICommit? baseVersionSource, ICommit? mainlineTip);
+    IEnumerable<ICommit> GetMergeBaseCommits(ICommit? mergeCommit, ICommit? mergedHead, ICommit? findMergeBase);
+    IEnumerable<ICommit> GetCommitLog(ICommit? baseVersionSource, ICommit? currentCommit);
 
-        IBranch GetTargetBranch(string? targetBranchName);
-        IBranch FindBranch(string? branchName);
-        IBranch GetChosenBranch(Config configuration);
-        IEnumerable<IBranch> GetBranchesForCommit(ICommit commit);
-        IEnumerable<IBranch> GetExcludedInheritBranches(Config configuration);
-        IEnumerable<IBranch> GetReleaseBranches(IEnumerable<KeyValuePair<string, BranchConfig?>>? releaseBranchConfig);
-        IEnumerable<IBranch> ExcludingBranches(IEnumerable<IBranch> branchesToExclude);
-        IEnumerable<IBranch> GetBranchesContainingCommit(ICommit? commit, IEnumerable<IBranch>? branches = null, bool onlyTrackedBranches = false);
-        Dictionary<string, List<IBranch>> GetMainlineBranches(ICommit commit, IEnumerable<KeyValuePair<string, BranchConfig?>>? mainlineBranchConfigs);
+    IBranch GetTargetBranch(string? targetBranchName);
+    IBranch FindBranch(string? branchName);
+    IBranch GetChosenBranch(Config configuration);
+    IEnumerable<IBranch> GetBranchesForCommit(ICommit commit);
+    IEnumerable<IBranch> GetExcludedInheritBranches(Config configuration);
+    IEnumerable<IBranch> GetReleaseBranches(IEnumerable<KeyValuePair<string, BranchConfig?>>? releaseBranchConfig);
+    IEnumerable<IBranch> ExcludingBranches(IEnumerable<IBranch> branchesToExclude);
+    IEnumerable<IBranch> GetBranchesContainingCommit(ICommit? commit, IEnumerable<IBranch>? branches = null, bool onlyTrackedBranches = false);
+    Dictionary<string, List<IBranch>> GetMainlineBranches(ICommit commit, IEnumerable<KeyValuePair<string, BranchConfig?>>? mainlineBranchConfigs);
 
-        /// <summary>
-        /// Find the commit where the given branch was branched from another branch.
-        /// If there are multiple such commits and branches, tries to guess based on commit histories.
-        /// </summary>
-        BranchCommit FindCommitBranchWasBranchedFrom(IBranch branch, Config configuration, params IBranch[] excludedBranches);
+    /// <summary>
+    /// Find the commit where the given branch was branched from another branch.
+    /// If there are multiple such commits and branches, tries to guess based on commit histories.
+    /// </summary>
+    BranchCommit FindCommitBranchWasBranchedFrom(IBranch branch, Config configuration, params IBranch[] excludedBranches);
 
-        SemanticVersion GetCurrentCommitTaggedVersion(ICommit? commit, EffectiveConfiguration config);
-        SemanticVersion MaybeIncrement(BaseVersion baseVersion, GitVersionContext context);
-        IEnumerable<SemanticVersion> GetVersionTagsOnBranch(IBranch branch, string? tagPrefixRegex);
-        IEnumerable<Tuple<ITag, SemanticVersion, ICommit>> GetValidVersionTags(string? tagPrefixRegex, DateTimeOffset? olderThan = null);
+    SemanticVersion GetCurrentCommitTaggedVersion(ICommit? commit, EffectiveConfiguration config);
+    SemanticVersion MaybeIncrement(BaseVersion baseVersion, GitVersionContext context);
+    IEnumerable<SemanticVersion> GetVersionTagsOnBranch(IBranch branch, string? tagPrefixRegex);
+    IEnumerable<Tuple<ITag, SemanticVersion, ICommit>> GetValidVersionTags(string? tagPrefixRegex, DateTimeOffset? olderThan = null);
 
-        bool IsCommitOnBranch(ICommit? baseVersionSource, IBranch branch, ICommit firstMatchingCommit);
-        VersionField? DetermineIncrementedField(BaseVersion baseVersion, GitVersionContext context);
+    bool IsCommitOnBranch(ICommit? baseVersionSource, IBranch branch, ICommit firstMatchingCommit);
+    VersionField? DetermineIncrementedField(BaseVersion baseVersion, GitVersionContext context);
 
-        int GetNumberOfUncommittedChanges();
-    }
-}
+    int GetNumberOfUncommittedChanges();
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/Environment.cs b/src/GitVersion.Core/Core/Environment.cs
index 520b741338..955eef8f04 100644
--- a/src/GitVersion.Core/Core/Environment.cs
+++ b/src/GitVersion.Core/Core/Environment.cs
@@ -1,9 +1,8 @@
-namespace GitVersion
+namespace GitVersion;
+
+public class Environment : IEnvironment
 {
-    public class Environment : IEnvironment
-    {
-        public string? GetEnvironmentVariable(string variableName) => System.Environment.GetEnvironmentVariable(variableName);
+    public string? GetEnvironmentVariable(string variableName) => System.Environment.GetEnvironmentVariable(variableName);
 
-        public void SetEnvironmentVariable(string variableName, string value) => System.Environment.SetEnvironmentVariable(variableName, value);
-    }
-}
+    public void SetEnvironmentVariable(string variableName, string value) => System.Environment.SetEnvironmentVariable(variableName, value);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/FileSystem.cs b/src/GitVersion.Core/Core/FileSystem.cs
index 0a909f0b57..cc8b9a5344 100644
--- a/src/GitVersion.Core/Core/FileSystem.cs
+++ b/src/GitVersion.Core/Core/FileSystem.cs
@@ -4,53 +4,52 @@
 using System.Text;
 using GitVersion.Helpers;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class FileSystem : IFileSystem
 {
-    public class FileSystem : IFileSystem
-    {
-        public void Copy(string from, string to, bool overwrite) => File.Copy(from, to, overwrite);
+    public void Copy(string from, string to, bool overwrite) => File.Copy(from, to, overwrite);
 
-        public void Move(string from, string to) => File.Move(from, to);
+    public void Move(string from, string to) => File.Move(from, to);
 
-        public bool Exists(string file) => File.Exists(file);
+    public bool Exists(string file) => File.Exists(file);
 
-        public void Delete(string path) => File.Delete(path);
+    public void Delete(string path) => File.Delete(path);
 
-        public string ReadAllText(string path) => File.ReadAllText(path);
+    public string ReadAllText(string path) => File.ReadAllText(path);
 
-        public void WriteAllText(string? file, string fileContents)
-        {
-            // Opinionated decision to use UTF8 with BOM when creating new files or when the existing
-            // encoding was not easily detected due to the file not having an encoding preamble.
-            var encoding = EncodingHelper.DetectEncoding(file) ?? Encoding.UTF8;
-            WriteAllText(file, fileContents, encoding);
-        }
+    public void WriteAllText(string? file, string fileContents)
+    {
+        // Opinionated decision to use UTF8 with BOM when creating new files or when the existing
+        // encoding was not easily detected due to the file not having an encoding preamble.
+        var encoding = EncodingHelper.DetectEncoding(file) ?? Encoding.UTF8;
+        WriteAllText(file, fileContents, encoding);
+    }
 
-        public void WriteAllText(string? file, string fileContents, Encoding encoding) =>
-            File.WriteAllText(file, fileContents, encoding);
+    public void WriteAllText(string? file, string fileContents, Encoding encoding) =>
+        File.WriteAllText(file, fileContents, encoding);
 
-        public IEnumerable<string> DirectoryEnumerateFiles(string? directory, string searchPattern, SearchOption searchOption) =>
-            Directory.EnumerateFiles(directory, searchPattern, searchOption);
+    public IEnumerable<string> DirectoryEnumerateFiles(string? directory, string searchPattern, SearchOption searchOption) =>
+        Directory.EnumerateFiles(directory, searchPattern, searchOption);
 
-        public Stream OpenWrite(string path) => File.OpenWrite(path);
+    public Stream OpenWrite(string path) => File.OpenWrite(path);
 
-        public Stream OpenRead(string path) => File.OpenRead(path);
+    public Stream OpenRead(string path) => File.OpenRead(path);
 
-        public void CreateDirectory(string path) => Directory.CreateDirectory(path);
+    public void CreateDirectory(string path) => Directory.CreateDirectory(path);
 
-        public bool DirectoryExists(string path) => Directory.Exists(path);
+    public bool DirectoryExists(string path) => Directory.Exists(path);
 
-        public long GetLastDirectoryWrite(string path) => new DirectoryInfo(path)
-                .GetDirectories("*.*", SearchOption.AllDirectories)
-                .Select(d => d.LastWriteTimeUtc)
-                .DefaultIfEmpty()
-                .Max()
-                .Ticks;
+    public long GetLastDirectoryWrite(string path) => new DirectoryInfo(path)
+        .GetDirectories("*.*", SearchOption.AllDirectories)
+        .Select(d => d.LastWriteTimeUtc)
+        .DefaultIfEmpty()
+        .Max()
+        .Ticks;
 
-        public bool PathsEqual(string? path, string? otherPath) =>
-            string.Equals(
-                Path.GetFullPath(path).TrimEnd('\\').TrimEnd('/'),
-                Path.GetFullPath(otherPath).TrimEnd('\\').TrimEnd('/'),
-                StringComparerUtils.OsDependentComparison);
-    }
-}
+    public bool PathsEqual(string? path, string? otherPath) =>
+        string.Equals(
+            Path.GetFullPath(path).TrimEnd('\\').TrimEnd('/'),
+            Path.GetFullPath(otherPath).TrimEnd('\\').TrimEnd('/'),
+            StringComparerUtils.OsDependentComparison);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/GitPreparer.cs b/src/GitVersion.Core/Core/GitPreparer.cs
index d6170796c0..5140fe0d04 100644
--- a/src/GitVersion.Core/Core/GitPreparer.cs
+++ b/src/GitVersion.Core/Core/GitPreparer.cs
@@ -9,389 +9,388 @@
 using GitVersion.Model.Configuration;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class GitPreparer : IGitPreparer
 {
-    public class GitPreparer : IGitPreparer
+    private readonly ILog log;
+    private readonly IEnvironment environment;
+    private readonly IMutatingGitRepository repository;
+    private readonly IOptions<GitVersionOptions> options;
+    private readonly IGitRepositoryInfo repositoryInfo;
+    private readonly IRepositoryStore repositoryStore;
+    private readonly ICurrentBuildAgent buildAgent;
+    private readonly RetryAction<LockedFileException> retryAction;
+
+    private const string DefaultRemoteName = "origin";
+
+    public GitPreparer(ILog log, IEnvironment environment, ICurrentBuildAgent buildAgent, IOptions<GitVersionOptions> options,
+        IMutatingGitRepository repository, IGitRepositoryInfo repositoryInfo, IRepositoryStore repositoryStore)
     {
-        private readonly ILog log;
-        private readonly IEnvironment environment;
-        private readonly IMutatingGitRepository repository;
-        private readonly IOptions<GitVersionOptions> options;
-        private readonly IGitRepositoryInfo repositoryInfo;
-        private readonly IRepositoryStore repositoryStore;
-        private readonly ICurrentBuildAgent buildAgent;
-        private readonly RetryAction<LockedFileException> retryAction;
-
-        private const string DefaultRemoteName = "origin";
-
-        public GitPreparer(ILog log, IEnvironment environment, ICurrentBuildAgent buildAgent, IOptions<GitVersionOptions> options,
-            IMutatingGitRepository repository, IGitRepositoryInfo repositoryInfo, IRepositoryStore repositoryStore)
-        {
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.environment = environment ?? throw new ArgumentNullException(nameof(environment));
-            this.repository = repository ?? throw new ArgumentNullException(nameof(repository));
-            this.options = options ?? throw new ArgumentNullException(nameof(options));
-            this.repositoryInfo = repositoryInfo ?? throw new ArgumentNullException(nameof(repositoryInfo));
-            this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
-            this.buildAgent = buildAgent;
-            this.retryAction = new RetryAction<LockedFileException>();
-        }
-
-        public void Prepare()
-        {
-            var gitVersionOptions = this.options.Value;
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
+        this.environment = environment ?? throw new ArgumentNullException(nameof(environment));
+        this.repository = repository ?? throw new ArgumentNullException(nameof(repository));
+        this.options = options ?? throw new ArgumentNullException(nameof(options));
+        this.repositoryInfo = repositoryInfo ?? throw new ArgumentNullException(nameof(repositoryInfo));
+        this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
+        this.buildAgent = buildAgent;
+        this.retryAction = new RetryAction<LockedFileException>();
+    }
 
-            // Normalize if we are running on build server
-            var normalizeGitDirectory = !gitVersionOptions.Settings.NoNormalize && this.buildAgent != null;
-            var shouldCleanUpRemotes = this.buildAgent != null && this.buildAgent.ShouldCleanUpRemotes();
-            var currentBranch = ResolveCurrentBranch();
+    public void Prepare()
+    {
+        var gitVersionOptions = this.options.Value;
 
-            var dotGitDirectory = this.repositoryInfo.DotGitDirectory;
-            var projectRoot = this.repositoryInfo.ProjectRootDirectory;
+        // Normalize if we are running on build server
+        var normalizeGitDirectory = !gitVersionOptions.Settings.NoNormalize && this.buildAgent != null;
+        var shouldCleanUpRemotes = this.buildAgent != null && this.buildAgent.ShouldCleanUpRemotes();
+        var currentBranch = ResolveCurrentBranch();
 
-            this.log.Info($"Project root is: {projectRoot}");
-            this.log.Info($"DotGit directory is: {dotGitDirectory}");
-            if (dotGitDirectory.IsNullOrEmpty() || projectRoot.IsNullOrEmpty())
-            {
-                throw new Exception($"Failed to prepare or find the .git directory in path '{gitVersionOptions.WorkingDirectory}'.");
-            }
+        var dotGitDirectory = this.repositoryInfo.DotGitDirectory;
+        var projectRoot = this.repositoryInfo.ProjectRootDirectory;
 
-            PrepareInternal(normalizeGitDirectory, currentBranch, shouldCleanUpRemotes);
+        this.log.Info($"Project root is: {projectRoot}");
+        this.log.Info($"DotGit directory is: {dotGitDirectory}");
+        if (dotGitDirectory.IsNullOrEmpty() || projectRoot.IsNullOrEmpty())
+        {
+            throw new Exception($"Failed to prepare or find the .git directory in path '{gitVersionOptions.WorkingDirectory}'.");
         }
 
-        private void PrepareInternal(bool normalizeGitDirectory, string? currentBranch, bool shouldCleanUpRemotes = false)
+        PrepareInternal(normalizeGitDirectory, currentBranch, shouldCleanUpRemotes);
+    }
+
+    private void PrepareInternal(bool normalizeGitDirectory, string? currentBranch, bool shouldCleanUpRemotes = false)
+    {
+        var gitVersionOptions = this.options.Value;
+        if (!gitVersionOptions.RepositoryInfo.TargetUrl.IsNullOrWhiteSpace())
         {
-            var gitVersionOptions = this.options.Value;
-            if (!gitVersionOptions.RepositoryInfo.TargetUrl.IsNullOrWhiteSpace())
+            CreateDynamicRepository(currentBranch);
+        }
+        else
+        {
+            if (!normalizeGitDirectory) return;
+            if (shouldCleanUpRemotes)
             {
-                CreateDynamicRepository(currentBranch);
+                CleanupDuplicateOrigin();
             }
-            else
-            {
-                if (!normalizeGitDirectory) return;
-                if (shouldCleanUpRemotes)
-                {
-                    CleanupDuplicateOrigin();
-                }
 
-                NormalizeGitDirectory(currentBranch, false);
-            }
+            NormalizeGitDirectory(currentBranch, false);
         }
+    }
 
-        private string? ResolveCurrentBranch()
+    private string? ResolveCurrentBranch()
+    {
+        var gitVersionOptions = this.options.Value;
+        var targetBranch = gitVersionOptions.RepositoryInfo.TargetBranch;
+        if (this.buildAgent == null)
         {
-            var gitVersionOptions = this.options.Value;
-            var targetBranch = gitVersionOptions.RepositoryInfo.TargetBranch;
-            if (this.buildAgent == null)
-            {
-                return targetBranch;
-            }
+            return targetBranch;
+        }
 
-            var isDynamicRepository = !gitVersionOptions.RepositoryInfo.DynamicRepositoryClonePath.IsNullOrWhiteSpace();
-            var currentBranch = this.buildAgent.GetCurrentBranch(isDynamicRepository) ?? targetBranch;
-            this.log.Info("Branch from build environment: " + currentBranch);
+        var isDynamicRepository = !gitVersionOptions.RepositoryInfo.DynamicRepositoryClonePath.IsNullOrWhiteSpace();
+        var currentBranch = this.buildAgent.GetCurrentBranch(isDynamicRepository) ?? targetBranch;
+        this.log.Info("Branch from build environment: " + currentBranch);
 
-            return currentBranch;
-        }
+        return currentBranch;
+    }
 
-        private void CleanupDuplicateOrigin()
+    private void CleanupDuplicateOrigin()
+    {
+        var remoteToKeep = DefaultRemoteName;
+        // check that we have a remote that matches defaultRemoteName if not take the first remote
+        if (!this.repository.Remotes.Any(remote => remote.Name.Equals(DefaultRemoteName, StringComparison.InvariantCultureIgnoreCase)))
         {
-            var remoteToKeep = DefaultRemoteName;
-            // check that we have a remote that matches defaultRemoteName if not take the first remote
-            if (!this.repository.Remotes.Any(remote => remote.Name.Equals(DefaultRemoteName, StringComparison.InvariantCultureIgnoreCase)))
-            {
-                remoteToKeep = this.repository.Remotes.First().Name;
-            }
+            remoteToKeep = this.repository.Remotes.First().Name;
+        }
 
-            var duplicateRemotes = this.repository.Remotes
-                .Where(remote => !remote.Name.Equals(remoteToKeep, StringComparison.InvariantCultureIgnoreCase))
-                .Select(remote => remote.Name);
+        var duplicateRemotes = this.repository.Remotes
+            .Where(remote => !remote.Name.Equals(remoteToKeep, StringComparison.InvariantCultureIgnoreCase))
+            .Select(remote => remote.Name);
 
-            // remove all remotes that are considered duplicates
-            foreach (var remoteName in duplicateRemotes)
-            {
-                this.repository.Remotes.Remove(remoteName);
-            }
+        // remove all remotes that are considered duplicates
+        foreach (var remoteName in duplicateRemotes)
+        {
+            this.repository.Remotes.Remove(remoteName);
         }
+    }
 
-        private void CreateDynamicRepository(string? targetBranch)
+    private void CreateDynamicRepository(string? targetBranch)
+    {
+        var gitVersionOptions = this.options.Value;
+        if (targetBranch.IsNullOrWhiteSpace())
         {
-            var gitVersionOptions = this.options.Value;
-            if (targetBranch.IsNullOrWhiteSpace())
-            {
-                throw new Exception("Dynamic Git repositories must have a target branch (/b)");
-            }
+            throw new Exception("Dynamic Git repositories must have a target branch (/b)");
+        }
 
-            var gitDirectory = this.repositoryInfo.DynamicGitRepositoryPath;
+        var gitDirectory = this.repositoryInfo.DynamicGitRepositoryPath;
 
-            using (this.log.IndentLog($"Creating dynamic repository at '{gitDirectory}'"))
+        using (this.log.IndentLog($"Creating dynamic repository at '{gitDirectory}'"))
+        {
+            var authentication = gitVersionOptions.Authentication;
+            if (!Directory.Exists(gitDirectory))
             {
-                var authentication = gitVersionOptions.Authentication;
-                if (!Directory.Exists(gitDirectory))
-                {
-                    CloneRepository(gitVersionOptions.RepositoryInfo.TargetUrl, gitDirectory, authentication);
-                }
-                else
-                {
-                    this.log.Info("Git repository already exists");
-                }
-                NormalizeGitDirectory(targetBranch, true);
+                CloneRepository(gitVersionOptions.RepositoryInfo.TargetUrl, gitDirectory, authentication);
+            }
+            else
+            {
+                this.log.Info("Git repository already exists");
             }
+            NormalizeGitDirectory(targetBranch, true);
         }
+    }
 
-        private void NormalizeGitDirectory(string? targetBranch, bool isDynamicRepository)
+    private void NormalizeGitDirectory(string? targetBranch, bool isDynamicRepository)
+    {
+        using (this.log.IndentLog($"Normalizing git directory for branch '{targetBranch}'"))
         {
-            using (this.log.IndentLog($"Normalizing git directory for branch '{targetBranch}'"))
-            {
-                // Normalize (download branches) before using the branch
-                NormalizeGitDirectory(this.options.Value.Settings.NoFetch, targetBranch, isDynamicRepository);
-            }
+            // Normalize (download branches) before using the branch
+            NormalizeGitDirectory(this.options.Value.Settings.NoFetch, targetBranch, isDynamicRepository);
         }
+    }
 
-        private void CloneRepository(string? repositoryUrl, string? gitDirectory, AuthenticationInfo auth)
+    private void CloneRepository(string? repositoryUrl, string? gitDirectory, AuthenticationInfo auth)
+    {
+        using (this.log.IndentLog($"Cloning repository from url '{repositoryUrl}'"))
         {
-            using (this.log.IndentLog($"Cloning repository from url '{repositoryUrl}'"))
-            {
-                this.retryAction.Execute(() => this.repository.Clone(repositoryUrl, gitDirectory, auth));
-            }
+            this.retryAction.Execute(() => this.repository.Clone(repositoryUrl, gitDirectory, auth));
         }
+    }
+
+    /// <summary>
+    /// Normalization of a git directory turns all remote branches into local branches,
+    /// turns pull request refs into a real branch and a few other things.
+    /// This is designed to be run *only on the build server* which checks out repositories in different ways.
+    /// It is not recommended to run normalization against a local repository
+    /// </summary>
+    private void NormalizeGitDirectory(bool noFetch, string? currentBranchName, bool isDynamicRepository)
+    {
+        var authentication = this.options.Value.Authentication;
+        // Need to ensure the HEAD does not move, this is essentially a BugCheck
+        var expectedSha = this.repository.Head.Tip?.Sha;
+        var expectedBranchName = this.repository.Head.Name.Canonical;
 
-        /// <summary>
-        /// Normalization of a git directory turns all remote branches into local branches,
-        /// turns pull request refs into a real branch and a few other things.
-        /// This is designed to be run *only on the build server* which checks out repositories in different ways.
-        /// It is not recommended to run normalization against a local repository
-        /// </summary>
-        private void NormalizeGitDirectory(bool noFetch, string? currentBranchName, bool isDynamicRepository)
+        try
         {
-            var authentication = this.options.Value.Authentication;
-            // Need to ensure the HEAD does not move, this is essentially a BugCheck
-            var expectedSha = this.repository.Head.Tip?.Sha;
-            var expectedBranchName = this.repository.Head.Name.Canonical;
+            var remote = EnsureOnlyOneRemoteIsDefined();
 
-            try
+            //If noFetch is enabled, then GitVersion will assume that the git repository is normalized before execution, so that fetching from remotes is not required.
+            if (noFetch)
             {
-                var remote = EnsureOnlyOneRemoteIsDefined();
+                this.log.Info("Skipping fetching, if GitVersion does not calculate your version as expected you might need to allow fetching or use dynamic repositories");
+            }
+            else
+            {
+                var refSpecs = string.Join(", ", remote.FetchRefSpecs.Select(r => r.Specification));
+                this.log.Info($"Fetching from remote '{remote.Name}' using the following refspecs: {refSpecs}.");
+                this.retryAction.Execute(() => this.repository.Fetch(remote.Name, Enumerable.Empty<string>(), authentication, null));
+            }
 
-                //If noFetch is enabled, then GitVersion will assume that the git repository is normalized before execution, so that fetching from remotes is not required.
-                if (noFetch)
-                {
-                    this.log.Info("Skipping fetching, if GitVersion does not calculate your version as expected you might need to allow fetching or use dynamic repositories");
-                }
-                else
-                {
-                    var refSpecs = string.Join(", ", remote.FetchRefSpecs.Select(r => r.Specification));
-                    this.log.Info($"Fetching from remote '{remote.Name}' using the following refspecs: {refSpecs}.");
-                    this.retryAction.Execute(() => this.repository.Fetch(remote.Name, Enumerable.Empty<string>(), authentication, null));
-                }
+            EnsureLocalBranchExistsForCurrentBranch(remote, currentBranchName);
+            CreateOrUpdateLocalBranchesFromRemoteTrackingOnes(remote.Name);
 
-                EnsureLocalBranchExistsForCurrentBranch(remote, currentBranchName);
-                CreateOrUpdateLocalBranchesFromRemoteTrackingOnes(remote.Name);
+            var currentBranch = this.repositoryStore.FindBranch(currentBranchName);
+            // Bug fix for https://github.com/GitTools/GitVersion/issues/1754, head maybe have been changed
+            // if this is a dynamic repository. But only allow this in case the branches are different (branch switch)
+            if (expectedSha != this.repository.Head.Tip?.Sha &&
+                (isDynamicRepository || currentBranch is null || !this.repository.Head.Equals(currentBranch)))
+            {
+                var newExpectedSha = this.repository.Head.Tip?.Sha;
+                var newExpectedBranchName = this.repository.Head.Name.Canonical;
 
-                var currentBranch = this.repositoryStore.FindBranch(currentBranchName);
-                // Bug fix for https://github.com/GitTools/GitVersion/issues/1754, head maybe have been changed
-                // if this is a dynamic repository. But only allow this in case the branches are different (branch switch)
-                if (expectedSha != this.repository.Head.Tip?.Sha &&
-                    (isDynamicRepository || currentBranch is null || !this.repository.Head.Equals(currentBranch)))
-                {
-                    var newExpectedSha = this.repository.Head.Tip?.Sha;
-                    var newExpectedBranchName = this.repository.Head.Name.Canonical;
+                this.log.Info($"Head has moved from '{expectedBranchName} | {expectedSha}' => '{newExpectedBranchName} | {newExpectedSha}', allowed since this is a dynamic repository");
 
-                    this.log.Info($"Head has moved from '{expectedBranchName} | {expectedSha}' => '{newExpectedBranchName} | {newExpectedSha}', allowed since this is a dynamic repository");
+                expectedSha = newExpectedSha;
+            }
 
-                    expectedSha = newExpectedSha;
-                }
+            var headSha = this.repository.Refs.Head?.TargetIdentifier;
 
-                var headSha = this.repository.Refs.Head?.TargetIdentifier;
+            if (!this.repository.IsHeadDetached)
+            {
+                this.log.Info($"HEAD points at branch '{headSha}'.");
+                return;
+            }
 
-                if (!this.repository.IsHeadDetached)
-                {
-                    this.log.Info($"HEAD points at branch '{headSha}'.");
-                    return;
-                }
+            this.log.Info($"HEAD is detached and points at commit '{headSha}'.");
+            this.log.Info($"Local Refs:{System.Environment.NewLine}" + string.Join(System.Environment.NewLine, this.repository.Refs.FromGlob("*").Select(r => $"{r.Name.Canonical} ({r.TargetIdentifier})")));
 
-                this.log.Info($"HEAD is detached and points at commit '{headSha}'.");
-                this.log.Info($"Local Refs:{System.Environment.NewLine}" + string.Join(System.Environment.NewLine, this.repository.Refs.FromGlob("*").Select(r => $"{r.Name.Canonical} ({r.TargetIdentifier})")));
+            // In order to decide whether a fake branch is required or not, first check to see if any local branches have the same commit SHA of the head SHA.
+            // If they do, go ahead and checkout that branch
+            // If no, go ahead and check out a new branch, using the known commit SHA as the pointer
+            var localBranchesWhereCommitShaIsHead = this.repository.Branches.Where(b => !b.IsRemote && b.Tip?.Sha == headSha).ToList();
 
-                // In order to decide whether a fake branch is required or not, first check to see if any local branches have the same commit SHA of the head SHA.
-                // If they do, go ahead and checkout that branch
-                // If no, go ahead and check out a new branch, using the known commit SHA as the pointer
-                var localBranchesWhereCommitShaIsHead = this.repository.Branches.Where(b => !b.IsRemote && b.Tip?.Sha == headSha).ToList();
+            var matchingCurrentBranch = !currentBranchName.IsNullOrEmpty()
+                ? localBranchesWhereCommitShaIsHead.SingleOrDefault(b => b.Name.Canonical.Replace("/heads/", "/") == currentBranchName.Replace("/heads/", "/"))
+                : null;
+            if (matchingCurrentBranch != null)
+            {
+                this.log.Info($"Checking out local branch '{currentBranchName}'.");
+                Checkout(matchingCurrentBranch.Name.Canonical);
+            }
+            else if (localBranchesWhereCommitShaIsHead.Count > 1)
+            {
+                var branchNames = localBranchesWhereCommitShaIsHead.Select(r => r.Name.Canonical);
+                var csvNames = string.Join(", ", branchNames);
+                const string moveBranchMsg = "Move one of the branches along a commit to remove warning";
 
-                var matchingCurrentBranch = !currentBranchName.IsNullOrEmpty()
-                    ? localBranchesWhereCommitShaIsHead.SingleOrDefault(b => b.Name.Canonical.Replace("/heads/", "/") == currentBranchName.Replace("/heads/", "/"))
-                    : null;
-                if (matchingCurrentBranch != null)
+                this.log.Warning($"Found more than one local branch pointing at the commit '{headSha}' ({csvNames}).");
+                var main = localBranchesWhereCommitShaIsHead.SingleOrDefault(n => n.Name.EquivalentTo(Config.MainBranchKey));
+                if (main != null)
                 {
-                    this.log.Info($"Checking out local branch '{currentBranchName}'.");
-                    Checkout(matchingCurrentBranch.Name.Canonical);
+                    this.log.Warning("Because one of the branches is 'main', will build main." + moveBranchMsg);
+                    Checkout(Config.MainBranchKey);
                 }
-                else if (localBranchesWhereCommitShaIsHead.Count > 1)
+                else
                 {
-                    var branchNames = localBranchesWhereCommitShaIsHead.Select(r => r.Name.Canonical);
-                    var csvNames = string.Join(", ", branchNames);
-                    const string moveBranchMsg = "Move one of the branches along a commit to remove warning";
-
-                    this.log.Warning($"Found more than one local branch pointing at the commit '{headSha}' ({csvNames}).");
-                    var main = localBranchesWhereCommitShaIsHead.SingleOrDefault(n => n.Name.EquivalentTo(Config.MainBranchKey));
-                    if (main != null)
+                    var branchesWithoutSeparators = localBranchesWhereCommitShaIsHead.Where(b => !b.Name.Friendly.Contains('/') && !b.Name.Friendly.Contains('-')).ToList();
+                    if (branchesWithoutSeparators.Count == 1)
                     {
-                        this.log.Warning("Because one of the branches is 'main', will build main." + moveBranchMsg);
-                        Checkout(Config.MainBranchKey);
+                        var branchWithoutSeparator = branchesWithoutSeparators[0];
+                        this.log.Warning($"Choosing {branchWithoutSeparator.Name.Canonical} as it is the only branch without / or - in it. " + moveBranchMsg);
+                        Checkout(branchWithoutSeparator.Name.Canonical);
                     }
                     else
                     {
-                        var branchesWithoutSeparators = localBranchesWhereCommitShaIsHead.Where(b => !b.Name.Friendly.Contains('/') && !b.Name.Friendly.Contains('-')).ToList();
-                        if (branchesWithoutSeparators.Count == 1)
-                        {
-                            var branchWithoutSeparator = branchesWithoutSeparators[0];
-                            this.log.Warning($"Choosing {branchWithoutSeparator.Name.Canonical} as it is the only branch without / or - in it. " + moveBranchMsg);
-                            Checkout(branchWithoutSeparator.Name.Canonical);
-                        }
-                        else
-                        {
-                            throw new WarningException("Failed to try and guess branch to use. " + moveBranchMsg);
-                        }
+                        throw new WarningException("Failed to try and guess branch to use. " + moveBranchMsg);
                     }
                 }
-                else if (localBranchesWhereCommitShaIsHead.Count == 0)
-                {
-                    this.log.Info($"No local branch pointing at the commit '{headSha}'. Fake branch needs to be created.");
-                    this.retryAction.Execute(() => this.repository.CreateBranchForPullRequestBranch(authentication));
-                }
-                else
-                {
-                    this.log.Info($"Checking out local branch 'refs/heads/{localBranchesWhereCommitShaIsHead[0]}'.");
-                    Checkout(localBranchesWhereCommitShaIsHead[0].Name.Friendly);
-                }
             }
-            finally
+            else if (localBranchesWhereCommitShaIsHead.Count == 0)
+            {
+                this.log.Info($"No local branch pointing at the commit '{headSha}'. Fake branch needs to be created.");
+                this.retryAction.Execute(() => this.repository.CreateBranchForPullRequestBranch(authentication));
+            }
+            else
+            {
+                this.log.Info($"Checking out local branch 'refs/heads/{localBranchesWhereCommitShaIsHead[0]}'.");
+                Checkout(localBranchesWhereCommitShaIsHead[0].Name.Friendly);
+            }
+        }
+        finally
+        {
+            if (this.repository.Head.Tip?.Sha != expectedSha)
             {
-                if (this.repository.Head.Tip?.Sha != expectedSha)
+                if (this.environment.GetEnvironmentVariable("IGNORE_NORMALISATION_GIT_HEAD_MOVE") != "1")
                 {
-                    if (this.environment.GetEnvironmentVariable("IGNORE_NORMALISATION_GIT_HEAD_MOVE") != "1")
-                    {
-                        // Whoa, HEAD has moved, it shouldn't have. We need to blow up because there is a bug in normalisation
-                        throw new BugException($@"GitVersion has a bug, your HEAD has moved after repo normalisation.
+                    // Whoa, HEAD has moved, it shouldn't have. We need to blow up because there is a bug in normalisation
+                    throw new BugException($@"GitVersion has a bug, your HEAD has moved after repo normalisation.
 
 To disable this error set an environmental variable called IGNORE_NORMALISATION_GIT_HEAD_MOVE to 1
 
 Please run `git {GitExtensions.CreateGitLogArgs(100)}` and submit it along with your build log (with personal info removed) in a new issue at https://github.com/GitTools/GitVersion");
-                    }
                 }
             }
         }
+    }
 
-        private IRemote EnsureOnlyOneRemoteIsDefined()
-        {
-            var remotes = this.repository.Remotes;
-            var howMany = remotes.Count();
+    private IRemote EnsureOnlyOneRemoteIsDefined()
+    {
+        var remotes = this.repository.Remotes;
+        var howMany = remotes.Count();
 
-            if (howMany == 1)
-            {
-                var remote = remotes.Single();
-                this.log.Info($"One remote found ({remote.Name} -> '{remote.Url}').");
-                if (remote.FetchRefSpecs.Any(r => r.Source == "refs/heads/*"))
-                    return remote;
-
-                var allBranchesFetchRefSpec = $"+refs/heads/*:refs/remotes/{remote.Name}/*";
-                this.log.Info($"Adding refspec: {allBranchesFetchRefSpec}");
-                remotes.Update(remote.Name, allBranchesFetchRefSpec);
+        if (howMany == 1)
+        {
+            var remote = remotes.Single();
+            this.log.Info($"One remote found ({remote.Name} -> '{remote.Url}').");
+            if (remote.FetchRefSpecs.Any(r => r.Source == "refs/heads/*"))
                 return remote;
-            }
 
-            var message = $"{howMany} remote(s) have been detected. When being run on a build server, the Git repository is expected to bear one (and no more than one) remote.";
-            throw new WarningException(message);
+            var allBranchesFetchRefSpec = $"+refs/heads/*:refs/remotes/{remote.Name}/*";
+            this.log.Info($"Adding refspec: {allBranchesFetchRefSpec}");
+            remotes.Update(remote.Name, allBranchesFetchRefSpec);
+            return remote;
         }
 
-        private void CreateOrUpdateLocalBranchesFromRemoteTrackingOnes(string remoteName)
+        var message = $"{howMany} remote(s) have been detected. When being run on a build server, the Git repository is expected to bear one (and no more than one) remote.";
+        throw new WarningException(message);
+    }
+
+    private void CreateOrUpdateLocalBranchesFromRemoteTrackingOnes(string remoteName)
+    {
+        var prefix = $"refs/remotes/{remoteName}/";
+        var remoteHeadCanonicalName = $"{prefix}HEAD";
+        var headReferenceName = ReferenceName.Parse(remoteHeadCanonicalName);
+        var remoteTrackingReferences = this.repository.Refs
+            .FromGlob(prefix + "*")
+            .Where(r => !r.Name.Equals(headReferenceName));
+
+        foreach (var remoteTrackingReference in remoteTrackingReferences)
         {
-            var prefix = $"refs/remotes/{remoteName}/";
-            var remoteHeadCanonicalName = $"{prefix}HEAD";
-            var headReferenceName = ReferenceName.Parse(remoteHeadCanonicalName);
-            var remoteTrackingReferences = this.repository.Refs
-                .FromGlob(prefix + "*")
-                .Where(r => !r.Name.Equals(headReferenceName));
-
-            foreach (var remoteTrackingReference in remoteTrackingReferences)
-            {
-                var remoteTrackingReferenceName = remoteTrackingReference.Name.Canonical;
-                var branchName = remoteTrackingReferenceName.Substring(prefix.Length);
-                var localCanonicalName = "refs/heads/" + branchName;
+            var remoteTrackingReferenceName = remoteTrackingReference.Name.Canonical;
+            var branchName = remoteTrackingReferenceName.Substring(prefix.Length);
+            var localCanonicalName = "refs/heads/" + branchName;
 
-                var referenceName = ReferenceName.Parse(localCanonicalName);
-                // We do not want to touch our current branch
-                if (this.repository.Head.Name.EquivalentTo(branchName)) continue;
+            var referenceName = ReferenceName.Parse(localCanonicalName);
+            // We do not want to touch our current branch
+            if (this.repository.Head.Name.EquivalentTo(branchName)) continue;
 
-                if (this.repository.Refs.Any(x => x.Name.Equals(referenceName)))
+            if (this.repository.Refs.Any(x => x.Name.Equals(referenceName)))
+            {
+                var localRef = this.repository.Refs[localCanonicalName]!;
+                if (localRef.TargetIdentifier == remoteTrackingReference.TargetIdentifier)
                 {
-                    var localRef = this.repository.Refs[localCanonicalName]!;
-                    if (localRef.TargetIdentifier == remoteTrackingReference.TargetIdentifier)
-                    {
-                        this.log.Info($"Skipping update of '{remoteTrackingReference.Name.Canonical}' as it already matches the remote ref.");
-                        continue;
-                    }
-                    var remoteRefTipId = remoteTrackingReference.ReferenceTargetId!;
-                    this.log.Info($"Updating local ref '{localRef.Name.Canonical}' to point at {remoteRefTipId}.");
-                    this.retryAction.Execute(() => this.repository.Refs.UpdateTarget(localRef, remoteRefTipId));
+                    this.log.Info($"Skipping update of '{remoteTrackingReference.Name.Canonical}' as it already matches the remote ref.");
                     continue;
                 }
+                var remoteRefTipId = remoteTrackingReference.ReferenceTargetId!;
+                this.log.Info($"Updating local ref '{localRef.Name.Canonical}' to point at {remoteRefTipId}.");
+                this.retryAction.Execute(() => this.repository.Refs.UpdateTarget(localRef, remoteRefTipId));
+                continue;
+            }
 
-                this.log.Info($"Creating local branch from remote tracking '{remoteTrackingReference.Name.Canonical}'.");
-                this.repository.Refs.Add(localCanonicalName, remoteTrackingReference.TargetIdentifier, true);
+            this.log.Info($"Creating local branch from remote tracking '{remoteTrackingReference.Name.Canonical}'.");
+            this.repository.Refs.Add(localCanonicalName, remoteTrackingReference.TargetIdentifier, true);
 
-                var branch = this.repository.Branches[branchName]!;
-                this.repository.Branches.UpdateTrackedBranch(branch, remoteTrackingReferenceName);
-            }
+            var branch = this.repository.Branches[branchName]!;
+            this.repository.Branches.UpdateTrackedBranch(branch, remoteTrackingReferenceName);
         }
+    }
 
-        public void EnsureLocalBranchExistsForCurrentBranch(IRemote? remote, string? currentBranch)
+    public void EnsureLocalBranchExistsForCurrentBranch(IRemote? remote, string? currentBranch)
+    {
+        if (remote is null)
         {
-            if (remote is null)
-            {
-                throw new ArgumentNullException(nameof(remote));
-            }
-
-            if (currentBranch.IsNullOrEmpty()) return;
+            throw new ArgumentNullException(nameof(remote));
+        }
 
-            var isRef = currentBranch.Contains("refs");
-            var isBranch = currentBranch.Contains("refs/heads");
-            var localCanonicalName = !isRef
-                ? "refs/heads/" + currentBranch
-                : isBranch
-                    ? currentBranch
-                    : currentBranch.Replace("refs/", "refs/heads/");
+        if (currentBranch.IsNullOrEmpty()) return;
 
-            var repoTip = this.repository.Head.Tip;
+        var isRef = currentBranch.Contains("refs");
+        var isBranch = currentBranch.Contains("refs/heads");
+        var localCanonicalName = !isRef
+            ? "refs/heads/" + currentBranch
+            : isBranch
+                ? currentBranch
+                : currentBranch.Replace("refs/", "refs/heads/");
 
-            // We currently have the rep.Head of the *default* branch, now we need to look up the right one
-            var originCanonicalName = $"{remote.Name}/{currentBranch}";
-            var originBranch = this.repository.Branches[originCanonicalName];
-            if (originBranch != null)
-            {
-                repoTip = originBranch.Tip;
-            }
+        var repoTip = this.repository.Head.Tip;
 
-            var repoTipId = repoTip!.Id;
+        // We currently have the rep.Head of the *default* branch, now we need to look up the right one
+        var originCanonicalName = $"{remote.Name}/{currentBranch}";
+        var originBranch = this.repository.Branches[originCanonicalName];
+        if (originBranch != null)
+        {
+            repoTip = originBranch.Tip;
+        }
 
-            var referenceName = ReferenceName.Parse(localCanonicalName);
-            if (this.repository.Branches.All(b => !b.Name.Equals(referenceName)))
-            {
-                this.log.Info(isBranch ? $"Creating local branch {referenceName}"
-                    : $"Creating local branch {referenceName} pointing at {repoTipId}");
-                this.repository.Refs.Add(localCanonicalName, repoTipId.Sha);
-            }
-            else
-            {
-                this.log.Info(isBranch ? $"Updating local branch {referenceName} to point at {repoTip}"
-                    : $"Updating local branch {referenceName} to match ref {currentBranch}");
-                var localRef = this.repository.Refs[localCanonicalName]!;
-                this.retryAction.Execute(() => this.repository.Refs.UpdateTarget(localRef, repoTipId));
-            }
+        var repoTipId = repoTip!.Id;
 
-            Checkout(localCanonicalName);
+        var referenceName = ReferenceName.Parse(localCanonicalName);
+        if (this.repository.Branches.All(b => !b.Name.Equals(referenceName)))
+        {
+            this.log.Info(isBranch ? $"Creating local branch {referenceName}"
+                : $"Creating local branch {referenceName} pointing at {repoTipId}");
+            this.repository.Refs.Add(localCanonicalName, repoTipId.Sha);
+        }
+        else
+        {
+            this.log.Info(isBranch ? $"Updating local branch {referenceName} to point at {repoTip}"
+                : $"Updating local branch {referenceName} to match ref {currentBranch}");
+            var localRef = this.repository.Refs[localCanonicalName]!;
+            this.retryAction.Execute(() => this.repository.Refs.UpdateTarget(localRef, repoTipId));
         }
 
-        private void Checkout(string commitOrBranchSpec) => this.retryAction.Execute(() => this.repository.Checkout(commitOrBranchSpec));
+        Checkout(localCanonicalName);
     }
-}
+
+    private void Checkout(string commitOrBranchSpec) => this.retryAction.Execute(() => this.repository.Checkout(commitOrBranchSpec));
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/GitVersionCalculateTool.cs b/src/GitVersion.Core/Core/GitVersionCalculateTool.cs
index 5c20e546c6..afffb8a661 100644
--- a/src/GitVersion.Core/Core/GitVersionCalculateTool.cs
+++ b/src/GitVersion.Core/Core/GitVersionCalculateTool.cs
@@ -5,64 +5,63 @@
 using GitVersion.VersionCalculation.Cache;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion
-{
-    public class GitVersionCalculateTool : IGitVersionCalculateTool
-    {
-        private readonly ILog log;
-        private readonly IGitVersionCache gitVersionCache;
-        private readonly INextVersionCalculator nextVersionCalculator;
-        private readonly IVariableProvider variableProvider;
-        private readonly IGitPreparer gitPreparer;
-        private readonly IGitVersionCacheKeyFactory cacheKeyFactory;
+namespace GitVersion;
 
-        private readonly IOptions<GitVersionOptions> options;
-        private readonly Lazy<GitVersionContext> versionContext;
-        private GitVersionContext context => this.versionContext.Value;
+public class GitVersionCalculateTool : IGitVersionCalculateTool
+{
+    private readonly ILog log;
+    private readonly IGitVersionCache gitVersionCache;
+    private readonly INextVersionCalculator nextVersionCalculator;
+    private readonly IVariableProvider variableProvider;
+    private readonly IGitPreparer gitPreparer;
+    private readonly IGitVersionCacheKeyFactory cacheKeyFactory;
 
-        public GitVersionCalculateTool(ILog log, INextVersionCalculator nextVersionCalculator,
-            IVariableProvider variableProvider, IGitPreparer gitPreparer,
-            IGitVersionCache gitVersionCache, IGitVersionCacheKeyFactory cacheKeyFactory,
-            IOptions<GitVersionOptions> options, Lazy<GitVersionContext> versionContext)
-        {
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
+    private readonly IOptions<GitVersionOptions> options;
+    private readonly Lazy<GitVersionContext> versionContext;
+    private GitVersionContext context => this.versionContext.Value;
 
-            this.nextVersionCalculator = nextVersionCalculator ?? throw new ArgumentNullException(nameof(nextVersionCalculator));
-            this.variableProvider = variableProvider ?? throw new ArgumentNullException(nameof(variableProvider));
-            this.gitPreparer = gitPreparer ?? throw new ArgumentNullException(nameof(gitPreparer));
+    public GitVersionCalculateTool(ILog log, INextVersionCalculator nextVersionCalculator,
+        IVariableProvider variableProvider, IGitPreparer gitPreparer,
+        IGitVersionCache gitVersionCache, IGitVersionCacheKeyFactory cacheKeyFactory,
+        IOptions<GitVersionOptions> options, Lazy<GitVersionContext> versionContext)
+    {
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
 
-            this.cacheKeyFactory = cacheKeyFactory ?? throw new ArgumentNullException(nameof(cacheKeyFactory));
-            this.gitVersionCache = gitVersionCache ?? throw new ArgumentNullException(nameof(gitVersionCache));
+        this.nextVersionCalculator = nextVersionCalculator ?? throw new ArgumentNullException(nameof(nextVersionCalculator));
+        this.variableProvider = variableProvider ?? throw new ArgumentNullException(nameof(variableProvider));
+        this.gitPreparer = gitPreparer ?? throw new ArgumentNullException(nameof(gitPreparer));
 
-            this.options = options ?? throw new ArgumentNullException(nameof(options));
-            this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
-        }
+        this.cacheKeyFactory = cacheKeyFactory ?? throw new ArgumentNullException(nameof(cacheKeyFactory));
+        this.gitVersionCache = gitVersionCache ?? throw new ArgumentNullException(nameof(gitVersionCache));
 
-        public VersionVariables CalculateVersionVariables()
-        {
-            this.gitPreparer.Prepare(); //we need to prepare the repository before using it for version calculation
+        this.options = options ?? throw new ArgumentNullException(nameof(options));
+        this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
+    }
 
-            var gitVersionOptions = this.options.Value;
+    public VersionVariables CalculateVersionVariables()
+    {
+        this.gitPreparer.Prepare(); //we need to prepare the repository before using it for version calculation
 
-            var cacheKey = this.cacheKeyFactory.Create(gitVersionOptions.ConfigInfo.OverrideConfig);
-            var versionVariables = gitVersionOptions.Settings.NoCache ? default : this.gitVersionCache.LoadVersionVariablesFromDiskCache(cacheKey);
+        var gitVersionOptions = this.options.Value;
 
-            if (versionVariables != null) return versionVariables;
+        var cacheKey = this.cacheKeyFactory.Create(gitVersionOptions.ConfigInfo.OverrideConfig);
+        var versionVariables = gitVersionOptions.Settings.NoCache ? default : this.gitVersionCache.LoadVersionVariablesFromDiskCache(cacheKey);
 
-            var semanticVersion = this.nextVersionCalculator.FindVersion();
-            versionVariables = this.variableProvider.GetVariablesFor(semanticVersion, context.Configuration!, context.IsCurrentCommitTagged);
+        if (versionVariables != null) return versionVariables;
 
-            if (gitVersionOptions.Settings.NoCache) return versionVariables;
-            try
-            {
-                this.gitVersionCache.WriteVariablesToDiskCache(cacheKey, versionVariables);
-            }
-            catch (AggregateException e)
-            {
-                this.log.Warning($"One or more exceptions during cache write:{System.Environment.NewLine}{e}");
-            }
+        var semanticVersion = this.nextVersionCalculator.FindVersion();
+        versionVariables = this.variableProvider.GetVariablesFor(semanticVersion, context.Configuration!, context.IsCurrentCommitTagged);
 
-            return versionVariables;
+        if (gitVersionOptions.Settings.NoCache) return versionVariables;
+        try
+        {
+            this.gitVersionCache.WriteVariablesToDiskCache(cacheKey, versionVariables);
         }
+        catch (AggregateException e)
+        {
+            this.log.Warning($"One or more exceptions during cache write:{System.Environment.NewLine}{e}");
+        }
+
+        return versionVariables;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/GitVersionContextFactory.cs b/src/GitVersion.Core/Core/GitVersionContextFactory.cs
index d6af78eb92..b403f11a72 100644
--- a/src/GitVersion.Core/Core/GitVersionContextFactory.cs
+++ b/src/GitVersion.Core/Core/GitVersionContextFactory.cs
@@ -4,45 +4,44 @@
 using GitVersion.Extensions;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class GitVersionContextFactory : IGitVersionContextFactory
 {
-    public class GitVersionContextFactory : IGitVersionContextFactory
-    {
-        private readonly IConfigProvider configProvider;
-        private readonly IRepositoryStore repositoryStore;
-        private readonly IBranchConfigurationCalculator branchConfigurationCalculator;
-        private readonly IOptions<GitVersionOptions> options;
+    private readonly IConfigProvider configProvider;
+    private readonly IRepositoryStore repositoryStore;
+    private readonly IBranchConfigurationCalculator branchConfigurationCalculator;
+    private readonly IOptions<GitVersionOptions> options;
 
-        public GitVersionContextFactory(IConfigProvider configProvider, IRepositoryStore repositoryStore, IBranchConfigurationCalculator branchConfigurationCalculator, IOptions<GitVersionOptions> options)
-        {
-            this.configProvider = configProvider ?? throw new ArgumentNullException(nameof(configProvider));
-            this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
-            this.branchConfigurationCalculator = branchConfigurationCalculator ?? throw new ArgumentNullException(nameof(branchConfigurationCalculator));
-            this.options = options ?? throw new ArgumentNullException(nameof(options));
-        }
+    public GitVersionContextFactory(IConfigProvider configProvider, IRepositoryStore repositoryStore, IBranchConfigurationCalculator branchConfigurationCalculator, IOptions<GitVersionOptions> options)
+    {
+        this.configProvider = configProvider ?? throw new ArgumentNullException(nameof(configProvider));
+        this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
+        this.branchConfigurationCalculator = branchConfigurationCalculator ?? throw new ArgumentNullException(nameof(branchConfigurationCalculator));
+        this.options = options ?? throw new ArgumentNullException(nameof(options));
+    }
 
-        public GitVersionContext Create(GitVersionOptions? gitVersionOptions)
-        {
-            var currentBranch = this.repositoryStore.GetTargetBranch(gitVersionOptions?.RepositoryInfo.TargetBranch);
-            if (currentBranch == null)
-                throw new InvalidOperationException("Need a branch to operate on");
+    public GitVersionContext Create(GitVersionOptions? gitVersionOptions)
+    {
+        var currentBranch = this.repositoryStore.GetTargetBranch(gitVersionOptions?.RepositoryInfo.TargetBranch);
+        if (currentBranch == null)
+            throw new InvalidOperationException("Need a branch to operate on");
 
-            var configuration = this.configProvider.Provide(overrideConfig: this.options.Value.ConfigInfo.OverrideConfig);
+        var configuration = this.configProvider.Provide(overrideConfig: this.options.Value.ConfigInfo.OverrideConfig);
 
-            var currentCommit = this.repositoryStore.GetCurrentCommit(currentBranch, gitVersionOptions?.RepositoryInfo.CommitId);
+        var currentCommit = this.repositoryStore.GetCurrentCommit(currentBranch, gitVersionOptions?.RepositoryInfo.CommitId);
 
-            if (currentBranch.IsDetachedHead)
-            {
-                var branchForCommit = this.repositoryStore.GetBranchesContainingCommit(currentCommit, onlyTrackedBranches: gitVersionOptions?.Settings.OnlyTrackedBranches == true).OnlyOrDefault();
-                currentBranch = branchForCommit ?? currentBranch;
-            }
+        if (currentBranch.IsDetachedHead)
+        {
+            var branchForCommit = this.repositoryStore.GetBranchesContainingCommit(currentCommit, onlyTrackedBranches: gitVersionOptions?.Settings.OnlyTrackedBranches == true).OnlyOrDefault();
+            currentBranch = branchForCommit ?? currentBranch;
+        }
 
-            var currentBranchConfig = this.branchConfigurationCalculator.GetBranchConfiguration(currentBranch, currentCommit, configuration);
-            var effectiveConfiguration = configuration.CalculateEffectiveConfiguration(currentBranchConfig);
-            var currentCommitTaggedVersion = this.repositoryStore.GetCurrentCommitTaggedVersion(currentCommit, effectiveConfiguration);
-            var numberOfUncommittedChanges = this.repositoryStore.GetNumberOfUncommittedChanges();
+        var currentBranchConfig = this.branchConfigurationCalculator.GetBranchConfiguration(currentBranch, currentCommit, configuration);
+        var effectiveConfiguration = configuration.CalculateEffectiveConfiguration(currentBranchConfig);
+        var currentCommitTaggedVersion = this.repositoryStore.GetCurrentCommitTaggedVersion(currentCommit, effectiveConfiguration);
+        var numberOfUncommittedChanges = this.repositoryStore.GetNumberOfUncommittedChanges();
 
-            return new GitVersionContext(currentBranch, currentCommit, configuration, effectiveConfiguration, currentCommitTaggedVersion, numberOfUncommittedChanges);
-        }
+        return new GitVersionContext(currentBranch, currentCommit, configuration, effectiveConfiguration, currentCommitTaggedVersion, numberOfUncommittedChanges);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/GitVersionModule.cs b/src/GitVersion.Core/Core/GitVersionModule.cs
index 0b455f61cc..c11a181b98 100644
--- a/src/GitVersion.Core/Core/GitVersionModule.cs
+++ b/src/GitVersion.Core/Core/GitVersionModule.cs
@@ -4,16 +4,15 @@
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GitVersion
+namespace GitVersion;
+
+public abstract class GitVersionModule : IGitVersionModule
 {
-    public abstract class GitVersionModule : IGitVersionModule
-    {
-        public abstract void RegisterTypes(IServiceCollection services);
+    public abstract void RegisterTypes(IServiceCollection services);
 
-        protected static IEnumerable<Type> FindAllDerivedTypes<T>(Assembly assembly)
-        {
-            var derivedType = typeof(T);
-            return assembly.GetTypes().Where(t => t != derivedType && derivedType.IsAssignableFrom(t));
-        }
+    protected static IEnumerable<Type> FindAllDerivedTypes<T>(Assembly assembly)
+    {
+        var derivedType = typeof(T);
+        return assembly.GetTypes().Where(t => t != derivedType && derivedType.IsAssignableFrom(t));
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/GitVersionOutputTool.cs b/src/GitVersion.Core/Core/GitVersionOutputTool.cs
index 337cef8c26..449024e383 100644
--- a/src/GitVersion.Core/Core/GitVersionOutputTool.cs
+++ b/src/GitVersion.Core/Core/GitVersionOutputTool.cs
@@ -7,84 +7,83 @@
 using GitVersion.VersionConverters.WixUpdater;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class GitVersionOutputTool : IGitVersionOutputTool
 {
-    public class GitVersionOutputTool : IGitVersionOutputTool
+    private readonly IOptions<GitVersionOptions> options;
+    private readonly IOutputGenerator outputGenerator;
+    private readonly IWixVersionFileUpdater wixVersionFileUpdater;
+    private readonly IGitVersionInfoGenerator gitVersionInfoGenerator;
+    private readonly IAssemblyInfoFileUpdater assemblyInfoFileUpdater;
+    private readonly IProjectFileUpdater projectFileUpdater;
+
+    public GitVersionOutputTool(IOptions<GitVersionOptions> options,
+        IOutputGenerator outputGenerator, IWixVersionFileUpdater wixVersionFileUpdater,
+        IGitVersionInfoGenerator gitVersionInfoGenerator, IAssemblyInfoFileUpdater assemblyInfoFileUpdater,
+        IProjectFileUpdater projectFileUpdater)
     {
-        private readonly IOptions<GitVersionOptions> options;
-        private readonly IOutputGenerator outputGenerator;
-        private readonly IWixVersionFileUpdater wixVersionFileUpdater;
-        private readonly IGitVersionInfoGenerator gitVersionInfoGenerator;
-        private readonly IAssemblyInfoFileUpdater assemblyInfoFileUpdater;
-        private readonly IProjectFileUpdater projectFileUpdater;
+        this.options = options ?? throw new ArgumentNullException(nameof(options));
 
-        public GitVersionOutputTool(IOptions<GitVersionOptions> options,
-            IOutputGenerator outputGenerator, IWixVersionFileUpdater wixVersionFileUpdater,
-            IGitVersionInfoGenerator gitVersionInfoGenerator, IAssemblyInfoFileUpdater assemblyInfoFileUpdater,
-            IProjectFileUpdater projectFileUpdater)
-        {
-            this.options = options ?? throw new ArgumentNullException(nameof(options));
+        this.outputGenerator = outputGenerator ?? throw new ArgumentNullException(nameof(outputGenerator));
 
-            this.outputGenerator = outputGenerator ?? throw new ArgumentNullException(nameof(outputGenerator));
+        this.wixVersionFileUpdater = wixVersionFileUpdater ?? throw new ArgumentNullException(nameof(wixVersionFileUpdater));
+        this.gitVersionInfoGenerator = gitVersionInfoGenerator ?? throw new ArgumentNullException(nameof(gitVersionInfoGenerator));
+        this.assemblyInfoFileUpdater = assemblyInfoFileUpdater ?? throw new ArgumentNullException(nameof(gitVersionInfoGenerator));
+        this.projectFileUpdater = projectFileUpdater ?? throw new ArgumentNullException(nameof(projectFileUpdater));
+    }
 
-            this.wixVersionFileUpdater = wixVersionFileUpdater ?? throw new ArgumentNullException(nameof(wixVersionFileUpdater));
-            this.gitVersionInfoGenerator = gitVersionInfoGenerator ?? throw new ArgumentNullException(nameof(gitVersionInfoGenerator));
-            this.assemblyInfoFileUpdater = assemblyInfoFileUpdater ?? throw new ArgumentNullException(nameof(gitVersionInfoGenerator));
-            this.projectFileUpdater = projectFileUpdater ?? throw new ArgumentNullException(nameof(projectFileUpdater));
-        }
+    public void OutputVariables(VersionVariables variables, bool updateBuildNumber)
+    {
+        var gitVersionOptions = this.options.Value;
 
-        public void OutputVariables(VersionVariables variables, bool updateBuildNumber)
+        using (this.outputGenerator)
         {
-            var gitVersionOptions = this.options.Value;
-
-            using (this.outputGenerator)
-            {
-                this.outputGenerator.Execute(variables, new OutputContext(gitVersionOptions.WorkingDirectory, gitVersionOptions.OutputFile, updateBuildNumber));
-            }
+            this.outputGenerator.Execute(variables, new OutputContext(gitVersionOptions.WorkingDirectory, gitVersionOptions.OutputFile, updateBuildNumber));
         }
+    }
 
-        public void UpdateAssemblyInfo(VersionVariables variables)
-        {
-            var gitVersionOptions = this.options.Value!;
-            var assemblyInfoContext = new AssemblyInfoContext(gitVersionOptions.WorkingDirectory, gitVersionOptions.AssemblyInfo.EnsureAssemblyInfo, gitVersionOptions.AssemblyInfo.Files.ToArray());
+    public void UpdateAssemblyInfo(VersionVariables variables)
+    {
+        var gitVersionOptions = this.options.Value!;
+        var assemblyInfoContext = new AssemblyInfoContext(gitVersionOptions.WorkingDirectory, gitVersionOptions.AssemblyInfo.EnsureAssemblyInfo, gitVersionOptions.AssemblyInfo.Files.ToArray());
 
-            if (gitVersionOptions.AssemblyInfo.UpdateProjectFiles)
+        if (gitVersionOptions.AssemblyInfo.UpdateProjectFiles)
+        {
+            using (this.projectFileUpdater)
             {
-                using (this.projectFileUpdater)
-                {
-                    this.projectFileUpdater.Execute(variables, assemblyInfoContext);
-                }
+                this.projectFileUpdater.Execute(variables, assemblyInfoContext);
             }
-            else if (gitVersionOptions.AssemblyInfo.UpdateAssemblyInfo)
+        }
+        else if (gitVersionOptions.AssemblyInfo.UpdateAssemblyInfo)
+        {
+            using (this.assemblyInfoFileUpdater)
             {
-                using (this.assemblyInfoFileUpdater)
-                {
-                    this.assemblyInfoFileUpdater.Execute(variables, assemblyInfoContext);
-                }
+                this.assemblyInfoFileUpdater.Execute(variables, assemblyInfoContext);
             }
         }
+    }
 
-        public void UpdateWixVersionFile(VersionVariables variables)
-        {
-            var gitVersionOptions = this.options.Value;
+    public void UpdateWixVersionFile(VersionVariables variables)
+    {
+        var gitVersionOptions = this.options.Value;
 
-            if (gitVersionOptions.WixInfo.ShouldUpdate)
+        if (gitVersionOptions.WixInfo.ShouldUpdate)
+        {
+            using (this.wixVersionFileUpdater)
             {
-                using (this.wixVersionFileUpdater)
-                {
-                    this.wixVersionFileUpdater.Execute(variables, new WixVersionContext(gitVersionOptions.WorkingDirectory));
-                }
+                this.wixVersionFileUpdater.Execute(variables, new WixVersionContext(gitVersionOptions.WorkingDirectory));
             }
         }
+    }
 
-        public void GenerateGitVersionInformation(VersionVariables variables, FileWriteInfo fileWriteInfo)
-        {
-            var gitVersionOptions = this.options.Value;
+    public void GenerateGitVersionInformation(VersionVariables variables, FileWriteInfo fileWriteInfo)
+    {
+        var gitVersionOptions = this.options.Value;
 
-            using (this.gitVersionInfoGenerator)
-            {
-                this.gitVersionInfoGenerator.Execute(variables, new GitVersionInfoContext(gitVersionOptions.WorkingDirectory, fileWriteInfo.FileName, fileWriteInfo.FileExtension));
-            }
+        using (this.gitVersionInfoGenerator)
+        {
+            this.gitVersionInfoGenerator.Execute(variables, new GitVersionInfoContext(gitVersionOptions.WorkingDirectory, fileWriteInfo.FileName, fileWriteInfo.FileExtension));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Core/RepositoryStore.cs b/src/GitVersion.Core/Core/RepositoryStore.cs
index c819bbe8af..1a0fa0b8c8 100644
--- a/src/GitVersion.Core/Core/RepositoryStore.cs
+++ b/src/GitVersion.Core/Core/RepositoryStore.cs
@@ -9,487 +9,486 @@
 using GitVersion.Model.Configuration;
 using GitVersion.VersionCalculation;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class RepositoryStore : IRepositoryStore
 {
-    public class RepositoryStore : IRepositoryStore
+    private readonly Dictionary<IBranch, List<BranchCommit>> mergeBaseCommitsCache = new();
+    private readonly Dictionary<Tuple<IBranch, IBranch?>, ICommit?> mergeBaseCache = new();
+    private readonly Dictionary<IBranch, List<SemanticVersion>> semanticVersionTagsOnBranchCache = new();
+    private const string MissingTipFormat = "{0} has no tip. Please see http://example.com/docs for information on how to fix this.";
+
+    private readonly ILog log;
+    private readonly IGitRepository repository;
+    private readonly IIncrementStrategyFinder incrementStrategyFinder;
+
+    public RepositoryStore(ILog log, IGitRepository repository, IIncrementStrategyFinder incrementStrategyFinder)
     {
-        private readonly Dictionary<IBranch, List<BranchCommit>> mergeBaseCommitsCache = new();
-        private readonly Dictionary<Tuple<IBranch, IBranch?>, ICommit?> mergeBaseCache = new();
-        private readonly Dictionary<IBranch, List<SemanticVersion>> semanticVersionTagsOnBranchCache = new();
-        private const string MissingTipFormat = "{0} has no tip. Please see http://example.com/docs for information on how to fix this.";
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
+        this.repository = repository ?? throw new ArgumentNullException(nameof(log));
+        this.incrementStrategyFinder = incrementStrategyFinder ?? throw new ArgumentNullException(nameof(incrementStrategyFinder));
+    }
 
-        private readonly ILog log;
-        private readonly IGitRepository repository;
-        private readonly IIncrementStrategyFinder incrementStrategyFinder;
+    /// <summary>
+    /// Find the merge base of the two branches, i.e. the best common ancestor of the two branches' tips.
+    /// </summary>
+    public ICommit? FindMergeBase(IBranch branch, IBranch? otherBranch)
+    {
+        var key = Tuple.Create(branch, otherBranch);
 
-        public RepositoryStore(ILog log, IGitRepository repository, IIncrementStrategyFinder incrementStrategyFinder)
+        if (this.mergeBaseCache.ContainsKey(key))
         {
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.repository = repository ?? throw new ArgumentNullException(nameof(log));
-            this.incrementStrategyFinder = incrementStrategyFinder ?? throw new ArgumentNullException(nameof(incrementStrategyFinder));
+            this.log.Debug($"Cache hit for merge base between '{branch}' and '{otherBranch}'.");
+            return this.mergeBaseCache[key];
         }
 
-        /// <summary>
-        /// Find the merge base of the two branches, i.e. the best common ancestor of the two branches' tips.
-        /// </summary>
-        public ICommit? FindMergeBase(IBranch branch, IBranch? otherBranch)
+        using (this.log.IndentLog($"Finding merge base between '{branch}' and '{otherBranch}'."))
         {
-            var key = Tuple.Create(branch, otherBranch);
-
-            if (this.mergeBaseCache.ContainsKey(key))
+            // Other branch tip is a forward merge
+            var commitToFindCommonBase = otherBranch?.Tip;
+            var commit = branch.Tip!;
+            if (commitToFindCommonBase?.Parents.Contains(commit) == true)
             {
-                this.log.Debug($"Cache hit for merge base between '{branch}' and '{otherBranch}'.");
-                return this.mergeBaseCache[key];
+                commitToFindCommonBase = otherBranch!.Tip!.Parents.First();
             }
 
-            using (this.log.IndentLog($"Finding merge base between '{branch}' and '{otherBranch}'."))
+            var findMergeBase = FindMergeBase(commit, commitToFindCommonBase!);
+            if (findMergeBase != null)
             {
-                // Other branch tip is a forward merge
-                var commitToFindCommonBase = otherBranch?.Tip;
-                var commit = branch.Tip!;
-                if (commitToFindCommonBase?.Parents.Contains(commit) == true)
+                this.log.Info($"Found merge base of {findMergeBase}");
+                // We do not want to include merge base commits which got forward merged into the other branch
+                ICommit forwardMerge;
+                do
                 {
-                    commitToFindCommonBase = otherBranch!.Tip!.Parents.First();
-                }
+                    // Now make sure that the merge base is not a forward merge
+                    forwardMerge = GetForwardMerge(commitToFindCommonBase, findMergeBase);
 
-                var findMergeBase = FindMergeBase(commit, commitToFindCommonBase!);
-                if (findMergeBase != null)
-                {
-                    this.log.Info($"Found merge base of {findMergeBase}");
-                    // We do not want to include merge base commits which got forward merged into the other branch
-                    ICommit forwardMerge;
-                    do
+                    if (forwardMerge != null)
                     {
-                        // Now make sure that the merge base is not a forward merge
-                        forwardMerge = GetForwardMerge(commitToFindCommonBase, findMergeBase);
-
-                        if (forwardMerge != null)
+                        // TODO Fix the logging up in this section
+                        var second = forwardMerge.Parents.First();
+                        this.log.Debug($"Second {second}");
+                        var mergeBase = FindMergeBase(commit, second);
+                        if (mergeBase == null)
                         {
-                            // TODO Fix the logging up in this section
-                            var second = forwardMerge.Parents.First();
-                            this.log.Debug($"Second {second}");
-                            var mergeBase = FindMergeBase(commit, second);
-                            if (mergeBase == null)
-                            {
-                                this.log.Warning("Could not find mergbase for " + commit);
-                            }
-                            else
-                            {
-                                this.log.Debug($"New Merge base {mergeBase}");
-                            }
-                            if (Equals(mergeBase, findMergeBase))
-                            {
-                                this.log.Debug("Breaking");
-                                break;
-                            }
-                            findMergeBase = mergeBase;
-                            commitToFindCommonBase = second;
-                            this.log.Info($"Merge base was due to a forward merge, next merge base is {findMergeBase}");
+                            this.log.Warning("Could not find mergbase for " + commit);
                         }
-                    } while (forwardMerge != null);
-                }
+                        else
+                        {
+                            this.log.Debug($"New Merge base {mergeBase}");
+                        }
+                        if (Equals(mergeBase, findMergeBase))
+                        {
+                            this.log.Debug("Breaking");
+                            break;
+                        }
+                        findMergeBase = mergeBase;
+                        commitToFindCommonBase = second;
+                        this.log.Info($"Merge base was due to a forward merge, next merge base is {findMergeBase}");
+                    }
+                } while (forwardMerge != null);
+            }
 
-                // Store in cache.
-                this.mergeBaseCache.Add(key, findMergeBase);
+            // Store in cache.
+            this.mergeBaseCache.Add(key, findMergeBase);
 
-                this.log.Info($"Merge base of {branch}' and '{otherBranch} is {findMergeBase}");
-                return findMergeBase;
-            }
+            this.log.Info($"Merge base of {branch}' and '{otherBranch} is {findMergeBase}");
+            return findMergeBase;
         }
+    }
 
-        public ICommit? GetCurrentCommit(IBranch currentBranch, string? commitId)
+    public ICommit? GetCurrentCommit(IBranch currentBranch, string? commitId)
+    {
+        ICommit? currentCommit = null;
+        if (!commitId.IsNullOrWhiteSpace())
         {
-            ICommit? currentCommit = null;
-            if (!commitId.IsNullOrWhiteSpace())
-            {
-                this.log.Info($"Searching for specific commit '{commitId}'");
+            this.log.Info($"Searching for specific commit '{commitId}'");
 
-                var commit = this.repository.Commits.FirstOrDefault(c => string.Equals(c.Sha, commitId, StringComparison.OrdinalIgnoreCase));
-                if (commit != null)
-                {
-                    currentCommit = commit;
-                }
-                else
-                {
-                    this.log.Warning($"Commit '{commitId}' specified but not found");
-                }
-            }
-
-            if (currentCommit == null)
+            var commit = this.repository.Commits.FirstOrDefault(c => string.Equals(c.Sha, commitId, StringComparison.OrdinalIgnoreCase));
+            if (commit != null)
             {
-                this.log.Info("Using latest commit on specified branch");
-                currentCommit = currentBranch.Tip;
-            }
-
-            return currentCommit;
-        }
-        public ICommit GetBaseVersionSource(ICommit currentBranchTip)
-        {
-            try
-            {
-                var filter = new CommitFilter
-                {
-                    IncludeReachableFrom = currentBranchTip
-                };
-                var commitCollection = this.repository.Commits.QueryBy(filter);
-
-                return commitCollection.First(c => !c.Parents.Any());
+                currentCommit = commit;
             }
-            catch (Exception exception)
+            else
             {
-                throw new GitVersionException($"Cannot find commit {currentBranchTip}. Please ensure that the repository is an unshallow clone with `git fetch --unshallow`.", exception);
+                this.log.Warning($"Commit '{commitId}' specified but not found");
             }
         }
-        public IEnumerable<ICommit> GetMainlineCommitLog(ICommit? baseVersionSource, ICommit? mainlineTip)
-        {
-            var filter = new CommitFilter
-            {
-                IncludeReachableFrom = mainlineTip,
-                ExcludeReachableFrom = baseVersionSource,
-                SortBy = CommitSortStrategies.Reverse,
-                FirstParentOnly = true
-            };
 
-            return this.repository.Commits.QueryBy(filter);
+        if (currentCommit == null)
+        {
+            this.log.Info("Using latest commit on specified branch");
+            currentCommit = currentBranch.Tip;
         }
-        public IEnumerable<ICommit> GetMergeBaseCommits(ICommit? mergeCommit, ICommit? mergedHead, ICommit? findMergeBase)
+
+        return currentCommit;
+    }
+    public ICommit GetBaseVersionSource(ICommit currentBranchTip)
+    {
+        try
         {
             var filter = new CommitFilter
             {
-                IncludeReachableFrom = mergedHead,
-                ExcludeReachableFrom = findMergeBase
+                IncludeReachableFrom = currentBranchTip
             };
             var commitCollection = this.repository.Commits.QueryBy(filter);
 
-            var commits = mergeCommit != null
-                ? new[]
-                {
-                    mergeCommit
-                }.Union(commitCollection)
-                : commitCollection;
-            return commits;
+            return commitCollection.First(c => !c.Parents.Any());
         }
+        catch (Exception exception)
+        {
+            throw new GitVersionException($"Cannot find commit {currentBranchTip}. Please ensure that the repository is an unshallow clone with `git fetch --unshallow`.", exception);
+        }
+    }
+    public IEnumerable<ICommit> GetMainlineCommitLog(ICommit? baseVersionSource, ICommit? mainlineTip)
+    {
+        var filter = new CommitFilter
+        {
+            IncludeReachableFrom = mainlineTip,
+            ExcludeReachableFrom = baseVersionSource,
+            SortBy = CommitSortStrategies.Reverse,
+            FirstParentOnly = true
+        };
 
-        public IBranch GetTargetBranch(string? targetBranchName)
+        return this.repository.Commits.QueryBy(filter);
+    }
+    public IEnumerable<ICommit> GetMergeBaseCommits(ICommit? mergeCommit, ICommit? mergedHead, ICommit? findMergeBase)
+    {
+        var filter = new CommitFilter
         {
-            // By default, we assume HEAD is pointing to the desired branch
-            var desiredBranch = this.repository.Head;
+            IncludeReachableFrom = mergedHead,
+            ExcludeReachableFrom = findMergeBase
+        };
+        var commitCollection = this.repository.Commits.QueryBy(filter);
 
-            // Make sure the desired branch has been specified
-            if (!targetBranchName.IsNullOrEmpty())
+        var commits = mergeCommit != null
+            ? new[]
             {
-                // There are some edge cases where HEAD is not pointing to the desired branch.
-                // Therefore it's important to verify if 'currentBranch' is indeed the desired branch.
+                mergeCommit
+            }.Union(commitCollection)
+            : commitCollection;
+        return commits;
+    }
 
-                var targetBranch = FindBranch(targetBranchName);
-                // CanonicalName can be "refs/heads/develop", so we need to check for "/{TargetBranch}" as well
-                if (!desiredBranch.Equals(targetBranch))
-                {
-                    // In the case where HEAD is not the desired branch, try to find the branch with matching name
-                    desiredBranch = this.repository.Branches?
-                        .Where(b => b.Name.EquivalentTo(targetBranchName))
-                        .OrderBy(b => b.IsRemote)
-                        .FirstOrDefault();
-
-                    // Failsafe in case the specified branch is invalid
-                    desiredBranch ??= this.repository.Head;
-                }
-            }
+    public IBranch GetTargetBranch(string? targetBranchName)
+    {
+        // By default, we assume HEAD is pointing to the desired branch
+        var desiredBranch = this.repository.Head;
 
-            return desiredBranch;
+        // Make sure the desired branch has been specified
+        if (!targetBranchName.IsNullOrEmpty())
+        {
+            // There are some edge cases where HEAD is not pointing to the desired branch.
+            // Therefore it's important to verify if 'currentBranch' is indeed the desired branch.
+
+            var targetBranch = FindBranch(targetBranchName);
+            // CanonicalName can be "refs/heads/develop", so we need to check for "/{TargetBranch}" as well
+            if (!desiredBranch.Equals(targetBranch))
+            {
+                // In the case where HEAD is not the desired branch, try to find the branch with matching name
+                desiredBranch = this.repository.Branches?
+                    .Where(b => b.Name.EquivalentTo(targetBranchName))
+                    .OrderBy(b => b.IsRemote)
+                    .FirstOrDefault();
+
+                // Failsafe in case the specified branch is invalid
+                desiredBranch ??= this.repository.Head;
+            }
         }
 
-        public IBranch FindBranch(string? branchName) => this.repository.Branches.FirstOrDefault(x => x.Name.EquivalentTo(branchName));
+        return desiredBranch;
+    }
+
+    public IBranch FindBranch(string? branchName) => this.repository.Branches.FirstOrDefault(x => x.Name.EquivalentTo(branchName));
 
-        public IBranch GetChosenBranch(Config configuration)
-        {
-            var developBranchRegex = configuration.Branches[Config.DevelopBranchKey]?.Regex;
-            var mainBranchRegex = configuration.Branches[Config.MainBranchKey]?.Regex;
+    public IBranch GetChosenBranch(Config configuration)
+    {
+        var developBranchRegex = configuration.Branches[Config.DevelopBranchKey]?.Regex;
+        var mainBranchRegex = configuration.Branches[Config.MainBranchKey]?.Regex;
 
-            var chosenBranch = this.repository.Branches.FirstOrDefault(b =>
-                Regex.IsMatch(b.Name.Friendly, developBranchRegex, RegexOptions.IgnoreCase) ||
-                Regex.IsMatch(b.Name.Friendly, mainBranchRegex, RegexOptions.IgnoreCase));
+        var chosenBranch = this.repository.Branches.FirstOrDefault(b =>
+            Regex.IsMatch(b.Name.Friendly, developBranchRegex, RegexOptions.IgnoreCase) ||
+            Regex.IsMatch(b.Name.Friendly, mainBranchRegex, RegexOptions.IgnoreCase));
 
-            return chosenBranch;
-        }
+        return chosenBranch;
+    }
 
-        public IEnumerable<IBranch> GetBranchesForCommit(ICommit commit) => this.repository.Branches.Where(b => !b.IsRemote && Equals(b.Tip, commit)).ToList();
+    public IEnumerable<IBranch> GetBranchesForCommit(ICommit commit) => this.repository.Branches.Where(b => !b.IsRemote && Equals(b.Tip, commit)).ToList();
 
-        public IEnumerable<IBranch> GetExcludedInheritBranches(Config configuration) => this.repository.Branches.Where(b =>
-                                                                                                  {
-                                                                                                      var branchConfig = configuration.GetConfigForBranch(b.Name.WithoutRemote);
+    public IEnumerable<IBranch> GetExcludedInheritBranches(Config configuration) => this.repository.Branches.Where(b =>
+    {
+        var branchConfig = configuration.GetConfigForBranch(b.Name.WithoutRemote);
 
-                                                                                                      return branchConfig == null || branchConfig.Increment == IncrementStrategy.Inherit;
-                                                                                                  }).ToList();
+        return branchConfig == null || branchConfig.Increment == IncrementStrategy.Inherit;
+    }).ToList();
 
-        public IEnumerable<IBranch> GetReleaseBranches(IEnumerable<KeyValuePair<string, BranchConfig?>>? releaseBranchConfig) =>
-            this.repository.Branches
-                .Where(b => releaseBranchConfig?.Any(c => Regex.IsMatch(b.Name.Friendly, c.Value?.Regex)) == true);
+    public IEnumerable<IBranch> GetReleaseBranches(IEnumerable<KeyValuePair<string, BranchConfig?>>? releaseBranchConfig) =>
+        this.repository.Branches
+            .Where(b => releaseBranchConfig?.Any(c => Regex.IsMatch(b.Name.Friendly, c.Value?.Regex)) == true);
 
-        public IEnumerable<IBranch> ExcludingBranches(IEnumerable<IBranch> branchesToExclude) => this.repository.Branches.ExcludeBranches(branchesToExclude);
+    public IEnumerable<IBranch> ExcludingBranches(IEnumerable<IBranch> branchesToExclude) => this.repository.Branches.ExcludeBranches(branchesToExclude);
 
-        // TODO Should we cache this?
-        public IEnumerable<IBranch> GetBranchesContainingCommit(ICommit? commit, IEnumerable<IBranch>? branches = null, bool onlyTrackedBranches = false)
+    // TODO Should we cache this?
+    public IEnumerable<IBranch> GetBranchesContainingCommit(ICommit? commit, IEnumerable<IBranch>? branches = null, bool onlyTrackedBranches = false)
+    {
+        if (commit == null)
         {
-            if (commit == null)
-            {
-                throw new ArgumentNullException(nameof(commit));
-            }
+            throw new ArgumentNullException(nameof(commit));
+        }
 
-            return InnerGetBranchesContainingCommit(commit, branches, onlyTrackedBranches, this.repository, this.log);
+        return InnerGetBranchesContainingCommit(commit, branches, onlyTrackedBranches, this.repository, this.log);
 
-            static bool IncludeTrackedBranches(IBranch branch, bool includeOnlyTracked) => includeOnlyTracked && branch.IsTracking || !includeOnlyTracked;
+        static bool IncludeTrackedBranches(IBranch branch, bool includeOnlyTracked) => includeOnlyTracked && branch.IsTracking || !includeOnlyTracked;
 
-            // Yielding part is split from the main part of the method to avoid having the exception check performed lazily.
-            // Details at https://github.com/GitTools/GitVersion/issues/2755
-            static IEnumerable<IBranch> InnerGetBranchesContainingCommit(ICommit commit, IEnumerable<IBranch>? branches, bool onlyTrackedBranches, IGitRepository repository, ILog log)
-            {
-                branches ??= repository.Branches.ToList();
+        // Yielding part is split from the main part of the method to avoid having the exception check performed lazily.
+        // Details at https://github.com/GitTools/GitVersion/issues/2755
+        static IEnumerable<IBranch> InnerGetBranchesContainingCommit(ICommit commit, IEnumerable<IBranch>? branches, bool onlyTrackedBranches, IGitRepository repository, ILog log)
+        {
+            branches ??= repository.Branches.ToList();
 
-                using (log.IndentLog($"Getting branches containing the commit '{commit.Id}'."))
+            using (log.IndentLog($"Getting branches containing the commit '{commit.Id}'."))
+            {
+                var directBranchHasBeenFound = false;
+                log.Info("Trying to find direct branches.");
+                // TODO: It looks wasteful looping through the branches twice. Can't these loops be merged somehow? @asbjornu
+                var branchList = branches.ToList();
+                foreach (var branch in branchList)
                 {
-                    var directBranchHasBeenFound = false;
-                    log.Info("Trying to find direct branches.");
-                    // TODO: It looks wasteful looping through the branches twice. Can't these loops be merged somehow? @asbjornu
-                    var branchList = branches.ToList();
-                    foreach (var branch in branchList)
+                    if (branch.Tip != null && branch.Tip.Sha != commit.Sha || IncludeTrackedBranches(branch, onlyTrackedBranches))
                     {
-                        if (branch.Tip != null && branch.Tip.Sha != commit.Sha || IncludeTrackedBranches(branch, onlyTrackedBranches))
-                        {
-                            continue;
-                        }
-
-                        directBranchHasBeenFound = true;
-                        log.Info($"Direct branch found: '{branch}'.");
-                        yield return branch;
+                        continue;
                     }
 
-                    if (directBranchHasBeenFound)
-                    {
-                        yield break;
-                    }
+                    directBranchHasBeenFound = true;
+                    log.Info($"Direct branch found: '{branch}'.");
+                    yield return branch;
+                }
 
-                    log.Info($"No direct branches found, searching through {(onlyTrackedBranches ? "tracked" : "all")} branches.");
-                    foreach (var branch in branchList.Where(b => IncludeTrackedBranches(b, onlyTrackedBranches)))
-                    {
-                        log.Info($"Searching for commits reachable from '{branch}'.");
+                if (directBranchHasBeenFound)
+                {
+                    yield break;
+                }
 
-                        var commits = GetCommitsReacheableFrom(repository, commit, branch);
+                log.Info($"No direct branches found, searching through {(onlyTrackedBranches ? "tracked" : "all")} branches.");
+                foreach (var branch in branchList.Where(b => IncludeTrackedBranches(b, onlyTrackedBranches)))
+                {
+                    log.Info($"Searching for commits reachable from '{branch}'.");
 
-                        if (!commits.Any())
-                        {
-                            log.Info($"The branch '{branch}' has no matching commits.");
-                            continue;
-                        }
+                    var commits = GetCommitsReacheableFrom(repository, commit, branch);
 
-                        log.Info($"The branch '{branch}' has a matching commit.");
-                        yield return branch;
+                    if (!commits.Any())
+                    {
+                        log.Info($"The branch '{branch}' has no matching commits.");
+                        continue;
                     }
+
+                    log.Info($"The branch '{branch}' has a matching commit.");
+                    yield return branch;
                 }
             }
         }
+    }
 
-        public Dictionary<string, List<IBranch>> GetMainlineBranches(ICommit commit, IEnumerable<KeyValuePair<string, BranchConfig?>>? mainlineBranchConfigs) =>
-            this.repository.Branches
-                .Where(b => mainlineBranchConfigs?.Any(c => Regex.IsMatch(b.Name.Friendly, c.Value?.Regex)) == true)
-                .Select(b => new
-                {
-                    MergeBase = FindMergeBase(b.Tip!, commit),
-                    Branch = b
-                })
-                .Where(a => a.MergeBase != null)
-                .GroupBy(b => b.MergeBase.Sha, b => b.Branch)
-                .ToDictionary(b => b.Key, b => b.ToList());
-
-        /// <summary>
-        /// Find the commit where the given branch was branched from another branch.
-        /// If there are multiple such commits and branches, tries to guess based on commit histories.
-        /// </summary>
-        public BranchCommit FindCommitBranchWasBranchedFrom(IBranch branch, Config configuration, params IBranch[] excludedBranches)
-        {
-            if (branch == null)
+    public Dictionary<string, List<IBranch>> GetMainlineBranches(ICommit commit, IEnumerable<KeyValuePair<string, BranchConfig?>>? mainlineBranchConfigs) =>
+        this.repository.Branches
+            .Where(b => mainlineBranchConfigs?.Any(c => Regex.IsMatch(b.Name.Friendly, c.Value?.Regex)) == true)
+            .Select(b => new
             {
-                throw new ArgumentNullException(nameof(branch));
-            }
+                MergeBase = FindMergeBase(b.Tip!, commit),
+                Branch = b
+            })
+            .Where(a => a.MergeBase != null)
+            .GroupBy(b => b.MergeBase.Sha, b => b.Branch)
+            .ToDictionary(b => b.Key, b => b.ToList());
+
+    /// <summary>
+    /// Find the commit where the given branch was branched from another branch.
+    /// If there are multiple such commits and branches, tries to guess based on commit histories.
+    /// </summary>
+    public BranchCommit FindCommitBranchWasBranchedFrom(IBranch branch, Config configuration, params IBranch[] excludedBranches)
+    {
+        if (branch == null)
+        {
+            throw new ArgumentNullException(nameof(branch));
+        }
 
-            using (this.log.IndentLog($"Finding branch source of '{branch}'"))
+        using (this.log.IndentLog($"Finding branch source of '{branch}'"))
+        {
+            if (branch.Tip == null)
             {
-                if (branch.Tip == null)
-                {
-                    this.log.Warning(string.Format(MissingTipFormat, branch));
-                    return BranchCommit.Empty;
-                }
-
-                var possibleBranches = GetMergeCommitsForBranch(branch, configuration, excludedBranches)
-                    .Where(b => !branch.Name.EquivalentTo(b.Branch.Name.WithoutRemote))
-                    .ToList();
+                this.log.Warning(string.Format(MissingTipFormat, branch));
+                return BranchCommit.Empty;
+            }
 
-                if (possibleBranches.Count > 1)
-                {
-                    var first = possibleBranches.First();
-                    this.log.Info($"Multiple source branches have been found, picking the first one ({first.Branch}).{System.Environment.NewLine}" +
-                             $"This may result in incorrect commit counting.{System.Environment.NewLine}Options were:{System.Environment.NewLine}" +
-                             string.Join(", ", possibleBranches.Select(b => b.Branch.ToString())));
-                    return first;
-                }
+            var possibleBranches = GetMergeCommitsForBranch(branch, configuration, excludedBranches)
+                .Where(b => !branch.Name.EquivalentTo(b.Branch.Name.WithoutRemote))
+                .ToList();
 
-                return possibleBranches.SingleOrDefault();
+            if (possibleBranches.Count > 1)
+            {
+                var first = possibleBranches.First();
+                this.log.Info($"Multiple source branches have been found, picking the first one ({first.Branch}).{System.Environment.NewLine}" +
+                              $"This may result in incorrect commit counting.{System.Environment.NewLine}Options were:{System.Environment.NewLine}" +
+                              string.Join(", ", possibleBranches.Select(b => b.Branch.ToString())));
+                return first;
             }
-        }
 
-        public SemanticVersion GetCurrentCommitTaggedVersion(ICommit? commit, EffectiveConfiguration config) =>
-            this.repository.Tags
-                .SelectMany(t =>
-                {
-                    var targetCommit = t.PeeledTargetCommit();
-                    if (targetCommit != null && Equals(targetCommit, commit) && SemanticVersion.TryParse(t.Name.Friendly, config.GitTagPrefix, out var version))
-                        return new[]
-                        {
-                            version
-                        };
-                    return Array.Empty<SemanticVersion>();
-                })
-                .Max();
-
-        public SemanticVersion MaybeIncrement(BaseVersion baseVersion, GitVersionContext context)
-        {
-            var increment = this.incrementStrategyFinder.DetermineIncrementedField(this.repository, context, baseVersion);
-            return increment != null ? baseVersion.SemanticVersion.IncrementVersion(increment.Value) : baseVersion.SemanticVersion;
+            return possibleBranches.SingleOrDefault();
         }
+    }
 
-        public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(IBranch branch, string? tagPrefixRegex)
-        {
-            if (this.semanticVersionTagsOnBranchCache.ContainsKey(branch))
+    public SemanticVersion GetCurrentCommitTaggedVersion(ICommit? commit, EffectiveConfiguration config) =>
+        this.repository.Tags
+            .SelectMany(t =>
             {
-                this.log.Debug($"Cache hit for version tags on branch '{branch.Name.Canonical}");
-                return this.semanticVersionTagsOnBranchCache[branch];
-            }
+                var targetCommit = t.PeeledTargetCommit();
+                if (targetCommit != null && Equals(targetCommit, commit) && SemanticVersion.TryParse(t.Name.Friendly, config.GitTagPrefix, out var version))
+                    return new[]
+                    {
+                        version
+                    };
+                return Array.Empty<SemanticVersion>();
+            })
+            .Max();
 
-            using (this.log.IndentLog($"Getting version tags from branch '{branch.Name.Canonical}'."))
-            {
-                var tags = GetValidVersionTags(tagPrefixRegex);
-                var tagsBySha = tags.Where(t => t.Item1.TargetSha != null).ToLookup(t => t.Item1.TargetSha, t => t);
-                var versionTags = branch.Commits.SelectMany(c => tagsBySha[c.Sha].Select(t => t.Item2)).ToList();
+    public SemanticVersion MaybeIncrement(BaseVersion baseVersion, GitVersionContext context)
+    {
+        var increment = this.incrementStrategyFinder.DetermineIncrementedField(this.repository, context, baseVersion);
+        return increment != null ? baseVersion.SemanticVersion.IncrementVersion(increment.Value) : baseVersion.SemanticVersion;
+    }
 
-                this.semanticVersionTagsOnBranchCache.Add(branch, versionTags);
-                return versionTags;
-            }
+    public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(IBranch branch, string? tagPrefixRegex)
+    {
+        if (this.semanticVersionTagsOnBranchCache.ContainsKey(branch))
+        {
+            this.log.Debug($"Cache hit for version tags on branch '{branch.Name.Canonical}");
+            return this.semanticVersionTagsOnBranchCache[branch];
         }
 
-        public IEnumerable<Tuple<ITag, SemanticVersion, ICommit>> GetValidVersionTags(string? tagPrefixRegex, DateTimeOffset? olderThan = null)
+        using (this.log.IndentLog($"Getting version tags from branch '{branch.Name.Canonical}'."))
         {
-            var tags = new List<Tuple<ITag, SemanticVersion, ICommit>>();
+            var tags = GetValidVersionTags(tagPrefixRegex);
+            var tagsBySha = tags.Where(t => t.Item1.TargetSha != null).ToLookup(t => t.Item1.TargetSha, t => t);
+            var versionTags = branch.Commits.SelectMany(c => tagsBySha[c.Sha].Select(t => t.Item2)).ToList();
 
-            foreach (var tag in this.repository.Tags)
-            {
-                if (!SemanticVersion.TryParse(tag.Name.Friendly, tagPrefixRegex, out var semver))
-                    continue;
+            this.semanticVersionTagsOnBranchCache.Add(branch, versionTags);
+            return versionTags;
+        }
+    }
+
+    public IEnumerable<Tuple<ITag, SemanticVersion, ICommit>> GetValidVersionTags(string? tagPrefixRegex, DateTimeOffset? olderThan = null)
+    {
+        var tags = new List<Tuple<ITag, SemanticVersion, ICommit>>();
 
-                var commit = tag.PeeledTargetCommit();
+        foreach (var tag in this.repository.Tags)
+        {
+            if (!SemanticVersion.TryParse(tag.Name.Friendly, tagPrefixRegex, out var semver))
+                continue;
 
-                if (commit == null)
-                    continue;
+            var commit = tag.PeeledTargetCommit();
 
-                if (olderThan.HasValue && commit.When > olderThan.Value)
-                    continue;
+            if (commit == null)
+                continue;
 
-                tags.Add(Tuple.Create(tag, semver, commit));
-            }
+            if (olderThan.HasValue && commit.When > olderThan.Value)
+                continue;
 
-            return tags;
+            tags.Add(Tuple.Create(tag, semver, commit));
         }
 
-        public IEnumerable<ICommit> GetCommitLog(ICommit? baseVersionSource, ICommit? currentCommit)
+        return tags;
+    }
+
+    public IEnumerable<ICommit> GetCommitLog(ICommit? baseVersionSource, ICommit? currentCommit)
+    {
+        var filter = new CommitFilter
         {
-            var filter = new CommitFilter
-            {
-                IncludeReachableFrom = currentCommit,
-                ExcludeReachableFrom = baseVersionSource,
-                SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Time
-            };
+            IncludeReachableFrom = currentCommit,
+            ExcludeReachableFrom = baseVersionSource,
+            SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Time
+        };
 
-            return this.repository.Commits.QueryBy(filter);
-        }
+        return this.repository.Commits.QueryBy(filter);
+    }
 
-        public VersionField? DetermineIncrementedField(BaseVersion baseVersion, GitVersionContext context) =>
-            this.incrementStrategyFinder.DetermineIncrementedField(this.repository, context, baseVersion);
+    public VersionField? DetermineIncrementedField(BaseVersion baseVersion, GitVersionContext context) =>
+        this.incrementStrategyFinder.DetermineIncrementedField(this.repository, context, baseVersion);
 
-        public bool IsCommitOnBranch(ICommit? baseVersionSource, IBranch branch, ICommit firstMatchingCommit)
+    public bool IsCommitOnBranch(ICommit? baseVersionSource, IBranch branch, ICommit firstMatchingCommit)
+    {
+        var filter = new CommitFilter
         {
-            var filter = new CommitFilter
-            {
-                IncludeReachableFrom = branch,
-                ExcludeReachableFrom = baseVersionSource,
-                FirstParentOnly = true,
-            };
-            var commitCollection = this.repository.Commits.QueryBy(filter);
-            return commitCollection.Contains(firstMatchingCommit);
-        }
+            IncludeReachableFrom = branch,
+            ExcludeReachableFrom = baseVersionSource,
+            FirstParentOnly = true,
+        };
+        var commitCollection = this.repository.Commits.QueryBy(filter);
+        return commitCollection.Contains(firstMatchingCommit);
+    }
 
-        private IEnumerable<BranchCommit> GetMergeCommitsForBranch(IBranch branch, Config configuration, IEnumerable<IBranch> excludedBranches)
+    private IEnumerable<BranchCommit> GetMergeCommitsForBranch(IBranch branch, Config configuration, IEnumerable<IBranch> excludedBranches)
+    {
+        if (this.mergeBaseCommitsCache.ContainsKey(branch))
         {
-            if (this.mergeBaseCommitsCache.ContainsKey(branch))
-            {
-                this.log.Debug($"Cache hit for getting merge commits for branch {branch.Name.Canonical}.");
-                return this.mergeBaseCommitsCache[branch];
-            }
+            this.log.Debug($"Cache hit for getting merge commits for branch {branch.Name.Canonical}.");
+            return this.mergeBaseCommitsCache[branch];
+        }
 
-            var currentBranchConfig = configuration.GetConfigForBranch(branch.Name.WithoutRemote);
-            var regexesToCheck = currentBranchConfig == null
-                ? new[] { ".*" } // Match anything if we can't find a branch config
-                : currentBranchConfig.SourceBranches.Select(sb => configuration.Branches[sb]?.Regex);
-            var branchMergeBases = ExcludingBranches(excludedBranches)
-                .Where(b =>
-                {
-                    if (Equals(b, branch)) return false;
-                    var branchCanBeMergeBase = regexesToCheck.Any(regex => Regex.IsMatch(b.Name.Friendly, regex));
+        var currentBranchConfig = configuration.GetConfigForBranch(branch.Name.WithoutRemote);
+        var regexesToCheck = currentBranchConfig == null
+            ? new[] { ".*" } // Match anything if we can't find a branch config
+            : currentBranchConfig.SourceBranches.Select(sb => configuration.Branches[sb]?.Regex);
+        var branchMergeBases = ExcludingBranches(excludedBranches)
+            .Where(b =>
+            {
+                if (Equals(b, branch)) return false;
+                var branchCanBeMergeBase = regexesToCheck.Any(regex => Regex.IsMatch(b.Name.Friendly, regex));
 
-                    return branchCanBeMergeBase;
-                })
-                .Select(otherBranch =>
+                return branchCanBeMergeBase;
+            })
+            .Select(otherBranch =>
+            {
+                if (otherBranch.Tip == null)
                 {
-                    if (otherBranch.Tip == null)
-                    {
-                        this.log.Warning(string.Format(MissingTipFormat, otherBranch));
-                        return BranchCommit.Empty;
-                    }
+                    this.log.Warning(string.Format(MissingTipFormat, otherBranch));
+                    return BranchCommit.Empty;
+                }
 
-                    var findMergeBase = FindMergeBase(branch, otherBranch);
-                    return new BranchCommit(findMergeBase!, otherBranch);
-                })
-                .Where(b => b.Commit != null)
-                .OrderByDescending(b => b.Commit.When)
-                .ToList();
-            this.mergeBaseCommitsCache.Add(branch, branchMergeBases);
+                var findMergeBase = FindMergeBase(branch, otherBranch);
+                return new BranchCommit(findMergeBase!, otherBranch);
+            })
+            .Where(b => b.Commit != null)
+            .OrderByDescending(b => b.Commit.When)
+            .ToList();
+        this.mergeBaseCommitsCache.Add(branch, branchMergeBases);
 
-            return branchMergeBases;
-        }
+        return branchMergeBases;
+    }
 
-        private static IEnumerable<ICommit> GetCommitsReacheableFrom(IGitRepository repository, ICommit commit, IBranch branch)
+    private static IEnumerable<ICommit> GetCommitsReacheableFrom(IGitRepository repository, ICommit commit, IBranch branch)
+    {
+        var filter = new CommitFilter
         {
-            var filter = new CommitFilter
-            {
-                IncludeReachableFrom = branch
-            };
-            var commitCollection = repository.Commits.QueryBy(filter);
+            IncludeReachableFrom = branch
+        };
+        var commitCollection = repository.Commits.QueryBy(filter);
 
-            return commitCollection.Where(c => c.Sha == commit.Sha);
-        }
+        return commitCollection.Where(c => c.Sha == commit.Sha);
+    }
 
-        private ICommit GetForwardMerge(ICommit? commitToFindCommonBase, ICommit? findMergeBase)
+    private ICommit GetForwardMerge(ICommit? commitToFindCommonBase, ICommit? findMergeBase)
+    {
+        var filter = new CommitFilter
         {
-            var filter = new CommitFilter
-            {
-                IncludeReachableFrom = commitToFindCommonBase,
-                ExcludeReachableFrom = findMergeBase
-            };
-            var commitCollection = this.repository.Commits.QueryBy(filter);
+            IncludeReachableFrom = commitToFindCommonBase,
+            ExcludeReachableFrom = findMergeBase
+        };
+        var commitCollection = this.repository.Commits.QueryBy(filter);
 
-            return commitCollection.FirstOrDefault(c => c.Parents.Contains(findMergeBase));
-        }
+        return commitCollection.FirstOrDefault(c => c.Parents.Contains(findMergeBase));
+    }
 
-        public ICommit FindMergeBase(ICommit commit, ICommit mainlineTip) => this.repository.FindMergeBase(commit, mainlineTip);
+    public ICommit FindMergeBase(ICommit commit, ICommit mainlineTip) => this.repository.FindMergeBase(commit, mainlineTip);
 
-        public int GetNumberOfUncommittedChanges() => this.repository.GetNumberOfUncommittedChanges();
-    }
-}
+    public int GetNumberOfUncommittedChanges() => this.repository.GetNumberOfUncommittedChanges();
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Extensions/AssemblyVersionsGeneratorExtensions.cs b/src/GitVersion.Core/Extensions/AssemblyVersionsGeneratorExtensions.cs
index 8715fa340c..eb2ee22814 100644
--- a/src/GitVersion.Core/Extensions/AssemblyVersionsGeneratorExtensions.cs
+++ b/src/GitVersion.Core/Extensions/AssemblyVersionsGeneratorExtensions.cs
@@ -1,47 +1,46 @@
 using System;
 
-namespace GitVersion.Extensions
+namespace GitVersion.Extensions;
+
+public enum AssemblyFileVersioningScheme
 {
-    public enum AssemblyFileVersioningScheme
-    {
-        MajorMinorPatchTag,
-        MajorMinorPatch,
-        MajorMinor,
-        Major,
-        None
-    }
+    MajorMinorPatchTag,
+    MajorMinorPatch,
+    MajorMinor,
+    Major,
+    None
+}
 
-    public enum AssemblyVersioningScheme
-    {
-        MajorMinorPatchTag,
-        MajorMinorPatch,
-        MajorMinor,
-        Major,
-        None
-    }
+public enum AssemblyVersioningScheme
+{
+    MajorMinorPatchTag,
+    MajorMinorPatch,
+    MajorMinor,
+    Major,
+    None
+}
 
-    public static class AssemblyVersionsGeneratorExtensions
-    {
-        public static string? GetAssemblyVersion(this SemanticVersion sv, AssemblyVersioningScheme scheme) =>
-            scheme switch
-            {
-                AssemblyVersioningScheme.Major => $"{sv.Major}.0.0.0",
-                AssemblyVersioningScheme.MajorMinor => $"{sv.Major}.{sv.Minor}.0.0",
-                AssemblyVersioningScheme.MajorMinorPatch => $"{sv.Major}.{sv.Minor}.{sv.Patch}.0",
-                AssemblyVersioningScheme.MajorMinorPatchTag => $"{sv.Major}.{sv.Minor}.{sv.Patch}.{sv.PreReleaseTag?.Number ?? 0}",
-                AssemblyVersioningScheme.None => null,
-                _ => throw new ArgumentException($"Unexpected value ({scheme}).", nameof(scheme))
-            };
+public static class AssemblyVersionsGeneratorExtensions
+{
+    public static string? GetAssemblyVersion(this SemanticVersion sv, AssemblyVersioningScheme scheme) =>
+        scheme switch
+        {
+            AssemblyVersioningScheme.Major => $"{sv.Major}.0.0.0",
+            AssemblyVersioningScheme.MajorMinor => $"{sv.Major}.{sv.Minor}.0.0",
+            AssemblyVersioningScheme.MajorMinorPatch => $"{sv.Major}.{sv.Minor}.{sv.Patch}.0",
+            AssemblyVersioningScheme.MajorMinorPatchTag => $"{sv.Major}.{sv.Minor}.{sv.Patch}.{sv.PreReleaseTag?.Number ?? 0}",
+            AssemblyVersioningScheme.None => null,
+            _ => throw new ArgumentException($"Unexpected value ({scheme}).", nameof(scheme))
+        };
 
-        public static string? GetAssemblyFileVersion(this SemanticVersion sv, AssemblyFileVersioningScheme scheme) =>
-            scheme switch
-            {
-                AssemblyFileVersioningScheme.Major => $"{sv.Major}.0.0.0",
-                AssemblyFileVersioningScheme.MajorMinor => $"{sv.Major}.{sv.Minor}.0.0",
-                AssemblyFileVersioningScheme.MajorMinorPatch => $"{sv.Major}.{sv.Minor}.{sv.Patch}.0",
-                AssemblyFileVersioningScheme.MajorMinorPatchTag => $"{sv.Major}.{sv.Minor}.{sv.Patch}.{sv.PreReleaseTag?.Number ?? 0}",
-                AssemblyFileVersioningScheme.None => null,
-                _ => throw new ArgumentException($"Unexpected value ({scheme}).", nameof(scheme))
-            };
-    }
-}
+    public static string? GetAssemblyFileVersion(this SemanticVersion sv, AssemblyFileVersioningScheme scheme) =>
+        scheme switch
+        {
+            AssemblyFileVersioningScheme.Major => $"{sv.Major}.0.0.0",
+            AssemblyFileVersioningScheme.MajorMinor => $"{sv.Major}.{sv.Minor}.0.0",
+            AssemblyFileVersioningScheme.MajorMinorPatch => $"{sv.Major}.{sv.Minor}.{sv.Patch}.0",
+            AssemblyFileVersioningScheme.MajorMinorPatchTag => $"{sv.Major}.{sv.Minor}.{sv.Patch}.{sv.PreReleaseTag?.Number ?? 0}",
+            AssemblyFileVersioningScheme.None => null,
+            _ => throw new ArgumentException($"Unexpected value ({scheme}).", nameof(scheme))
+        };
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Extensions/DictionaryExtensions.cs b/src/GitVersion.Core/Extensions/DictionaryExtensions.cs
index fff17e24ee..c9b64ffb42 100644
--- a/src/GitVersion.Core/Extensions/DictionaryExtensions.cs
+++ b/src/GitVersion.Core/Extensions/DictionaryExtensions.cs
@@ -1,20 +1,19 @@
 using System;
 using System.Collections.Generic;
 
-namespace GitVersion.Extensions
+namespace GitVersion.Extensions;
+
+public static class DictionaryExtensions
 {
-    public static class DictionaryExtensions
+    public static TValue GetOrAdd<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key, Func<TValue> getValue)
     {
-        public static TValue GetOrAdd<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key, Func<TValue> getValue)
+        if (dict is null) throw new ArgumentNullException(nameof(dict));
+        if (getValue is null) throw new ArgumentNullException(nameof(getValue));
+        if (!dict.TryGetValue(key, out TValue value))
         {
-            if (dict is null) throw new ArgumentNullException(nameof(dict));
-            if (getValue is null) throw new ArgumentNullException(nameof(getValue));
-            if (!dict.TryGetValue(key, out TValue value))
-            {
-                value = getValue();
-                dict.Add(key, value);
-            }
-            return value;
+            value = getValue();
+            dict.Add(key, value);
         }
+        return value;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Extensions/EnumerableExtensions.cs b/src/GitVersion.Core/Extensions/EnumerableExtensions.cs
index fd5eb751ba..f6a9a5dea4 100644
--- a/src/GitVersion.Core/Extensions/EnumerableExtensions.cs
+++ b/src/GitVersion.Core/Extensions/EnumerableExtensions.cs
@@ -1,28 +1,27 @@
 using System;
 using System.Collections.Generic;
 
-namespace GitVersion.Extensions
+namespace GitVersion.Extensions;
+
+public static class EnumerableExtensions
 {
-    public static class EnumerableExtensions
+    public static T? OnlyOrDefault<T>(this IEnumerable<T> source)
     {
-        public static T? OnlyOrDefault<T>(this IEnumerable<T> source)
+        switch (source)
         {
-            switch (source)
-            {
-                case null:
-                    throw new ArgumentNullException(nameof(source));
-                case IList<T> list when list.Count == 1:
-                    return list[0];
-            }
-
-            using var e = source.GetEnumerator();
-            if (!e.MoveNext())
-                return default;
-            var current = e.Current;
-            if (!e.MoveNext())
-                return current;
+            case null:
+                throw new ArgumentNullException(nameof(source));
+            case IList<T> list when list.Count == 1:
+                return list[0];
+        }
 
+        using var e = source.GetEnumerator();
+        if (!e.MoveNext())
             return default;
-        }
+        var current = e.Current;
+        if (!e.MoveNext())
+            return current;
+
+        return default;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Extensions/GitExtensions.cs b/src/GitVersion.Core/Extensions/GitExtensions.cs
index a7d59ff9bd..dd757f8856 100644
--- a/src/GitVersion.Core/Extensions/GitExtensions.cs
+++ b/src/GitVersion.Core/Extensions/GitExtensions.cs
@@ -3,48 +3,47 @@
 using System.Text;
 using GitVersion.Helpers;
 
-namespace GitVersion.Extensions
+namespace GitVersion.Extensions;
+
+public static class GitExtensions
 {
-    public static class GitExtensions
+    public static void DumpGraph(string workingDirectory, Action<string>? writer = null, int? maxCommits = null)
     {
-        public static void DumpGraph(string workingDirectory, Action<string>? writer = null, int? maxCommits = null)
+        var output = new StringBuilder();
+        try
         {
-            var output = new StringBuilder();
-            try
-            {
-                ProcessHelper.Run(
-                    o => output.AppendLine(o),
-                    e => output.AppendLineFormat("ERROR: {0}", e),
-                    null,
-                    "git",
-                    CreateGitLogArgs(maxCommits),
-                    workingDirectory);
-            }
-            catch (FileNotFoundException exception)
+            ProcessHelper.Run(
+                o => output.AppendLine(o),
+                e => output.AppendLineFormat("ERROR: {0}", e),
+                null,
+                "git",
+                CreateGitLogArgs(maxCommits),
+                workingDirectory);
+        }
+        catch (FileNotFoundException exception)
+        {
+            if (exception.FileName != "git")
             {
-                if (exception.FileName != "git")
-                {
-                    throw;
-                }
-
-                output.AppendLine("Could not execute 'git log' due to the following error:");
-                output.AppendLine(exception.ToString());
+                throw;
             }
 
-            if (writer != null)
-            {
-                writer(output.ToString());
-            }
-            else
-            {
-                Console.Write(output.ToString());
-            }
+            output.AppendLine("Could not execute 'git log' due to the following error:");
+            output.AppendLine(exception.ToString());
         }
 
-        public static string CreateGitLogArgs(int? maxCommits)
+        if (writer != null)
+        {
+            writer(output.ToString());
+        }
+        else
         {
-            var commits = maxCommits != null ? $" -n {maxCommits}" : null;
-            return $@"log --graph --format=""%h %cr %d"" --decorate --date=relative --all --remotes=*{commits}";
+            Console.Write(output.ToString());
         }
     }
-}
+
+    public static string CreateGitLogArgs(int? maxCommits)
+    {
+        var commits = maxCommits != null ? $" -n {maxCommits}" : null;
+        return $@"log --graph --format=""%h %cr %d"" --decorate --date=relative --all --remotes=*{commits}";
+    }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Extensions/NullableAttributes.cs b/src/GitVersion.Core/Extensions/NullableAttributes.cs
index 23e364d106..3df9652342 100644
--- a/src/GitVersion.Core/Extensions/NullableAttributes.cs
+++ b/src/GitVersion.Core/Extensions/NullableAttributes.cs
@@ -3,147 +3,145 @@
 
 #pragma warning disable CA1019 // Define accessors for attribute arguments
 
-namespace System.Diagnostics.CodeAnalysis
-{
+namespace System.Diagnostics.CodeAnalysis;
 #if !NETCOREAPP
 
-    /// <summary>Specifies that null is allowed as an input even if the corresponding type disallows it.</summary>
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
-    internal sealed class AllowNullAttribute : Attribute { }
+/// <summary>Specifies that null is allowed as an input even if the corresponding type disallows it.</summary>
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
+internal sealed class AllowNullAttribute : Attribute { }
 
-    /// <summary>Specifies that null is disallowed as an input even if the corresponding type allows it.</summary>
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
-    internal sealed class DisallowNullAttribute : Attribute { }
+/// <summary>Specifies that null is disallowed as an input even if the corresponding type allows it.</summary>
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
+internal sealed class DisallowNullAttribute : Attribute { }
 
-    /// <summary>Specifies that an output may be null even if the corresponding type disallows it.</summary>
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
-    internal sealed class MaybeNullAttribute : Attribute { }
+/// <summary>Specifies that an output may be null even if the corresponding type disallows it.</summary>
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
+internal sealed class MaybeNullAttribute : Attribute { }
 
-    /// <summary>Specifies that an output will not be null even if the corresponding type allows it.</summary>
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
-    internal sealed class NotNullAttribute : Attribute { }
+/// <summary>Specifies that an output will not be null even if the corresponding type allows it.</summary>
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
+internal sealed class NotNullAttribute : Attribute { }
 
-    /// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter may be null even if the corresponding type disallows it.</summary>
-    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
-    internal sealed class MaybeNullWhenAttribute : Attribute
-    {
-        /// <summary>Initializes the attribute with the specified return value condition.</summary>
-        /// <param name="returnValue">
-        /// The return value condition. If the method returns this value, the associated parameter may be null.
-        /// </param>
-        public MaybeNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
-
-        /// <summary>Gets the return value condition.</summary>
-        public bool ReturnValue { get; }
-    }
+/// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter may be null even if the corresponding type disallows it.</summary>
+[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+internal sealed class MaybeNullWhenAttribute : Attribute
+{
+    /// <summary>Initializes the attribute with the specified return value condition.</summary>
+    /// <param name="returnValue">
+    /// The return value condition. If the method returns this value, the associated parameter may be null.
+    /// </param>
+    public MaybeNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
+
+    /// <summary>Gets the return value condition.</summary>
+    public bool ReturnValue { get; }
+}
 
-    /// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter will not be null even if the corresponding type allows it.</summary>
-    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
-    internal sealed class NotNullWhenAttribute : Attribute
-    {
-        /// <summary>Initializes the attribute with the specified return value condition.</summary>
-        /// <param name="returnValue">
-        /// The return value condition. If the method returns this value, the associated parameter will not be null.
-        /// </param>
-        public NotNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
-
-        /// <summary>Gets the return value condition.</summary>
-        public bool ReturnValue { get; }
-    }
+/// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter will not be null even if the corresponding type allows it.</summary>
+[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+internal sealed class NotNullWhenAttribute : Attribute
+{
+    /// <summary>Initializes the attribute with the specified return value condition.</summary>
+    /// <param name="returnValue">
+    /// The return value condition. If the method returns this value, the associated parameter will not be null.
+    /// </param>
+    public NotNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
+
+    /// <summary>Gets the return value condition.</summary>
+    public bool ReturnValue { get; }
+}
 
-    /// <summary>Specifies that the output will be non-null if the named parameter is non-null.</summary>
-    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple = true, Inherited = false)]
-    internal sealed class NotNullIfNotNullAttribute : Attribute
-    {
-        /// <summary>Initializes the attribute with the associated parameter name.</summary>
-        /// <param name="parameterName">
-        /// The associated parameter name.  The output will be non-null if the argument to the parameter specified is non-null.
-        /// </param>
-        public NotNullIfNotNullAttribute(string parameterName) => ParameterName = parameterName;
-
-        /// <summary>Gets the associated parameter name.</summary>
-        public string ParameterName { get; }
-    }
+/// <summary>Specifies that the output will be non-null if the named parameter is non-null.</summary>
+[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple = true, Inherited = false)]
+internal sealed class NotNullIfNotNullAttribute : Attribute
+{
+    /// <summary>Initializes the attribute with the associated parameter name.</summary>
+    /// <param name="parameterName">
+    /// The associated parameter name.  The output will be non-null if the argument to the parameter specified is non-null.
+    /// </param>
+    public NotNullIfNotNullAttribute(string parameterName) => ParameterName = parameterName;
+
+    /// <summary>Gets the associated parameter name.</summary>
+    public string ParameterName { get; }
+}
 
-    /// <summary>Applied to a method that will never return under any circumstance.</summary>
-    [AttributeUsage(AttributeTargets.Method, Inherited = false)]
-    internal sealed class DoesNotReturnAttribute : Attribute { }
+/// <summary>Applied to a method that will never return under any circumstance.</summary>
+[AttributeUsage(AttributeTargets.Method, Inherited = false)]
+internal sealed class DoesNotReturnAttribute : Attribute { }
 
-    /// <summary>Specifies that the method will not return if the associated Boolean parameter is passed the specified value.</summary>
-    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
-    internal sealed class DoesNotReturnIfAttribute : Attribute
-    {
-        /// <summary>Initializes the attribute with the specified parameter value.</summary>
-        /// <param name="parameterValue">
-        /// The condition parameter value. Code after the method will be considered unreachable by diagnostics if the argument to
-        /// the associated parameter matches this value.
-        /// </param>
-        public DoesNotReturnIfAttribute(bool parameterValue) => ParameterValue = parameterValue;
-
-        /// <summary>Gets the condition parameter value.</summary>
-        public bool ParameterValue { get; }
-    }
+/// <summary>Specifies that the method will not return if the associated Boolean parameter is passed the specified value.</summary>
+[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+internal sealed class DoesNotReturnIfAttribute : Attribute
+{
+    /// <summary>Initializes the attribute with the specified parameter value.</summary>
+    /// <param name="parameterValue">
+    /// The condition parameter value. Code after the method will be considered unreachable by diagnostics if the argument to
+    /// the associated parameter matches this value.
+    /// </param>
+    public DoesNotReturnIfAttribute(bool parameterValue) => ParameterValue = parameterValue;
+
+    /// <summary>Gets the condition parameter value.</summary>
+    public bool ParameterValue { get; }
+}
 
 #endif
 
 #if !NETCOREAPP || NETCOREAPP3_1
 
-    /// <summary>Specifies that the method or property will ensure that the listed field and property members have not-null values.</summary>
-    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
-    internal sealed class MemberNotNullAttribute : Attribute
+/// <summary>Specifies that the method or property will ensure that the listed field and property members have not-null values.</summary>
+[AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
+internal sealed class MemberNotNullAttribute : Attribute
+{
+    /// <summary>Initializes the attribute with a field or property member.</summary>
+    /// <param name="member">
+    /// The field or property member that is promised to be not-null.
+    /// </param>
+    public MemberNotNullAttribute(string member) => Members = new[] { member };
+
+    /// <summary>Initializes the attribute with the list of field and property members.</summary>
+    /// <param name="members">
+    /// The list of field and property members that are promised to be not-null.
+    /// </param>
+    public MemberNotNullAttribute(params string[] members) => Members = members;
+
+    /// <summary>Gets field or property member names.</summary>
+    public string[] Members { get; }
+}
+
+/// <summary>Specifies that the method or property will ensure that the listed field and property members have not-null values when returning with the specified return value condition.</summary>
+[AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
+internal sealed class MemberNotNullWhenAttribute : Attribute
+{
+    /// <summary>Initializes the attribute with the specified return value condition and a field or property member.</summary>
+    /// <param name="returnValue">
+    /// The return value condition. If the method returns this value, the associated parameter will not be null.
+    /// </param>
+    /// <param name="member">
+    /// The field or property member that is promised to be not-null.
+    /// </param>
+    public MemberNotNullWhenAttribute(bool returnValue, string member)
     {
-        /// <summary>Initializes the attribute with a field or property member.</summary>
-        /// <param name="member">
-        /// The field or property member that is promised to be not-null.
-        /// </param>
-        public MemberNotNullAttribute(string member) => Members = new[] { member };
-
-        /// <summary>Initializes the attribute with the list of field and property members.</summary>
-        /// <param name="members">
-        /// The list of field and property members that are promised to be not-null.
-        /// </param>
-        public MemberNotNullAttribute(params string[] members) => Members = members;
-
-        /// <summary>Gets field or property member names.</summary>
-        public string[] Members { get; }
+        ReturnValue = returnValue;
+        Members = new[] { member };
     }
 
-    /// <summary>Specifies that the method or property will ensure that the listed field and property members have not-null values when returning with the specified return value condition.</summary>
-    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
-    internal sealed class MemberNotNullWhenAttribute : Attribute
+    /// <summary>Initializes the attribute with the specified return value condition and list of field and property members.</summary>
+    /// <param name="returnValue">
+    /// The return value condition. If the method returns this value, the associated parameter will not be null.
+    /// </param>
+    /// <param name="members">
+    /// The list of field and property members that are promised to be not-null.
+    /// </param>
+    public MemberNotNullWhenAttribute(bool returnValue, params string[] members)
     {
-        /// <summary>Initializes the attribute with the specified return value condition and a field or property member.</summary>
-        /// <param name="returnValue">
-        /// The return value condition. If the method returns this value, the associated parameter will not be null.
-        /// </param>
-        /// <param name="member">
-        /// The field or property member that is promised to be not-null.
-        /// </param>
-        public MemberNotNullWhenAttribute(bool returnValue, string member)
-        {
-            ReturnValue = returnValue;
-            Members = new[] { member };
-        }
-
-        /// <summary>Initializes the attribute with the specified return value condition and list of field and property members.</summary>
-        /// <param name="returnValue">
-        /// The return value condition. If the method returns this value, the associated parameter will not be null.
-        /// </param>
-        /// <param name="members">
-        /// The list of field and property members that are promised to be not-null.
-        /// </param>
-        public MemberNotNullWhenAttribute(bool returnValue, params string[] members)
-        {
-            ReturnValue = returnValue;
-            Members = members;
-        }
-
-        /// <summary>Gets the return value condition.</summary>
-        public bool ReturnValue { get; }
-
-        /// <summary>Gets field or property member names.</summary>
-        public string[] Members { get; }
+        ReturnValue = returnValue;
+        Members = members;
     }
 
-#endif
+    /// <summary>Gets the return value condition.</summary>
+    public bool ReturnValue { get; }
+
+    /// <summary>Gets field or property member names.</summary>
+    public string[] Members { get; }
 }
+
+#endif
\ No newline at end of file
diff --git a/src/GitVersion.Core/Extensions/ObjectExtensions.cs b/src/GitVersion.Core/Extensions/ObjectExtensions.cs
index a0957dd749..7a2d5d1c47 100644
--- a/src/GitVersion.Core/Extensions/ObjectExtensions.cs
+++ b/src/GitVersion.Core/Extensions/ObjectExtensions.cs
@@ -2,29 +2,28 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace GitVersion.Extensions
+namespace GitVersion.Extensions;
+
+public static class ObjectExtensions
 {
-    public static class ObjectExtensions
+    internal sealed class ReflectionIgnoreAttribute : Attribute
     {
-        internal sealed class ReflectionIgnoreAttribute : Attribute
-        {
-        }
+    }
 
-        public static void Deconstruct<TKey, TValue>(
-            this KeyValuePair<TKey, TValue> kvp,
-            out TKey key,
-            out TValue value)
-        {
-            key = kvp.Key;
-            value = kvp.Value;
-        }
+    public static void Deconstruct<TKey, TValue>(
+        this KeyValuePair<TKey, TValue> kvp,
+        out TKey key,
+        out TValue value)
+    {
+        key = kvp.Key;
+        value = kvp.Value;
+    }
 
-        public static IEnumerable<KeyValuePair<string, string>> GetProperties(this object obj)
-        {
-            var type = typeof(string);
-            return obj.GetType().GetProperties()
-                .Where(p => p.PropertyType == type && !p.GetIndexParameters().Any() && !p.GetCustomAttributes(typeof(ReflectionIgnoreAttribute), false).Any())
-                .Select(p => new KeyValuePair<string, string>(p.Name, (string)p.GetValue(obj, null)));
-        }
+    public static IEnumerable<KeyValuePair<string, string>> GetProperties(this object obj)
+    {
+        var type = typeof(string);
+        return obj.GetType().GetProperties()
+            .Where(p => p.PropertyType == type && !p.GetIndexParameters().Any() && !p.GetCustomAttributes(typeof(ReflectionIgnoreAttribute), false).Any())
+            .Select(p => new KeyValuePair<string, string>(p.Name, (string)p.GetValue(obj, null)));
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Extensions/ReadEmbeddedResourceExtensions.cs b/src/GitVersion.Core/Extensions/ReadEmbeddedResourceExtensions.cs
index fdce1a92b3..6a4224941a 100644
--- a/src/GitVersion.Core/Extensions/ReadEmbeddedResourceExtensions.cs
+++ b/src/GitVersion.Core/Extensions/ReadEmbeddedResourceExtensions.cs
@@ -1,27 +1,26 @@
 using System.IO;
 
-namespace GitVersion.Extensions
+namespace GitVersion.Extensions;
+
+public static class ReadEmbeddedResourceExtensions
 {
-    public static class ReadEmbeddedResourceExtensions
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="resourceName">Should include Namespace separated path to resource in assembly referenced by <typeparamref name="T"/></param>
+    /// <returns></returns>
+    public static string ReadAsStringFromEmbeddedResource<T>(this string resourceName)
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="resourceName">Should include Namespace separated path to resource in assembly referenced by <typeparamref name="T"/></param>
-        /// <returns></returns>
-        public static string ReadAsStringFromEmbeddedResource<T>(this string resourceName)
-        {
-            using var stream = resourceName.ReadFromEmbeddedResource<T>();
-            using var rdr = new StreamReader(stream);
-            return rdr.ReadToEnd();
-        }
+        using var stream = resourceName.ReadFromEmbeddedResource<T>();
+        using var rdr = new StreamReader(stream);
+        return rdr.ReadToEnd();
+    }
 
-        private static Stream ReadFromEmbeddedResource<T>(this string resourceName)
-        {
-            var assembly = typeof(T).Assembly;
+    private static Stream ReadFromEmbeddedResource<T>(this string resourceName)
+    {
+        var assembly = typeof(T).Assembly;
 
-            return assembly.GetManifestResourceStream(resourceName);
-        }
+        return assembly.GetManifestResourceStream(resourceName);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs b/src/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs
index 3d37aebd33..52f657fac8 100644
--- a/src/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs
+++ b/src/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs
@@ -2,17 +2,16 @@
 using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GitVersion.Extensions
+namespace GitVersion.Extensions;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    public static IServiceCollection AddModule(this IServiceCollection serviceCollection, IGitVersionModule gitVersionModule)
     {
-        public static IServiceCollection AddModule(this IServiceCollection serviceCollection, IGitVersionModule gitVersionModule)
-        {
-            gitVersionModule.RegisterTypes(serviceCollection);
-            return serviceCollection;
-        }
-
-        public static TService GetServiceForType<TService, TType>(this IServiceProvider serviceProvider) =>
-            serviceProvider.GetServices<TService>().SingleOrDefault(t => t?.GetType() == typeof(TType));
+        gitVersionModule.RegisterTypes(serviceCollection);
+        return serviceCollection;
     }
-}
+
+    public static TService GetServiceForType<TService, TType>(this IServiceProvider serviceProvider) =>
+        serviceProvider.GetServices<TService>().SingleOrDefault(t => t?.GetType() == typeof(TType));
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Extensions/StringExtensions.cs b/src/GitVersion.Core/Extensions/StringExtensions.cs
index 99663d73ba..2466e07414 100644
--- a/src/GitVersion.Core/Extensions/StringExtensions.cs
+++ b/src/GitVersion.Core/Extensions/StringExtensions.cs
@@ -5,21 +5,29 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace GitVersion.Extensions
+namespace GitVersion.Extensions;
+
+public static class StringExtensions
 {
-    public static class StringExtensions
-    {
-        private static readonly string[] Trues = new[] { "1", "true" };
-        private static readonly string[] Falses = new[] { "0", "false" };
+    private static readonly string[] Trues = new[] { "1", "true" };
+    private static readonly string[] Falses = new[] { "0", "false" };
 
-        public static bool IsTrue(this string value) => Trues.Contains(value, StringComparer.OrdinalIgnoreCase);
+    public static bool IsTrue(this string value) => Trues.Contains(value, StringComparer.OrdinalIgnoreCase);
 
-        public static bool IsFalse(this string value) => Falses.Contains(value, StringComparer.OrdinalIgnoreCase);
+    public static bool IsFalse(this string value) => Falses.Contains(value, StringComparer.OrdinalIgnoreCase);
 
-        public static bool IsValidPath(this string path)
+    public static bool IsValidPath(this string path)
+    {
+        if (path == null)
+            return false;
+
+        try
         {
-            if (path == null)
-                return false;
+            _ = Path.GetFullPath(path);
+        }
+        catch
+        {
+            path = Path.Combine(System.Environment.CurrentDirectory, path);
 
             try
             {
@@ -27,83 +35,74 @@ public static bool IsValidPath(this string path)
             }
             catch
             {
-                path = Path.Combine(System.Environment.CurrentDirectory, path);
-
-                try
-                {
-                    _ = Path.GetFullPath(path);
-                }
-                catch
-                {
-                    return false;
-                }
+                return false;
             }
-
-            return Directory.Exists(path);
         }
 
-        public static bool IsSwitchArgument(this string value) => value != null
-                   && (value.StartsWith("-") || value.StartsWith("/"))
-                   && !Regex.Match(value, @"/\w+:").Success; //Exclude msbuild & project parameters in form /blah:, which should be parsed as values, not switch names.
-
-        public static bool IsSwitch(this string value, string switchName)
-        {
-            if (value == null)
-                return false;
+        return Directory.Exists(path);
+    }
 
-            if (value.StartsWith("-"))
-            {
-                value = value.Substring(1);
-            }
+    public static bool IsSwitchArgument(this string value) => value != null
+                                                              && (value.StartsWith("-") || value.StartsWith("/"))
+                                                              && !Regex.Match(value, @"/\w+:").Success; //Exclude msbuild & project parameters in form /blah:, which should be parsed as values, not switch names.
 
-            if (value.StartsWith("/"))
-            {
-                value = value.Substring(1);
-            }
+    public static bool IsSwitch(this string value, string switchName)
+    {
+        if (value == null)
+            return false;
 
-            return string.Equals(switchName, value, StringComparison.OrdinalIgnoreCase);
+        if (value.StartsWith("-"))
+        {
+            value = value.Substring(1);
         }
 
-        public static bool IsInit(this string singleArgument) => singleArgument.Equals("init", StringComparison.OrdinalIgnoreCase);
+        if (value.StartsWith("/"))
+        {
+            value = value.Substring(1);
+        }
 
-        public static bool IsHelp(this string singleArgument) => (singleArgument == "?") || singleArgument.IsSwitch("h") || singleArgument.IsSwitch("help") || singleArgument.IsSwitch("?");
+        return string.Equals(switchName, value, StringComparison.OrdinalIgnoreCase);
+    }
 
-        public static bool ArgumentRequiresValue(this string argument, int argumentIndex)
-        {
-            var booleanArguments = new[]
-            {
-                "init",
-                "updateassemblyinfo",
-                "ensureassemblyinfo",
-                "nofetch",
-                "nonormalize",
-                "nocache",
-            };
-
-            var argumentMightRequireValue = !booleanArguments.Contains(argument.Substring(1), StringComparer.OrdinalIgnoreCase);
-
-            // If this is the first argument that might be a target path, the argument starts with slash and we're on an OS that supports paths with slashes, the argument does not require a value.
-            if (argumentMightRequireValue && argumentIndex == 0 && argument.StartsWith("/") && Path.DirectorySeparatorChar == '/' && argument.IsValidPath())
-                return false;
+    public static bool IsInit(this string singleArgument) => singleArgument.Equals("init", StringComparison.OrdinalIgnoreCase);
 
-            return argumentMightRequireValue;
-        }
+    public static bool IsHelp(this string singleArgument) => (singleArgument == "?") || singleArgument.IsSwitch("h") || singleArgument.IsSwitch("help") || singleArgument.IsSwitch("?");
 
-        public static void AppendLineFormat(this StringBuilder stringBuilder, string format, params object[] args)
+    public static bool ArgumentRequiresValue(this string argument, int argumentIndex)
+    {
+        var booleanArguments = new[]
         {
-            stringBuilder.AppendFormat(format, args);
-            stringBuilder.AppendLine();
-        }
+            "init",
+            "updateassemblyinfo",
+            "ensureassemblyinfo",
+            "nofetch",
+            "nonormalize",
+            "nocache",
+        };
 
-        public static string RegexReplace(this string input, string pattern, string replace, RegexOptions options = RegexOptions.None) => Regex.Replace(input, pattern, replace, options);
+        var argumentMightRequireValue = !booleanArguments.Contains(argument.Substring(1), StringComparer.OrdinalIgnoreCase);
 
-        public static bool IsEquivalentTo(this string self, string? other) =>
-            string.Equals(self, other, StringComparison.OrdinalIgnoreCase);
+        // If this is the first argument that might be a target path, the argument starts with slash and we're on an OS that supports paths with slashes, the argument does not require a value.
+        if (argumentMightRequireValue && argumentIndex == 0 && argument.StartsWith("/") && Path.DirectorySeparatorChar == '/' && argument.IsValidPath())
+            return false;
 
-        /// <inheritdoc cref="string.IsNullOrEmpty()"/>
-        public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value) => string.IsNullOrEmpty(value);
+        return argumentMightRequireValue;
+    }
 
-        /// <inheritdoc cref="string.IsNullOrWhiteSpace()"/>
-        public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value) => string.IsNullOrWhiteSpace(value);
+    public static void AppendLineFormat(this StringBuilder stringBuilder, string format, params object[] args)
+    {
+        stringBuilder.AppendFormat(format, args);
+        stringBuilder.AppendLine();
     }
-}
+
+    public static string RegexReplace(this string input, string pattern, string replace, RegexOptions options = RegexOptions.None) => Regex.Replace(input, pattern, replace, options);
+
+    public static bool IsEquivalentTo(this string self, string? other) =>
+        string.Equals(self, other, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc cref="string.IsNullOrEmpty()"/>
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value) => string.IsNullOrEmpty(value);
+
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace()"/>
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value) => string.IsNullOrWhiteSpace(value);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/CommitFilter.cs b/src/GitVersion.Core/Git/CommitFilter.cs
index 5b9a2db7be..0c0d33ffc4 100644
--- a/src/GitVersion.Core/Git/CommitFilter.cs
+++ b/src/GitVersion.Core/Git/CommitFilter.cs
@@ -1,45 +1,44 @@
 using System;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class CommitFilter
 {
-    public class CommitFilter
-    {
 
-        public bool FirstParentOnly { get; set; }
-        public object? IncludeReachableFrom { get; set; }
-        public object? ExcludeReachableFrom { get; set; }
-        public CommitSortStrategies SortBy { get; set; }
-    }
+    public bool FirstParentOnly { get; set; }
+    public object? IncludeReachableFrom { get; set; }
+    public object? ExcludeReachableFrom { get; set; }
+    public CommitSortStrategies SortBy { get; set; }
+}
 
-    [Flags]
-    public enum CommitSortStrategies
-    {
-        /// <summary>
-        /// Sort the commits in no particular ordering;
-        /// this sorting is arbitrary, implementation-specific
-        /// and subject to change at any time.
-        /// </summary>
-        None = 0,
+[Flags]
+public enum CommitSortStrategies
+{
+    /// <summary>
+    /// Sort the commits in no particular ordering;
+    /// this sorting is arbitrary, implementation-specific
+    /// and subject to change at any time.
+    /// </summary>
+    None = 0,
 
-        /// <summary>
-        /// Sort the commits in topological order
-        /// (parents before children); this sorting mode
-        /// can be combined with time sorting.
-        /// </summary>
-        Topological = (1 << 0),
+    /// <summary>
+    /// Sort the commits in topological order
+    /// (parents before children); this sorting mode
+    /// can be combined with time sorting.
+    /// </summary>
+    Topological = (1 << 0),
 
-        /// <summary>
-        /// Sort the commits by commit time;
-        /// this sorting mode can be combined with
-        /// topological sorting.
-        /// </summary>
-        Time = (1 << 1),
+    /// <summary>
+    /// Sort the commits by commit time;
+    /// this sorting mode can be combined with
+    /// topological sorting.
+    /// </summary>
+    Time = (1 << 1),
 
-        /// <summary>
-        /// Iterate through the commits in reverse
-        /// order; this sorting mode can be combined with
-        /// any of the above.
-        /// </summary>
-        Reverse = (1 << 2)
-    }
-}
+    /// <summary>
+    /// Iterate through the commits in reverse
+    /// order; this sorting mode can be combined with
+    /// any of the above.
+    /// </summary>
+    Reverse = (1 << 2)
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/IBranch.cs b/src/GitVersion.Core/Git/IBranch.cs
index 5f516e3707..6a0836a481 100644
--- a/src/GitVersion.Core/Git/IBranch.cs
+++ b/src/GitVersion.Core/Git/IBranch.cs
@@ -1,14 +1,12 @@
 using System;
 
-namespace GitVersion
-{
-    public interface IBranch : IEquatable<IBranch?>, IComparable<IBranch>, INamedReference
-    {
-        ICommit? Tip { get; }
-        bool IsRemote { get; }
-        bool IsTracking { get; }
-        bool IsDetachedHead { get; }
-        ICommitCollection? Commits { get; }
-    }
+namespace GitVersion;
 
-}
+public interface IBranch : IEquatable<IBranch?>, IComparable<IBranch>, INamedReference
+{
+    ICommit? Tip { get; }
+    bool IsRemote { get; }
+    bool IsTracking { get; }
+    bool IsDetachedHead { get; }
+    ICommitCollection? Commits { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/IBranchCollection.cs b/src/GitVersion.Core/Git/IBranchCollection.cs
index a2ffc42b22..8bcce0e5c8 100644
--- a/src/GitVersion.Core/Git/IBranchCollection.cs
+++ b/src/GitVersion.Core/Git/IBranchCollection.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IBranchCollection : IEnumerable<IBranch>
 {
-    public interface IBranchCollection : IEnumerable<IBranch>
-    {
-        IBranch? this[string name] { get; }
-        IEnumerable<IBranch> ExcludeBranches(IEnumerable<IBranch> branchesToExclude);
-        void UpdateTrackedBranch(IBranch branch, string remoteTrackingReferenceName);
-    }
-}
+    IBranch? this[string name] { get; }
+    IEnumerable<IBranch> ExcludeBranches(IEnumerable<IBranch> branchesToExclude);
+    void UpdateTrackedBranch(IBranch branch, string remoteTrackingReferenceName);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/ICommit.cs b/src/GitVersion.Core/Git/ICommit.cs
index d0a974025c..6b4efb4e63 100644
--- a/src/GitVersion.Core/Git/ICommit.cs
+++ b/src/GitVersion.Core/Git/ICommit.cs
@@ -1,12 +1,11 @@
 using System;
 using System.Collections.Generic;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface ICommit : IEquatable<ICommit?>, IComparable<ICommit>, IGitObject
 {
-    public interface ICommit : IEquatable<ICommit?>, IComparable<ICommit>, IGitObject
-    {
-        IEnumerable<ICommit> Parents { get; }
-        DateTimeOffset When { get; }
-        string Message { get; }
-    }
-}
+    IEnumerable<ICommit> Parents { get; }
+    DateTimeOffset When { get; }
+    string Message { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/ICommitCollection.cs b/src/GitVersion.Core/Git/ICommitCollection.cs
index a49f7d646f..02322eba92 100644
--- a/src/GitVersion.Core/Git/ICommitCollection.cs
+++ b/src/GitVersion.Core/Git/ICommitCollection.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface ICommitCollection : IEnumerable<ICommit>
 {
-    public interface ICommitCollection : IEnumerable<ICommit>
-    {
-        IEnumerable<ICommit> GetCommitsPriorTo(DateTimeOffset olderThan);
-        IEnumerable<ICommit> QueryBy(CommitFilter commitFilter);
-    }
-}
+    IEnumerable<ICommit> GetCommitsPriorTo(DateTimeOffset olderThan);
+    IEnumerable<ICommit> QueryBy(CommitFilter commitFilter);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/IGitObject.cs b/src/GitVersion.Core/Git/IGitObject.cs
index 181714b5ee..83bc5958ee 100644
--- a/src/GitVersion.Core/Git/IGitObject.cs
+++ b/src/GitVersion.Core/Git/IGitObject.cs
@@ -1,10 +1,9 @@
 using System;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IGitObject : IEquatable<IGitObject?>, IComparable<IGitObject>
 {
-    public interface IGitObject : IEquatable<IGitObject?>, IComparable<IGitObject>
-    {
-        IObjectId Id { get; }
-        string Sha { get; }
-    }
-}
+    IObjectId Id { get; }
+    string Sha { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/IGitRepository.cs b/src/GitVersion.Core/Git/IGitRepository.cs
index 376f463e89..a86438735e 100644
--- a/src/GitVersion.Core/Git/IGitRepository.cs
+++ b/src/GitVersion.Core/Git/IGitRepository.cs
@@ -1,18 +1,17 @@
-namespace GitVersion
+namespace GitVersion;
+
+public interface IGitRepository
 {
-    public interface IGitRepository
-    {
-        string Path { get; }
-        string WorkingDirectory { get; }
-        bool IsHeadDetached { get; }
-        IBranch Head { get; }
-        ITagCollection Tags { get; }
-        IReferenceCollection Refs { get; }
-        IBranchCollection Branches { get; }
-        ICommitCollection Commits { get; }
-        IRemoteCollection Remotes { get; }
+    string Path { get; }
+    string WorkingDirectory { get; }
+    bool IsHeadDetached { get; }
+    IBranch Head { get; }
+    ITagCollection Tags { get; }
+    IReferenceCollection Refs { get; }
+    IBranchCollection Branches { get; }
+    ICommitCollection Commits { get; }
+    IRemoteCollection Remotes { get; }
 
-        ICommit FindMergeBase(ICommit commit, ICommit otherCommit);
-        int GetNumberOfUncommittedChanges();
-    }
-}
+    ICommit FindMergeBase(ICommit commit, ICommit otherCommit);
+    int GetNumberOfUncommittedChanges();
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/IGitRepositoryInfo.cs b/src/GitVersion.Core/Git/IGitRepositoryInfo.cs
index 02ce1fa1c6..8d5376be3e 100644
--- a/src/GitVersion.Core/Git/IGitRepositoryInfo.cs
+++ b/src/GitVersion.Core/Git/IGitRepositoryInfo.cs
@@ -1,10 +1,9 @@
-namespace GitVersion
+namespace GitVersion;
+
+public interface IGitRepositoryInfo
 {
-    public interface IGitRepositoryInfo
-    {
-        string? DotGitDirectory { get; }
-        string? ProjectRootDirectory { get; }
-        string? DynamicGitRepositoryPath { get; }
-        string? GitRootPath { get; }
-    }
-}
+    string? DotGitDirectory { get; }
+    string? ProjectRootDirectory { get; }
+    string? DynamicGitRepositoryPath { get; }
+    string? GitRootPath { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/IMutatingGitRepository.cs b/src/GitVersion.Core/Git/IMutatingGitRepository.cs
index 72754a35cf..ec6dd4fc12 100644
--- a/src/GitVersion.Core/Git/IMutatingGitRepository.cs
+++ b/src/GitVersion.Core/Git/IMutatingGitRepository.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IMutatingGitRepository : IGitRepository
 {
-    public interface IMutatingGitRepository : IGitRepository
-    {
-        void CreateBranchForPullRequestBranch(AuthenticationInfo auth);
-        void Checkout(string commitOrBranchSpec);
-        void Fetch(string remote, IEnumerable<string> refSpecs, AuthenticationInfo auth, string? logMessage);
-        void Clone(string? sourceUrl, string? workdirPath, AuthenticationInfo auth);
-    }
-}
+    void CreateBranchForPullRequestBranch(AuthenticationInfo auth);
+    void Checkout(string commitOrBranchSpec);
+    void Fetch(string remote, IEnumerable<string> refSpecs, AuthenticationInfo auth, string? logMessage);
+    void Clone(string? sourceUrl, string? workdirPath, AuthenticationInfo auth);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/INamedReference.cs b/src/GitVersion.Core/Git/INamedReference.cs
index 15a9aff525..6ea1d91dfe 100644
--- a/src/GitVersion.Core/Git/INamedReference.cs
+++ b/src/GitVersion.Core/Git/INamedReference.cs
@@ -1,7 +1,6 @@
-namespace GitVersion
+namespace GitVersion;
+
+public interface INamedReference
 {
-    public interface INamedReference
-    {
-        ReferenceName Name { get; }
-    }
-}
+    ReferenceName Name { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/IObjectId.cs b/src/GitVersion.Core/Git/IObjectId.cs
index 6604a892af..765ce9d674 100644
--- a/src/GitVersion.Core/Git/IObjectId.cs
+++ b/src/GitVersion.Core/Git/IObjectId.cs
@@ -1,10 +1,9 @@
 using System;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IObjectId : IEquatable<IObjectId?>, IComparable<IObjectId>
 {
-    public interface IObjectId : IEquatable<IObjectId?>, IComparable<IObjectId>
-    {
-        string Sha { get; }
-        string ToString(int prefixLength);
-    }
-}
+    string Sha { get; }
+    string ToString(int prefixLength);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/IRefSpec.cs b/src/GitVersion.Core/Git/IRefSpec.cs
index f8e49353ae..b64706ecf3 100644
--- a/src/GitVersion.Core/Git/IRefSpec.cs
+++ b/src/GitVersion.Core/Git/IRefSpec.cs
@@ -1,12 +1,11 @@
 using System;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IRefSpec : IEquatable<IRefSpec?>, IComparable<IRefSpec>
 {
-    public interface IRefSpec : IEquatable<IRefSpec?>, IComparable<IRefSpec>
-    {
-        string Specification { get; }
-        RefSpecDirection Direction { get; }
-        string Source { get; }
-        string Destination { get; }
-    }
-}
+    string Specification { get; }
+    RefSpecDirection Direction { get; }
+    string Source { get; }
+    string Destination { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/IRefSpecCollection.cs b/src/GitVersion.Core/Git/IRefSpecCollection.cs
index 43e55ed9cc..59e212a202 100644
--- a/src/GitVersion.Core/Git/IRefSpecCollection.cs
+++ b/src/GitVersion.Core/Git/IRefSpecCollection.cs
@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IRefSpecCollection : IEnumerable<IRefSpec>
 {
-    public interface IRefSpecCollection : IEnumerable<IRefSpec>
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/IReference.cs b/src/GitVersion.Core/Git/IReference.cs
index 38029d372b..5f5ed48c63 100644
--- a/src/GitVersion.Core/Git/IReference.cs
+++ b/src/GitVersion.Core/Git/IReference.cs
@@ -1,10 +1,9 @@
 using System;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IReference : IEquatable<IReference?>, IComparable<IReference>, INamedReference
 {
-    public interface IReference : IEquatable<IReference?>, IComparable<IReference>, INamedReference
-    {
-        string TargetIdentifier { get; }
-        IObjectId? ReferenceTargetId { get; }
-    }
-}
+    string TargetIdentifier { get; }
+    IObjectId? ReferenceTargetId { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/IReferenceCollection.cs b/src/GitVersion.Core/Git/IReferenceCollection.cs
index b9f84e4ae4..f71a96ba5d 100644
--- a/src/GitVersion.Core/Git/IReferenceCollection.cs
+++ b/src/GitVersion.Core/Git/IReferenceCollection.cs
@@ -1,14 +1,12 @@
 using System.Collections.Generic;
 
-namespace GitVersion
-{
-    public interface IReferenceCollection : IEnumerable<IReference>
-    {
-        IReference? Head { get; }
-        IReference? this[string name] { get; }
-        void Add(string name, string canonicalRefNameOrObjectish, bool allowOverwrite = false);
-        void UpdateTarget(IReference directRef, IObjectId targetId);
-        IEnumerable<IReference> FromGlob(string prefix);
-    }
+namespace GitVersion;
 
-}
+public interface IReferenceCollection : IEnumerable<IReference>
+{
+    IReference? Head { get; }
+    IReference? this[string name] { get; }
+    void Add(string name, string canonicalRefNameOrObjectish, bool allowOverwrite = false);
+    void UpdateTarget(IReference directRef, IObjectId targetId);
+    IEnumerable<IReference> FromGlob(string prefix);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/IRemote.cs b/src/GitVersion.Core/Git/IRemote.cs
index 64bbb9cda7..2bfe97c6d6 100644
--- a/src/GitVersion.Core/Git/IRemote.cs
+++ b/src/GitVersion.Core/Git/IRemote.cs
@@ -1,15 +1,14 @@
 using System;
 using System.Collections.Generic;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IRemote : IEquatable<IRemote?>, IComparable<IRemote>
 {
-    public interface IRemote : IEquatable<IRemote?>, IComparable<IRemote>
-    {
-        string Name { get; }
-        string Url { get; }
+    string Name { get; }
+    string Url { get; }
 
-        IEnumerable<IRefSpec> RefSpecs { get; }
-        IEnumerable<IRefSpec> FetchRefSpecs { get; }
-        IEnumerable<IRefSpec> PushRefSpecs { get; }
-    }
-}
+    IEnumerable<IRefSpec> RefSpecs { get; }
+    IEnumerable<IRefSpec> FetchRefSpecs { get; }
+    IEnumerable<IRefSpec> PushRefSpecs { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/IRemoteCollection.cs b/src/GitVersion.Core/Git/IRemoteCollection.cs
index e5aff4fef1..985363ac06 100644
--- a/src/GitVersion.Core/Git/IRemoteCollection.cs
+++ b/src/GitVersion.Core/Git/IRemoteCollection.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface IRemoteCollection : IEnumerable<IRemote>
 {
-    public interface IRemoteCollection : IEnumerable<IRemote>
-    {
-        IRemote? this[string name] { get; }
-        void Remove(string remoteName);
-        void Update(string remoteName, string refSpec);
-    }
-}
+    IRemote? this[string name] { get; }
+    void Remove(string remoteName);
+    void Update(string remoteName, string refSpec);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/ITag.cs b/src/GitVersion.Core/Git/ITag.cs
index 38e72cab6c..5389b9740e 100644
--- a/src/GitVersion.Core/Git/ITag.cs
+++ b/src/GitVersion.Core/Git/ITag.cs
@@ -1,10 +1,9 @@
 using System;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface ITag : IEquatable<ITag?>, IComparable<ITag>, INamedReference
 {
-    public interface ITag : IEquatable<ITag?>, IComparable<ITag>, INamedReference
-    {
-        string TargetSha { get; }
-        ICommit? PeeledTargetCommit();
-    }
-}
+    string TargetSha { get; }
+    ICommit? PeeledTargetCommit();
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/ITagCollection.cs b/src/GitVersion.Core/Git/ITagCollection.cs
index 1e1afc0635..82df491be5 100644
--- a/src/GitVersion.Core/Git/ITagCollection.cs
+++ b/src/GitVersion.Core/Git/ITagCollection.cs
@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 
-namespace GitVersion
+namespace GitVersion;
+
+public interface ITagCollection : IEnumerable<ITag>
 {
-    public interface ITagCollection : IEnumerable<ITag>
-    {
-    }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/RefSpecDirection.cs b/src/GitVersion.Core/Git/RefSpecDirection.cs
index c437c7d775..ea30c9aa32 100644
--- a/src/GitVersion.Core/Git/RefSpecDirection.cs
+++ b/src/GitVersion.Core/Git/RefSpecDirection.cs
@@ -1,8 +1,7 @@
-namespace GitVersion
+namespace GitVersion;
+
+public enum RefSpecDirection
 {
-    public enum RefSpecDirection
-    {
-        Fetch,
-        Push
-    }
-}
+    Fetch,
+    Push
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Git/ReferenceName.cs b/src/GitVersion.Core/Git/ReferenceName.cs
index e13f31dce2..b1514c172d 100644
--- a/src/GitVersion.Core/Git/ReferenceName.cs
+++ b/src/GitVersion.Core/Git/ReferenceName.cs
@@ -1,81 +1,80 @@
 using System;
 using GitVersion.Helpers;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class ReferenceName : IEquatable<ReferenceName?>, IComparable<ReferenceName>
 {
-    public class ReferenceName : IEquatable<ReferenceName?>, IComparable<ReferenceName>
-    {
-        private static readonly LambdaEqualityHelper<ReferenceName> equalityHelper = new(x => x.Canonical);
-        private static readonly LambdaKeyComparer<ReferenceName, string> comparerHelper = new(x => x.Canonical);
+    private static readonly LambdaEqualityHelper<ReferenceName> equalityHelper = new(x => x.Canonical);
+    private static readonly LambdaKeyComparer<ReferenceName, string> comparerHelper = new(x => x.Canonical);
 
-        private const string LocalBranchPrefix = "refs/heads/";
-        private const string RemoteTrackingBranchPrefix = "refs/remotes/";
-        private const string TagPrefix = "refs/tags/";
-        private const string PullRequestPrefix1 = "refs/pull/";
-        private const string PullRequestPrefix2 = "refs/pull-requests/";
+    private const string LocalBranchPrefix = "refs/heads/";
+    private const string RemoteTrackingBranchPrefix = "refs/remotes/";
+    private const string TagPrefix = "refs/tags/";
+    private const string PullRequestPrefix1 = "refs/pull/";
+    private const string PullRequestPrefix2 = "refs/pull-requests/";
 
-        public ReferenceName(string canonical)
-        {
-            Canonical = canonical ?? throw new ArgumentNullException(nameof(canonical));
-            Friendly = Shorten();
-            WithoutRemote = RemoveRemote();
+    public ReferenceName(string canonical)
+    {
+        Canonical = canonical ?? throw new ArgumentNullException(nameof(canonical));
+        Friendly = Shorten();
+        WithoutRemote = RemoveRemote();
 
-            IsBranch = IsPrefixedBy(Canonical, LocalBranchPrefix);
-            IsRemoteBranch = IsPrefixedBy(Canonical, RemoteTrackingBranchPrefix);
-            IsTag = IsPrefixedBy(Canonical, TagPrefix);
-            IsPullRequest = IsPrefixedBy(Canonical, PullRequestPrefix1) || IsPrefixedBy(Canonical, PullRequestPrefix2);
-        }
+        IsBranch = IsPrefixedBy(Canonical, LocalBranchPrefix);
+        IsRemoteBranch = IsPrefixedBy(Canonical, RemoteTrackingBranchPrefix);
+        IsTag = IsPrefixedBy(Canonical, TagPrefix);
+        IsPullRequest = IsPrefixedBy(Canonical, PullRequestPrefix1) || IsPrefixedBy(Canonical, PullRequestPrefix2);
+    }
 
-        public static ReferenceName Parse(string canonicalName)
+    public static ReferenceName Parse(string canonicalName)
+    {
+        if (IsPrefixedBy(canonicalName, LocalBranchPrefix)
+            || IsPrefixedBy(canonicalName, RemoteTrackingBranchPrefix)
+            || IsPrefixedBy(canonicalName, TagPrefix)
+            || IsPrefixedBy(canonicalName, PullRequestPrefix1)
+            || IsPrefixedBy(canonicalName, PullRequestPrefix2))
         {
-            if (IsPrefixedBy(canonicalName, LocalBranchPrefix)
-                || IsPrefixedBy(canonicalName, RemoteTrackingBranchPrefix)
-                || IsPrefixedBy(canonicalName, TagPrefix)
-                || IsPrefixedBy(canonicalName, PullRequestPrefix1)
-                || IsPrefixedBy(canonicalName, PullRequestPrefix2))
-            {
-                return new ReferenceName(canonicalName);
-            }
-            throw new ArgumentException($"The {nameof(canonicalName)} is not a Canonical name");
+            return new ReferenceName(canonicalName);
         }
-        public string Canonical { get; }
-        public string Friendly { get; }
-        public string WithoutRemote { get; }
-        public bool IsBranch { get; }
-        public bool IsRemoteBranch { get; }
-        public bool IsTag { get; }
-        public bool IsPullRequest { get; }
+        throw new ArgumentException($"The {nameof(canonicalName)} is not a Canonical name");
+    }
+    public string Canonical { get; }
+    public string Friendly { get; }
+    public string WithoutRemote { get; }
+    public bool IsBranch { get; }
+    public bool IsRemoteBranch { get; }
+    public bool IsTag { get; }
+    public bool IsPullRequest { get; }
 
-        public bool Equals(ReferenceName? other) => equalityHelper.Equals(this, other);
-        public int CompareTo(ReferenceName other) => comparerHelper.Compare(this, other);
-        public override bool Equals(object obj) => Equals((obj as ReferenceName)!);
-        public override int GetHashCode() => equalityHelper.GetHashCode(this);
-        public override string ToString() => Friendly;
+    public bool Equals(ReferenceName? other) => equalityHelper.Equals(this, other);
+    public int CompareTo(ReferenceName other) => comparerHelper.Compare(this, other);
+    public override bool Equals(object obj) => Equals((obj as ReferenceName)!);
+    public override int GetHashCode() => equalityHelper.GetHashCode(this);
+    public override string ToString() => Friendly;
 
-        public bool EquivalentTo(string? name) =>
-            Canonical.Equals(name, StringComparison.OrdinalIgnoreCase)
-            || Friendly.Equals(name, StringComparison.OrdinalIgnoreCase)
-            || WithoutRemote.Equals(name, StringComparison.OrdinalIgnoreCase);
+    public bool EquivalentTo(string? name) =>
+        Canonical.Equals(name, StringComparison.OrdinalIgnoreCase)
+        || Friendly.Equals(name, StringComparison.OrdinalIgnoreCase)
+        || WithoutRemote.Equals(name, StringComparison.OrdinalIgnoreCase);
 
-        private string Shorten()
-        {
-            if (IsPrefixedBy(Canonical, LocalBranchPrefix))
-                return Canonical.Substring(LocalBranchPrefix.Length);
-            if (IsPrefixedBy(Canonical, RemoteTrackingBranchPrefix))
-                return Canonical.Substring(RemoteTrackingBranchPrefix.Length);
-            if (IsPrefixedBy(Canonical, TagPrefix))
-                return Canonical.Substring(TagPrefix.Length);
-            return Canonical;
-        }
+    private string Shorten()
+    {
+        if (IsPrefixedBy(Canonical, LocalBranchPrefix))
+            return Canonical.Substring(LocalBranchPrefix.Length);
+        if (IsPrefixedBy(Canonical, RemoteTrackingBranchPrefix))
+            return Canonical.Substring(RemoteTrackingBranchPrefix.Length);
+        if (IsPrefixedBy(Canonical, TagPrefix))
+            return Canonical.Substring(TagPrefix.Length);
+        return Canonical;
+    }
 
-        private string RemoveRemote()
-        {
-            var isRemote = IsPrefixedBy(Canonical, RemoteTrackingBranchPrefix);
+    private string RemoveRemote()
+    {
+        var isRemote = IsPrefixedBy(Canonical, RemoteTrackingBranchPrefix);
 
-            return isRemote
-                ? Friendly.Substring(Friendly.IndexOf("/", StringComparison.Ordinal) + 1)
-                : Friendly;
-        }
-        private static bool IsPrefixedBy(string input, string prefix) => input.StartsWith(prefix, StringComparison.Ordinal);
+        return isRemote
+            ? Friendly.Substring(Friendly.IndexOf("/", StringComparison.Ordinal) + 1)
+            : Friendly;
     }
-}
+    private static bool IsPrefixedBy(string input, string prefix) => input.StartsWith(prefix, StringComparison.Ordinal);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/GitVersionCoreModule.cs b/src/GitVersion.Core/GitVersionCoreModule.cs
index 4ecee1af4a..c2f61283fa 100644
--- a/src/GitVersion.Core/GitVersionCoreModule.cs
+++ b/src/GitVersion.Core/GitVersionCoreModule.cs
@@ -10,38 +10,37 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class GitVersionCoreModule : IGitVersionModule
 {
-    public class GitVersionCoreModule : IGitVersionModule
+    public void RegisterTypes(IServiceCollection services)
     {
-        public void RegisterTypes(IServiceCollection services)
-        {
-            services.AddSingleton<ILog, Log>();
-            services.AddSingleton<IFileSystem, FileSystem>();
-            services.AddSingleton<IEnvironment, Environment>();
-            services.AddSingleton<IConsole, ConsoleAdapter>();
+        services.AddSingleton<ILog, Log>();
+        services.AddSingleton<IFileSystem, FileSystem>();
+        services.AddSingleton<IEnvironment, Environment>();
+        services.AddSingleton<IConsole, ConsoleAdapter>();
 
-            services.AddSingleton<IGitVersionCache, GitVersionCache>();
-            services.AddSingleton<IGitVersionCacheKeyFactory, GitVersionCacheKeyFactory>();
+        services.AddSingleton<IGitVersionCache, GitVersionCache>();
+        services.AddSingleton<IGitVersionCacheKeyFactory, GitVersionCacheKeyFactory>();
 
-            services.AddSingleton<IGitVersionCalculateTool, GitVersionCalculateTool>();
-            services.AddSingleton<IGitVersionOutputTool, GitVersionOutputTool>();
+        services.AddSingleton<IGitVersionCalculateTool, GitVersionCalculateTool>();
+        services.AddSingleton<IGitVersionOutputTool, GitVersionOutputTool>();
 
-            services.AddSingleton<IGitPreparer, GitPreparer>();
-            services.AddSingleton<IRepositoryStore, RepositoryStore>();
+        services.AddSingleton<IGitPreparer, GitPreparer>();
+        services.AddSingleton<IRepositoryStore, RepositoryStore>();
 
-            services.AddSingleton<IGitVersionContextFactory, GitVersionContextFactory>();
-            services.AddSingleton(sp =>
-            {
-                var options = sp.GetService<IOptions<GitVersionOptions>>();
-                var contextFactory = sp.GetService<IGitVersionContextFactory>();
-                return new Lazy<GitVersionContext?>(() => contextFactory?.Create(options?.Value));
-            });
+        services.AddSingleton<IGitVersionContextFactory, GitVersionContextFactory>();
+        services.AddSingleton(sp =>
+        {
+            var options = sp.GetService<IOptions<GitVersionOptions>>();
+            var contextFactory = sp.GetService<IGitVersionContextFactory>();
+            return new Lazy<GitVersionContext?>(() => contextFactory?.Create(options?.Value));
+        });
 
-            services.AddModule(new BuildServerModule());
-            services.AddModule(new ConfigurationModule());
-            services.AddModule(new VersionCalculationModule());
-            services.AddModule(new VersionConvertersModule());
-        }
+        services.AddModule(new BuildServerModule());
+        services.AddModule(new ConfigurationModule());
+        services.AddModule(new VersionCalculationModule());
+        services.AddModule(new VersionConvertersModule());
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Helpers/EncodingHelper.cs b/src/GitVersion.Core/Helpers/EncodingHelper.cs
index fbf2b24c3c..cd01ffdd83 100644
--- a/src/GitVersion.Core/Helpers/EncodingHelper.cs
+++ b/src/GitVersion.Core/Helpers/EncodingHelper.cs
@@ -3,99 +3,98 @@
 using System.Linq;
 using System.Text;
 
-namespace GitVersion.Helpers
+namespace GitVersion.Helpers;
+
+public static class EncodingHelper
 {
-    public static class EncodingHelper
-    {
-        private static IList<Encoding>? encodingsWithPreambles;
+    private static IList<Encoding>? encodingsWithPreambles;
 
-        private static int maxPreambleLength;
+    private static int maxPreambleLength;
 
-        /// <summary>
-        /// Detects the encoding of a file if and only if it includes a preamble .
-        /// </summary>
-        /// <param name="filename">The file name to check the encoding of.</param>
-        /// <returns>The encoding of the file if it has a preamble otherwise null.</returns>
-        public static Encoding? DetectEncoding(string? filename)
+    /// <summary>
+    /// Detects the encoding of a file if and only if it includes a preamble .
+    /// </summary>
+    /// <param name="filename">The file name to check the encoding of.</param>
+    /// <returns>The encoding of the file if it has a preamble otherwise null.</returns>
+    public static Encoding? DetectEncoding(string? filename)
+    {
+        if (!File.Exists(filename))
         {
-            if (!File.Exists(filename))
-            {
-                return null;
-            }
-
-            if (encodingsWithPreambles == null)
-            {
-                ScanEncodings();
-            }
-
-            using var stream = File.OpenRead(filename);
-            // No bytes? No encoding!
-            if (stream.Length == 0)
-            {
-                return null;
-            }
-
-            // Read the minimum amount necessary.
-            var length = stream.Length > maxPreambleLength ? maxPreambleLength : stream.Length;
+            return null;
+        }
 
-            var bytes = new byte[length];
-            stream.Read(bytes, 0, (int)length);
-            return DetectEncoding(bytes);
+        if (encodingsWithPreambles == null)
+        {
+            ScanEncodings();
         }
 
-        /// <summary>
-        /// Returns the first encoding where all the preamble bytes match exactly.
-        /// </summary>
-        /// <param name="bytes">The bytes to check for a matching preamble.</param>
-        /// <returns>The encoding that has a matching preamble or null if one was not found.</returns>
-        public static Encoding? DetectEncoding(IList<byte> bytes)
+        using var stream = File.OpenRead(filename);
+        // No bytes? No encoding!
+        if (stream.Length == 0)
         {
-            if (bytes == null || bytes.Count == 0)
-            {
-                return null;
-            }
+            return null;
+        }
 
-            if (encodingsWithPreambles == null)
-            {
-                ScanEncodings();
-            }
+        // Read the minimum amount necessary.
+        var length = stream.Length > maxPreambleLength ? maxPreambleLength : stream.Length;
 
-            return encodingsWithPreambles.FirstOrDefault(encoding => PreambleMatches(encoding, bytes));
-        }
+        var bytes = new byte[length];
+        stream.Read(bytes, 0, (int)length);
+        return DetectEncoding(bytes);
+    }
 
-        /// <summary>
-        /// Returns an ordered list of encodings that have preambles ordered by the length of the
-        /// preamble longest to shortest. This prevents a short preamble masking a longer one
-        /// later in the list.
-        /// </summary>
-        /// <returns>An ordered list of encodings and corresponding preambles.</returns>
-        private static void ScanEncodings()
+    /// <summary>
+    /// Returns the first encoding where all the preamble bytes match exactly.
+    /// </summary>
+    /// <param name="bytes">The bytes to check for a matching preamble.</param>
+    /// <returns>The encoding that has a matching preamble or null if one was not found.</returns>
+    public static Encoding? DetectEncoding(IList<byte> bytes)
+    {
+        if (bytes == null || bytes.Count == 0)
         {
-            var encodings = (Encoding.GetEncodings());
-            encodingsWithPreambles = (from info in encodings
-                                      let encoding = info.GetEncoding()
-                                      let preamble = encoding.GetPreamble()
-                                      where preamble.Length > 0
-                                      orderby preamble.Length descending
-                                      select encoding).ToList();
-
-            var encodingWithLongestPreamble = encodingsWithPreambles.FirstOrDefault();
-            maxPreambleLength = encodingWithLongestPreamble?.GetPreamble().Length ?? 0;
+            return null;
         }
 
-        /// <summary>
-        /// Verifies that all bytes of an encoding's preamble are present at the beginning of some sample data.
-        /// </summary>
-        /// <param name="encoding">The encoding to check against.</param>
-        /// <param name="data">The data to test.</param>
-        /// <returns>A boolean indicating if a preamble match was found.</returns>
-        private static bool PreambleMatches(Encoding encoding, IList<byte> data)
+        if (encodingsWithPreambles == null)
         {
-            var preamble = encoding.GetPreamble();
-            if (preamble.Length > data.Count)
-                return false;
-
-            return !preamble.Where((preambleByte, index) => data[index] != preambleByte).Any();
+            ScanEncodings();
         }
+
+        return encodingsWithPreambles.FirstOrDefault(encoding => PreambleMatches(encoding, bytes));
+    }
+
+    /// <summary>
+    /// Returns an ordered list of encodings that have preambles ordered by the length of the
+    /// preamble longest to shortest. This prevents a short preamble masking a longer one
+    /// later in the list.
+    /// </summary>
+    /// <returns>An ordered list of encodings and corresponding preambles.</returns>
+    private static void ScanEncodings()
+    {
+        var encodings = (Encoding.GetEncodings());
+        encodingsWithPreambles = (from info in encodings
+                                  let encoding = info.GetEncoding()
+                                  let preamble = encoding.GetPreamble()
+                                  where preamble.Length > 0
+                                  orderby preamble.Length descending
+                                  select encoding).ToList();
+
+        var encodingWithLongestPreamble = encodingsWithPreambles.FirstOrDefault();
+        maxPreambleLength = encodingWithLongestPreamble?.GetPreamble().Length ?? 0;
+    }
+
+    /// <summary>
+    /// Verifies that all bytes of an encoding's preamble are present at the beginning of some sample data.
+    /// </summary>
+    /// <param name="encoding">The encoding to check against.</param>
+    /// <param name="data">The data to test.</param>
+    /// <returns>A boolean indicating if a preamble match was found.</returns>
+    private static bool PreambleMatches(Encoding encoding, IList<byte> data)
+    {
+        var preamble = encoding.GetPreamble();
+        if (preamble.Length > data.Count)
+            return false;
+
+        return !preamble.Where((preambleByte, index) => data[index] != preambleByte).Any();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Helpers/LambdaEqualityHelper.cs b/src/GitVersion.Core/Helpers/LambdaEqualityHelper.cs
index 89197af662..927574a873 100644
--- a/src/GitVersion.Core/Helpers/LambdaEqualityHelper.cs
+++ b/src/GitVersion.Core/Helpers/LambdaEqualityHelper.cs
@@ -1,60 +1,58 @@
 using System;
 
-namespace GitVersion.Helpers
+namespace GitVersion.Helpers;
+
+// From the LibGit2Sharp project (libgit2sharp.com)
+// MIT License - Copyright (c) 2011-2014 LibGit2Sharp contributors
+// see https://github.com/libgit2/libgit2sharp/blob/7af5c60f22f9bd6064204f84467cfa62bedd1147/LibGit2Sharp/Core/LambdaEqualityHelper.cs
+public class LambdaEqualityHelper<T>
 {
-    // From the LibGit2Sharp project (libgit2sharp.com)
-    // MIT License - Copyright (c) 2011-2014 LibGit2Sharp contributors
-    // see https://github.com/libgit2/libgit2sharp/blob/7af5c60f22f9bd6064204f84467cfa62bedd1147/LibGit2Sharp/Core/LambdaEqualityHelper.cs
-    public class LambdaEqualityHelper<T>
-    {
-        private readonly Func<T, object?>[] equalityContributorAccessors;
+    private readonly Func<T, object?>[] equalityContributorAccessors;
 
-        public LambdaEqualityHelper(params Func<T, object?>[] equalityContributorAccessors) =>
-            this.equalityContributorAccessors = equalityContributorAccessors;
+    public LambdaEqualityHelper(params Func<T, object?>[] equalityContributorAccessors) =>
+        this.equalityContributorAccessors = equalityContributorAccessors;
 
-        public bool Equals(T? instance, T? other)
+    public bool Equals(T? instance, T? other)
+    {
+        if (instance is null || other is null)
         {
-            if (instance is null || other is null)
-            {
-                return false;
-            }
+            return false;
+        }
 
-            if (ReferenceEquals(instance, other))
-            {
-                return true;
-            }
+        if (ReferenceEquals(instance, other))
+        {
+            return true;
+        }
+
+        if (instance.GetType() != other.GetType())
+        {
+            return false;
+        }
 
-            if (instance.GetType() != other.GetType())
+        foreach (var accessor in this.equalityContributorAccessors)
+        {
+            if (!Equals(accessor(instance), accessor(other)))
             {
                 return false;
             }
+        }
 
-            foreach (var accessor in this.equalityContributorAccessors)
-            {
-                if (!Equals(accessor(instance), accessor(other)))
-                {
-                    return false;
-                }
-            }
+        return true;
+    }
 
-            return true;
-        }
+    public int GetHashCode(T instance)
+    {
+        var hashCode = GetType().GetHashCode();
 
-        public int GetHashCode(T instance)
+        unchecked
         {
-            var hashCode = GetType().GetHashCode();
-
-            unchecked
+            foreach (var accessor in this.equalityContributorAccessors)
             {
-                foreach (var accessor in this.equalityContributorAccessors)
-                {
-                    var item = accessor(instance);
-                    hashCode = (hashCode * 397) ^ (item != null ? item.GetHashCode() : 0);
-                }
+                var item = accessor(instance);
+                hashCode = (hashCode * 397) ^ (item != null ? item.GetHashCode() : 0);
             }
-
-            return hashCode;
         }
-    }
 
-}
+        return hashCode;
+    }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Helpers/LambdaKeyComparer.cs b/src/GitVersion.Core/Helpers/LambdaKeyComparer.cs
index f83cc9eb1f..315f406424 100644
--- a/src/GitVersion.Core/Helpers/LambdaKeyComparer.cs
+++ b/src/GitVersion.Core/Helpers/LambdaKeyComparer.cs
@@ -1,33 +1,32 @@
 using System;
 using System.Collections.Generic;
 
-namespace GitVersion.Helpers
+namespace GitVersion.Helpers;
+
+public class LambdaKeyComparer<TSource, TKey> : Comparer<TSource> where TSource : class
 {
-    public class LambdaKeyComparer<TSource, TKey> : Comparer<TSource> where TSource : class
-    {
-        private readonly Func<TSource, TKey> keySelector;
-        private readonly IComparer<TKey> innerComparer;
+    private readonly Func<TSource, TKey> keySelector;
+    private readonly IComparer<TKey> innerComparer;
 
-        public LambdaKeyComparer(
-            Func<TSource, TKey> keySelector,
-            IComparer<TKey>? innerComparer = null)
-        {
-            this.keySelector = keySelector;
-            this.innerComparer = innerComparer ?? Comparer<TKey>.Default;
-        }
+    public LambdaKeyComparer(
+        Func<TSource, TKey> keySelector,
+        IComparer<TKey>? innerComparer = null)
+    {
+        this.keySelector = keySelector;
+        this.innerComparer = innerComparer ?? Comparer<TKey>.Default;
+    }
 
-        public override int Compare(TSource x, TSource y)
-        {
-            if (ReferenceEquals(x, y))
-                return 0;
-            if (x == null)
-                return -1;
-            if (y == null)
-                return 1;
+    public override int Compare(TSource x, TSource y)
+    {
+        if (ReferenceEquals(x, y))
+            return 0;
+        if (x == null)
+            return -1;
+        if (y == null)
+            return 1;
 
-            var xKey = this.keySelector(x);
-            var yKey = this.keySelector(y);
-            return this.innerComparer.Compare(xKey, yKey);
-        }
+        var xKey = this.keySelector(x);
+        var yKey = this.keySelector(y);
+        return this.innerComparer.Compare(xKey, yKey);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Helpers/ProcessHelper.cs b/src/GitVersion.Core/Helpers/ProcessHelper.cs
index 63cbb309b4..8e1199f2ae 100644
--- a/src/GitVersion.Core/Helpers/ProcessHelper.cs
+++ b/src/GitVersion.Core/Helpers/ProcessHelper.cs
@@ -7,212 +7,211 @@
 using System.Threading;
 using GitVersion.Extensions;
 
-namespace GitVersion.Helpers
+namespace GitVersion.Helpers;
+
+public static class ProcessHelper
 {
-    public static class ProcessHelper
+    private static readonly object LockObject = new();
+
+    // http://social.msdn.microsoft.com/Forums/en/netfxbcl/thread/f6069441-4ab1-4299-ad6a-b8bb9ed36be3
+    private static Process? Start(ProcessStartInfo startInfo)
     {
-        private static readonly object LockObject = new();
+        Process process;
 
-        // http://social.msdn.microsoft.com/Forums/en/netfxbcl/thread/f6069441-4ab1-4299-ad6a-b8bb9ed36be3
-        private static Process? Start(ProcessStartInfo startInfo)
+        lock (LockObject)
         {
-            Process process;
-
-            lock (LockObject)
+            using (new ChangeErrorMode(ErrorModes.FailCriticalErrors | ErrorModes.NoGpFaultErrorBox))
             {
-                using (new ChangeErrorMode(ErrorModes.FailCriticalErrors | ErrorModes.NoGpFaultErrorBox))
+                try
                 {
-                    try
-                    {
-                        process = Process.Start(startInfo);
-                    }
-                    catch (Win32Exception exception)
+                    process = Process.Start(startInfo);
+                }
+                catch (Win32Exception exception)
+                {
+                    switch ((NativeErrorCode)exception.NativeErrorCode)
                     {
-                        switch ((NativeErrorCode)exception.NativeErrorCode)
-                        {
-                            case NativeErrorCode.Success:
-                                // Success is not a failure.
-                                break;
-
-                            case NativeErrorCode.FileNotFound:
-                                throw new FileNotFoundException($"The executable file '{startInfo.FileName}' could not be found.",
-                                    startInfo.FileName,
-                                    exception);
-
-                            case NativeErrorCode.PathNotFound:
-                                throw new DirectoryNotFoundException($"The path to the executable file '{startInfo.FileName}' could not be found.",
-                                    exception);
-                        }
-
-                        throw;
+                        case NativeErrorCode.Success:
+                            // Success is not a failure.
+                            break;
+
+                        case NativeErrorCode.FileNotFound:
+                            throw new FileNotFoundException($"The executable file '{startInfo.FileName}' could not be found.",
+                                startInfo.FileName,
+                                exception);
+
+                        case NativeErrorCode.PathNotFound:
+                            throw new DirectoryNotFoundException($"The path to the executable file '{startInfo.FileName}' could not be found.",
+                                exception);
                     }
 
-                    try
-                    {
-                        if (process != null)
-                        {
-                            process.PriorityClass = ProcessPriorityClass.Idle;
-                        }
-                    }
-                    catch
+                    throw;
+                }
+
+                try
+                {
+                    if (process != null)
                     {
-                        // NOTE: It seems like in some situations, setting the priority class will throw a Win32Exception
-                        // with the error code set to "Success", which I think we can safely interpret as a success and
-                        // not an exception.
-                        //
-                        // See: https://travis-ci.org/GitTools/GitVersion/jobs/171288284#L2026
-                        // And: https://msdn.microsoft.com/en-us/library/windows/desktop/ms681382.aspx
-                        //
-                        // There's also the case where the process might be killed before we try to adjust its priority
-                        // class, in which case it will throw an InvalidOperationException. What we ideally should do
-                        // is start the process in a "suspended" state, adjust the priority class, then resume it, but
-                        // that's not possible in pure .NET.
-                        //
-                        // See: https://travis-ci.org/GitTools/GitVersion/jobs/166709203#L2278
-                        // And: http://www.codeproject.com/Articles/230005/Launch-a-process-suspended
-                        //
-                        // -- @asbjornu
+                        process.PriorityClass = ProcessPriorityClass.Idle;
                     }
                 }
+                catch
+                {
+                    // NOTE: It seems like in some situations, setting the priority class will throw a Win32Exception
+                    // with the error code set to "Success", which I think we can safely interpret as a success and
+                    // not an exception.
+                    //
+                    // See: https://travis-ci.org/GitTools/GitVersion/jobs/171288284#L2026
+                    // And: https://msdn.microsoft.com/en-us/library/windows/desktop/ms681382.aspx
+                    //
+                    // There's also the case where the process might be killed before we try to adjust its priority
+                    // class, in which case it will throw an InvalidOperationException. What we ideally should do
+                    // is start the process in a "suspended" state, adjust the priority class, then resume it, but
+                    // that's not possible in pure .NET.
+                    //
+                    // See: https://travis-ci.org/GitTools/GitVersion/jobs/166709203#L2278
+                    // And: http://www.codeproject.com/Articles/230005/Launch-a-process-suspended
+                    //
+                    // -- @asbjornu
+                }
             }
-
-            return process;
         }
 
-        // http://csharptest.net/532/using-processstart-to-capture-console-output/
-        public static int Run(Action<string> output, Action<string> errorOutput, TextReader? input, string exe, string args, string workingDirectory, params KeyValuePair<string, string>[] environmentalVariables)
-        {
-            if (exe.IsNullOrEmpty())
-                throw new ArgumentNullException(nameof(exe));
-            if (output == null)
-                throw new ArgumentNullException(nameof(output));
+        return process;
+    }
+
+    // http://csharptest.net/532/using-processstart-to-capture-console-output/
+    public static int Run(Action<string> output, Action<string> errorOutput, TextReader? input, string exe, string args, string workingDirectory, params KeyValuePair<string, string>[] environmentalVariables)
+    {
+        if (exe.IsNullOrEmpty())
+            throw new ArgumentNullException(nameof(exe));
+        if (output == null)
+            throw new ArgumentNullException(nameof(output));
 
-            workingDirectory ??= System.Environment.CurrentDirectory;
+        workingDirectory ??= System.Environment.CurrentDirectory;
 
-            var psi = new ProcessStartInfo
+        var psi = new ProcessStartInfo
+        {
+            UseShellExecute = false,
+            RedirectStandardError = true,
+            RedirectStandardOutput = true,
+            RedirectStandardInput = true,
+            WindowStyle = ProcessWindowStyle.Hidden,
+            CreateNoWindow = true,
+            ErrorDialog = false,
+            WorkingDirectory = workingDirectory,
+            FileName = exe,
+            Arguments = args
+        };
+        foreach (var environmentalVariable in environmentalVariables)
+        {
+            if (psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key))
             {
-                UseShellExecute = false,
-                RedirectStandardError = true,
-                RedirectStandardOutput = true,
-                RedirectStandardInput = true,
-                WindowStyle = ProcessWindowStyle.Hidden,
-                CreateNoWindow = true,
-                ErrorDialog = false,
-                WorkingDirectory = workingDirectory,
-                FileName = exe,
-                Arguments = args
-            };
-            foreach (var environmentalVariable in environmentalVariables)
+                psi.EnvironmentVariables[environmentalVariable.Key] = environmentalVariable.Value;
+            }
+            else
             {
-                if (psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key))
-                {
-                    psi.EnvironmentVariables[environmentalVariable.Key] = environmentalVariable.Value;
-                }
-                else
-                {
-                    psi.EnvironmentVariables.Add(environmentalVariable.Key, environmentalVariable.Value);
-                }
-                if (psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key) && environmentalVariable.Value == null)
-                {
-                    psi.EnvironmentVariables.Remove(environmentalVariable.Key);
-                }
+                psi.EnvironmentVariables.Add(environmentalVariable.Key, environmentalVariable.Value);
             }
-
-            using var process = Start(psi);
-
-            if (process is null)
+            if (psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key) && environmentalVariable.Value == null)
             {
-                // FIX ME: What error code do you want to return?
-                return -1;
+                psi.EnvironmentVariables.Remove(environmentalVariable.Key);
             }
+        }
 
-            using var mreOut = new ManualResetEvent(false);
-            using var mreErr = new ManualResetEvent(false);
-            process.EnableRaisingEvents = true;
-            process.OutputDataReceived += (_, e) =>
-            {
-                // ReSharper disable once AccessToDisposedClosure
-                if (e.Data == null)
-                    mreOut.Set();
-                else
-                    output(e.Data);
-            };
-            process.BeginOutputReadLine();
-            process.ErrorDataReceived += (_, e) =>
-            {
-                // ReSharper disable once AccessToDisposedClosure
-                if (e.Data == null)
-                    mreErr.Set();
-                else
-                    errorOutput(e.Data);
-            };
-            process.BeginErrorReadLine();
+        using var process = Start(psi);
+
+        if (process is null)
+        {
+            // FIX ME: What error code do you want to return?
+            return -1;
+        }
 
-            string line;
-            while (input != null && null != (line = input.ReadLine()))
-                process.StandardInput.WriteLine(line);
+        using var mreOut = new ManualResetEvent(false);
+        using var mreErr = new ManualResetEvent(false);
+        process.EnableRaisingEvents = true;
+        process.OutputDataReceived += (_, e) =>
+        {
+            // ReSharper disable once AccessToDisposedClosure
+            if (e.Data == null)
+                mreOut.Set();
+            else
+                output(e.Data);
+        };
+        process.BeginOutputReadLine();
+        process.ErrorDataReceived += (_, e) =>
+        {
+            // ReSharper disable once AccessToDisposedClosure
+            if (e.Data == null)
+                mreErr.Set();
+            else
+                errorOutput(e.Data);
+        };
+        process.BeginErrorReadLine();
 
-            process.StandardInput.Close();
-            process.WaitForExit();
+        string line;
+        while (input != null && null != (line = input.ReadLine()))
+            process.StandardInput.WriteLine(line);
 
-            mreOut.WaitOne();
-            mreErr.WaitOne();
+        process.StandardInput.Close();
+        process.WaitForExit();
 
-            return process.ExitCode;
-        }
+        mreOut.WaitOne();
+        mreErr.WaitOne();
 
-        /// <summary>
-        /// System error codes.
-        /// See: https://msdn.microsoft.com/en-us/library/windows/desktop/ms681382.aspx
-        /// </summary>
-        private enum NativeErrorCode
-        {
-            Success = 0x0,
-            FileNotFound = 0x2,
-            PathNotFound = 0x3
-        }
+        return process.ExitCode;
+    }
 
-        [Flags]
-        public enum ErrorModes
-        {
-            Default = 0x0,
-            FailCriticalErrors = 0x1,
-            NoGpFaultErrorBox = 0x2,
-            NoAlignmentFaultExcept = 0x4,
-            NoOpenFileErrorBox = 0x8000
-        }
+    /// <summary>
+    /// System error codes.
+    /// See: https://msdn.microsoft.com/en-us/library/windows/desktop/ms681382.aspx
+    /// </summary>
+    private enum NativeErrorCode
+    {
+        Success = 0x0,
+        FileNotFound = 0x2,
+        PathNotFound = 0x3
+    }
 
-        private struct ChangeErrorMode : IDisposable
-        {
-            private readonly int oldMode;
+    [Flags]
+    public enum ErrorModes
+    {
+        Default = 0x0,
+        FailCriticalErrors = 0x1,
+        NoGpFaultErrorBox = 0x2,
+        NoAlignmentFaultExcept = 0x4,
+        NoOpenFileErrorBox = 0x8000
+    }
+
+    private struct ChangeErrorMode : IDisposable
+    {
+        private readonly int oldMode;
 
-            public ChangeErrorMode(ErrorModes mode)
+        public ChangeErrorMode(ErrorModes mode)
+        {
+            try
             {
-                try
-                {
-                    this.oldMode = SetErrorMode((int)mode);
-                }
-                catch (Exception ex) when (ex is EntryPointNotFoundException || ex is DllNotFoundException)
-                {
-                    this.oldMode = (int)mode;
-                }
+                this.oldMode = SetErrorMode((int)mode);
             }
+            catch (Exception ex) when (ex is EntryPointNotFoundException || ex is DllNotFoundException)
+            {
+                this.oldMode = (int)mode;
+            }
+        }
 
 
-            void IDisposable.Dispose()
+        void IDisposable.Dispose()
+        {
+            try
             {
-                try
-                {
-                    SetErrorMode(this.oldMode);
-                }
-                catch (Exception ex) when (ex is EntryPointNotFoundException || ex is DllNotFoundException)
-                {
-                    // NOTE: Mono doesn't support DllImport("kernel32.dll") and its SetErrorMode method, obviously. @asbjornu
-                }
+                SetErrorMode(this.oldMode);
+            }
+            catch (Exception ex) when (ex is EntryPointNotFoundException || ex is DllNotFoundException)
+            {
+                // NOTE: Mono doesn't support DllImport("kernel32.dll") and its SetErrorMode method, obviously. @asbjornu
             }
-
-            [DllImport("kernel32.dll")]
-            private static extern int SetErrorMode(int newMode);
         }
+
+        [DllImport("kernel32.dll")]
+        private static extern int SetErrorMode(int newMode);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Helpers/RetryAction.cs b/src/GitVersion.Core/Helpers/RetryAction.cs
index baece22441..ce96fef76b 100644
--- a/src/GitVersion.Core/Helpers/RetryAction.cs
+++ b/src/GitVersion.Core/Helpers/RetryAction.cs
@@ -3,72 +3,71 @@
 using Polly;
 using Polly.Retry;
 
-namespace GitVersion.Helpers
+namespace GitVersion.Helpers;
+
+public class RetryAction<T>
+    : RetryAction<T, bool> where T : Exception
 {
-    public class RetryAction<T>
-        : RetryAction<T, bool> where T : Exception
+    public RetryAction(int maxRetries = 5)
+        : base(maxRetries)
     {
-        public RetryAction(int maxRetries = 5)
-            : base(maxRetries)
-        {
-        }
-
-        public void Execute(Action operation) => base.Execute(() =>
-                                               {
-                                                   operation();
-                                                   return false;
-                                               });
     }
-    public class RetryAction<T, Result> where T : Exception
+
+    public void Execute(Action operation) => base.Execute(() =>
     {
-        private readonly RetryPolicy<Result> retryPolicy;
+        operation();
+        return false;
+    });
+}
+public class RetryAction<T, Result> where T : Exception
+{
+    private readonly RetryPolicy<Result> retryPolicy;
 
-        public RetryAction(int maxRetries = 5)
-        {
-            if (maxRetries < 0)
-                throw new ArgumentOutOfRangeException(nameof(maxRetries));
+    public RetryAction(int maxRetries = 5)
+    {
+        if (maxRetries < 0)
+            throw new ArgumentOutOfRangeException(nameof(maxRetries));
 
-            var linearBackoff = LinearBackoff(TimeSpan.FromMilliseconds(100), maxRetries);
-            this.retryPolicy = Policy<Result>
-                .Handle<T>()
-                .WaitAndRetry(linearBackoff);
-        }
+        var linearBackoff = LinearBackoff(TimeSpan.FromMilliseconds(100), maxRetries);
+        this.retryPolicy = Policy<Result>
+            .Handle<T>()
+            .WaitAndRetry(linearBackoff);
+    }
 
-        public Result Execute(Func<Result> operation) => this.retryPolicy.Execute(operation);
+    public Result Execute(Func<Result> operation) => this.retryPolicy.Execute(operation);
 
-        private static IEnumerable<TimeSpan> LinearBackoff(TimeSpan initialDelay, int retryCount, double factor = 1.0, bool fastFirst = false)
-        {
-            if (initialDelay < TimeSpan.Zero) throw new ArgumentOutOfRangeException(nameof(initialDelay), initialDelay, "should be >= 0ms");
-            if (retryCount < 0) throw new ArgumentOutOfRangeException(nameof(retryCount), retryCount, "should be >= 0");
-            if (factor < 0) throw new ArgumentOutOfRangeException(nameof(factor), factor, "should be >= 0");
+    private static IEnumerable<TimeSpan> LinearBackoff(TimeSpan initialDelay, int retryCount, double factor = 1.0, bool fastFirst = false)
+    {
+        if (initialDelay < TimeSpan.Zero) throw new ArgumentOutOfRangeException(nameof(initialDelay), initialDelay, "should be >= 0ms");
+        if (retryCount < 0) throw new ArgumentOutOfRangeException(nameof(retryCount), retryCount, "should be >= 0");
+        if (factor < 0) throw new ArgumentOutOfRangeException(nameof(factor), factor, "should be >= 0");
 
-            if (retryCount == 0)
-                return Empty();
+        if (retryCount == 0)
+            return Empty();
 
-            return Enumerate(initialDelay, retryCount, fastFirst, factor);
+        return Enumerate(initialDelay, retryCount, fastFirst, factor);
 
-            static IEnumerable<TimeSpan> Enumerate(TimeSpan initial, int retry, bool fast, double f)
+        static IEnumerable<TimeSpan> Enumerate(TimeSpan initial, int retry, bool fast, double f)
+        {
+            int i = 0;
+            if (fast)
             {
-                int i = 0;
-                if (fast)
-                {
-                    i++;
-                    yield return TimeSpan.Zero;
-                }
+                i++;
+                yield return TimeSpan.Zero;
+            }
 
-                double ms = initial.TotalMilliseconds;
-                double ad = f * ms;
+            double ms = initial.TotalMilliseconds;
+            double ad = f * ms;
 
-                for (; i < retry; i++, ms += ad)
-                {
-                    yield return TimeSpan.FromMilliseconds(ms);
-                }
+            for (; i < retry; i++, ms += ad)
+            {
+                yield return TimeSpan.FromMilliseconds(ms);
             }
         }
+    }
 
-        private static IEnumerable<TimeSpan> Empty()
-        {
-            yield break;
-        }
+    private static IEnumerable<TimeSpan> Empty()
+    {
+        yield break;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Helpers/ServiceMessageEscapeHelper.cs b/src/GitVersion.Core/Helpers/ServiceMessageEscapeHelper.cs
index b889689f9f..89df924d08 100644
--- a/src/GitVersion.Core/Helpers/ServiceMessageEscapeHelper.cs
+++ b/src/GitVersion.Core/Helpers/ServiceMessageEscapeHelper.cs
@@ -1,23 +1,22 @@
-namespace GitVersion.Helpers
+namespace GitVersion.Helpers;
+
+public static class ServiceMessageEscapeHelper
 {
-    public static class ServiceMessageEscapeHelper
+    public static string? EscapeValue(string value)
     {
-        public static string? EscapeValue(string value)
+        if (value == null)
         {
-            if (value == null)
-            {
-                return null;
-            }
-            // List of escape values from http://confluence.jetbrains.com/display/TCD8/Build+Script+Interaction+with+TeamCity
+            return null;
+        }
+        // List of escape values from http://confluence.jetbrains.com/display/TCD8/Build+Script+Interaction+with+TeamCity
 
-            value = value.Replace("|", "||");
-            value = value.Replace("'", "|'");
-            value = value.Replace("[", "|[");
-            value = value.Replace("]", "|]");
-            value = value.Replace("\r", "|r");
-            value = value.Replace("\n", "|n");
+        value = value.Replace("|", "||");
+        value = value.Replace("'", "|'");
+        value = value.Replace("[", "|[");
+        value = value.Replace("]", "|]");
+        value = value.Replace("\r", "|r");
+        value = value.Replace("\n", "|n");
 
-            return value;
-        }
+        return value;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Helpers/StringComparerUtils.cs b/src/GitVersion.Core/Helpers/StringComparerUtils.cs
index e2b016a343..a6fab9b350 100644
--- a/src/GitVersion.Core/Helpers/StringComparerUtils.cs
+++ b/src/GitVersion.Core/Helpers/StringComparerUtils.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace GitVersion.Helpers
+namespace GitVersion.Helpers;
+
+public static class StringComparerUtils
 {
-    public static class StringComparerUtils
-    {
-        public static readonly StringComparer IgnoreCaseComparer = StringComparer.InvariantCultureIgnoreCase;
-        public static readonly StringComparison OsDependentComparison = System.Environment.OSVersion.Platform == PlatformID.Unix ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;
-        public static readonly StringComparer OsDependentComparer = System.Environment.OSVersion.Platform == PlatformID.Unix ? StringComparer.Ordinal : StringComparer.OrdinalIgnoreCase;
-    }
-}
+    public static readonly StringComparer IgnoreCaseComparer = StringComparer.InvariantCultureIgnoreCase;
+    public static readonly StringComparison OsDependentComparison = System.Environment.OSVersion.Platform == PlatformID.Unix ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;
+    public static readonly StringComparer OsDependentComparer = System.Environment.OSVersion.Platform == PlatformID.Unix ? StringComparer.Ordinal : StringComparer.OrdinalIgnoreCase;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Helpers/StringFormatWith.cs b/src/GitVersion.Core/Helpers/StringFormatWith.cs
index ed2f5c04cf..6093b1cebf 100644
--- a/src/GitVersion.Core/Helpers/StringFormatWith.cs
+++ b/src/GitVersion.Core/Helpers/StringFormatWith.cs
@@ -3,78 +3,77 @@
 using System.Linq.Expressions;
 using System.Text.RegularExpressions;
 
-namespace GitVersion.Helpers
+namespace GitVersion.Helpers;
+
+internal static class StringFormatWithExtension
 {
-    internal static class StringFormatWithExtension
+    // This regex matches an expression to replace.
+    // - env:ENV name OR a member name
+    // - optional fallback value after " ?? "
+    // - the fallback value should be a quoted string, but simple unquoted text is allowed for back compat
+    private static readonly Regex TokensRegex = new(@"{((env:(?<envvar>\w+))|(?<member>\w+))(\s+(\?\?)??\s+((?<fallback>\w+)|""(?<fallback>.*)""))??}", RegexOptions.Compiled);
+
+    /// <summary>
+    /// Formats the <paramref name="template"/>, replacing each expression wrapped in curly braces
+    /// with the corresponding property from the <paramref name="source"/> or <paramref name="environment"/>.
+    /// </summary>
+    /// <param name="template" this="true">The source template, which may contain expressions to be replaced, e.g '{Foo.Bar.CurrencySymbol} foo {Foo.Bar.Price}'</param>
+    /// <param name="source">The source object to apply to the <paramref name="template"/></param>
+    /// <param name="environment"></param>
+    /// <exception cref="ArgumentNullException">The <paramref name="template"/> is null.</exception>
+    /// <exception cref="ArgumentException">An environment variable was null and no fallback was provided.</exception>
+    /// <remarks>
+    /// An expression containing "." is treated as a property or field access on the <paramref name="source"/>.
+    /// An expression starting with "env:" is replaced with the value of the corresponding variable from the <paramref name="environment"/>.
+    /// Each expression may specify a single hardcoded fallback value using the {Prop ?? "fallback"} syntax, which applies if the expression evaluates to null.
+    /// </remarks>
+    /// <example>
+    /// // replace an expression with a property value
+    /// "Hello {Name}".FormatWith(new { Name = "Fred" }, env);
+    /// "Hello {Name ?? \"Fred\"}".FormatWith(new { Name = GetNameOrNull() }, env);
+    /// // replace an expression with an environment variable
+    /// "{env:BUILD_NUMBER}".FormatWith(new { }, env);
+    /// "{env:BUILD_NUMBER ?? \"0\"}".FormatWith(new { }, env);
+    /// </example>
+    public static string FormatWith<T>(this string template, T? source, IEnvironment environment)
     {
-        // This regex matches an expression to replace.
-        // - env:ENV name OR a member name
-        // - optional fallback value after " ?? "
-        // - the fallback value should be a quoted string, but simple unquoted text is allowed for back compat
-        private static readonly Regex TokensRegex = new(@"{((env:(?<envvar>\w+))|(?<member>\w+))(\s+(\?\?)??\s+((?<fallback>\w+)|""(?<fallback>.*)""))??}", RegexOptions.Compiled);
+        if (template == null)
+        {
+            throw new ArgumentNullException(nameof(template));
+        }
 
-        /// <summary>
-        /// Formats the <paramref name="template"/>, replacing each expression wrapped in curly braces
-        /// with the corresponding property from the <paramref name="source"/> or <paramref name="environment"/>.
-        /// </summary>
-        /// <param name="template" this="true">The source template, which may contain expressions to be replaced, e.g '{Foo.Bar.CurrencySymbol} foo {Foo.Bar.Price}'</param>
-        /// <param name="source">The source object to apply to the <paramref name="template"/></param>
-        /// <param name="environment"></param>
-        /// <exception cref="ArgumentNullException">The <paramref name="template"/> is null.</exception>
-        /// <exception cref="ArgumentException">An environment variable was null and no fallback was provided.</exception>
-        /// <remarks>
-        /// An expression containing "." is treated as a property or field access on the <paramref name="source"/>.
-        /// An expression starting with "env:" is replaced with the value of the corresponding variable from the <paramref name="environment"/>.
-        /// Each expression may specify a single hardcoded fallback value using the {Prop ?? "fallback"} syntax, which applies if the expression evaluates to null.
-        /// </remarks>
-        /// <example>
-        /// // replace an expression with a property value
-        /// "Hello {Name}".FormatWith(new { Name = "Fred" }, env);
-        /// "Hello {Name ?? \"Fred\"}".FormatWith(new { Name = GetNameOrNull() }, env);
-        /// // replace an expression with an environment variable
-        /// "{env:BUILD_NUMBER}".FormatWith(new { }, env);
-        /// "{env:BUILD_NUMBER ?? \"0\"}".FormatWith(new { }, env);
-        /// </example>
-        public static string FormatWith<T>(this string template, T? source, IEnvironment environment)
+        foreach (Match match in TokensRegex.Matches(template))
         {
-            if (template == null)
+            string propertyValue;
+            string? fallback = match.Groups["fallback"].Success ? match.Groups["fallback"].Value : null;
+
+            if (match.Groups["envvar"].Success)
             {
-                throw new ArgumentNullException(nameof(template));
+                string envVar = match.Groups["envvar"].Value;
+                propertyValue = environment.GetEnvironmentVariable(envVar) ?? fallback
+                    ?? throw new ArgumentException($"Environment variable {envVar} not found and no fallback string provided");
             }
-
-            foreach (Match match in TokensRegex.Matches(template))
+            else
             {
-                string propertyValue;
-                string? fallback = match.Groups["fallback"].Success ? match.Groups["fallback"].Value : null;
-
-                if (match.Groups["envvar"].Success)
-                {
-                    string envVar = match.Groups["envvar"].Value;
-                    propertyValue = environment.GetEnvironmentVariable(envVar) ?? fallback
-                        ?? throw new ArgumentException($"Environment variable {envVar} not found and no fallback string provided");
-                }
-                else
-                {
-                    var objType = source?.GetType();
-                    string memberAccessExpression = match.Groups["member"].Value;
-                    var expression = CompileDataBinder(objType, memberAccessExpression);
-                    // It would be better to throw if the expression and fallback produce null, but provide an empty string for back compat.
-                    propertyValue = expression(source)?.ToString() ?? fallback ?? "";
-                }
-
-                template = template.Replace(match.Value, propertyValue);
+                var objType = source?.GetType();
+                string memberAccessExpression = match.Groups["member"].Value;
+                var expression = CompileDataBinder(objType, memberAccessExpression);
+                // It would be better to throw if the expression and fallback produce null, but provide an empty string for back compat.
+                propertyValue = expression(source)?.ToString() ?? fallback ?? "";
             }
 
-            return template;
+            template = template.Replace(match.Value, propertyValue);
         }
 
-        private static Func<object?, object> CompileDataBinder(Type? type, string expr)
-        {
-            ParameterExpression param = Expression.Parameter(typeof(object));
-            Expression body = Expression.Convert(param, type);
-            body = expr.Split('.').Aggregate(body, Expression.PropertyOrField);
-            body = Expression.Convert(body, typeof(object)); // Convert result in case the body produces a Nullable value type.
-            return Expression.Lambda<Func<object?, object>>(body, param).Compile();
-        }
+        return template;
+    }
+
+    private static Func<object?, object> CompileDataBinder(Type? type, string expr)
+    {
+        ParameterExpression param = Expression.Parameter(typeof(object));
+        Expression body = Expression.Convert(param, type);
+        body = expr.Split('.').Aggregate(body, Expression.PropertyOrField);
+        body = Expression.Convert(body, typeof(object)); // Convert result in case the body produces a Nullable value type.
+        return Expression.Lambda<Func<object?, object>>(body, param).Compile();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Logging/Abstractions/IConsole.cs b/src/GitVersion.Core/Logging/Abstractions/IConsole.cs
index 14638c9456..d1f27d708f 100644
--- a/src/GitVersion.Core/Logging/Abstractions/IConsole.cs
+++ b/src/GitVersion.Core/Logging/Abstractions/IConsole.cs
@@ -1,13 +1,12 @@
 using System;
 
-namespace GitVersion.Logging
+namespace GitVersion.Logging;
+
+public interface IConsole
 {
-    public interface IConsole
-    {
-        void WriteLine(string? msg);
-        void WriteLine();
-        void Write(string msg);
-        string ReadLine();
-        IDisposable UseColor(ConsoleColor consoleColor);
-    }
-}
+    void WriteLine(string? msg);
+    void WriteLine();
+    void Write(string msg);
+    string ReadLine();
+    IDisposable UseColor(ConsoleColor consoleColor);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Logging/Abstractions/ILog.cs b/src/GitVersion.Core/Logging/Abstractions/ILog.cs
index 8da5a8925f..20a2683e55 100644
--- a/src/GitVersion.Core/Logging/Abstractions/ILog.cs
+++ b/src/GitVersion.Core/Logging/Abstractions/ILog.cs
@@ -1,12 +1,11 @@
 using System;
 
-namespace GitVersion.Logging
+namespace GitVersion.Logging;
+
+public interface ILog
 {
-    public interface ILog
-    {
-        Verbosity Verbosity { get; set; }
-        void Write(Verbosity verbosity, LogLevel level, string format, params object[] args);
-        IDisposable IndentLog(string operationDescription);
-        void AddLogAppender(ILogAppender logAppender);
-    }
-}
+    Verbosity Verbosity { get; set; }
+    void Write(Verbosity verbosity, LogLevel level, string format, params object[] args);
+    IDisposable IndentLog(string operationDescription);
+    void AddLogAppender(ILogAppender logAppender);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Logging/Abstractions/ILogAppender.cs b/src/GitVersion.Core/Logging/Abstractions/ILogAppender.cs
index 8d88810b1d..0da17e42ce 100644
--- a/src/GitVersion.Core/Logging/Abstractions/ILogAppender.cs
+++ b/src/GitVersion.Core/Logging/Abstractions/ILogAppender.cs
@@ -1,7 +1,6 @@
-namespace GitVersion.Logging
+namespace GitVersion.Logging;
+
+public interface ILogAppender
 {
-    public interface ILogAppender
-    {
-        void WriteTo(LogLevel level, string message);
-    }
-}
+    void WriteTo(LogLevel level, string message);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Logging/ConsoleAdapter.cs b/src/GitVersion.Core/Logging/ConsoleAdapter.cs
index 4e836b29c1..575673f4a9 100644
--- a/src/GitVersion.Core/Logging/ConsoleAdapter.cs
+++ b/src/GitVersion.Core/Logging/ConsoleAdapter.cs
@@ -1,23 +1,22 @@
 using System;
 
-namespace GitVersion.Logging
+namespace GitVersion.Logging;
+
+public class ConsoleAdapter : IConsole
 {
-    public class ConsoleAdapter : IConsole
-    {
-        public void WriteLine(string? msg) => Console.WriteLine(msg);
+    public void WriteLine(string? msg) => Console.WriteLine(msg);
 
-        public void WriteLine() => Console.WriteLine();
+    public void WriteLine() => Console.WriteLine();
 
-        public void Write(string msg) => Console.Write(msg);
+    public void Write(string msg) => Console.Write(msg);
 
-        public string ReadLine() => Console.ReadLine();
+    public string ReadLine() => Console.ReadLine();
 
-        public IDisposable UseColor(ConsoleColor consoleColor)
-        {
-            var old = Console.ForegroundColor;
-            Console.ForegroundColor = consoleColor;
+    public IDisposable UseColor(ConsoleColor consoleColor)
+    {
+        var old = Console.ForegroundColor;
+        Console.ForegroundColor = consoleColor;
 
-            return Disposable.Create(() => Console.ForegroundColor = old);
-        }
+        return Disposable.Create(() => Console.ForegroundColor = old);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Logging/ConsoleAppender.cs b/src/GitVersion.Core/Logging/ConsoleAppender.cs
index bb3c0a81ff..566ca90430 100644
--- a/src/GitVersion.Core/Logging/ConsoleAppender.cs
+++ b/src/GitVersion.Core/Logging/ConsoleAppender.cs
@@ -1,63 +1,62 @@
 using System;
 using System.Collections.Generic;
 
-namespace GitVersion.Logging
+namespace GitVersion.Logging;
+
+public class ConsoleAppender : ILogAppender
 {
-    public class ConsoleAppender : ILogAppender
+    private readonly object locker;
+    private readonly IDictionary<LogLevel, (ConsoleColor, ConsoleColor)> palettes;
+    public ConsoleAppender()
     {
-        private readonly object locker;
-        private readonly IDictionary<LogLevel, (ConsoleColor, ConsoleColor)> palettes;
-        public ConsoleAppender()
-        {
-            this.locker = new object();
-            this.palettes = CreatePalette();
-        }
-        public void WriteTo(LogLevel level, string message)
+        this.locker = new object();
+        this.palettes = CreatePalette();
+    }
+    public void WriteTo(LogLevel level, string message)
+    {
+        lock (this.locker)
         {
-            lock (this.locker)
+            try
             {
-                try
-                {
-                    var (backgroundColor, foregroundColor) = this.palettes[level];
+                var (backgroundColor, foregroundColor) = this.palettes[level];
 
-                    Console.BackgroundColor = backgroundColor;
-                    Console.ForegroundColor = foregroundColor;
+                Console.BackgroundColor = backgroundColor;
+                Console.ForegroundColor = foregroundColor;
 
-                    if (level == LogLevel.Error || level == LogLevel.Fatal)
-                    {
-                        Console.Error.Write(message);
-                    }
-                    else
-                    {
-                        Console.Write(message);
-                    }
+                if (level == LogLevel.Error || level == LogLevel.Fatal)
+                {
+                    Console.Error.Write(message);
                 }
-                finally
+                else
                 {
-                    Console.ResetColor();
-                    if (level == LogLevel.Error || level == LogLevel.Fatal)
-                    {
-                        Console.Error.WriteLine();
-                    }
-                    else
-                    {
-                        Console.WriteLine();
-                    }
+                    Console.Write(message);
+                }
+            }
+            finally
+            {
+                Console.ResetColor();
+                if (level == LogLevel.Error || level == LogLevel.Fatal)
+                {
+                    Console.Error.WriteLine();
+                }
+                else
+                {
+                    Console.WriteLine();
                 }
             }
         }
+    }
 
-        private static IDictionary<LogLevel, (ConsoleColor backgroundColor, ConsoleColor foregroundColor)> CreatePalette()
+    private static IDictionary<LogLevel, (ConsoleColor backgroundColor, ConsoleColor foregroundColor)> CreatePalette()
+    {
+        var background = Console.BackgroundColor;
+        var palette = new Dictionary<LogLevel, (ConsoleColor, ConsoleColor)>
         {
-            var background = Console.BackgroundColor;
-            var palette = new Dictionary<LogLevel, (ConsoleColor, ConsoleColor)>
-            {
-                { LogLevel.Error, (ConsoleColor.DarkRed, ConsoleColor.White) },
-                { LogLevel.Warn, (background, ConsoleColor.Yellow) },
-                { LogLevel.Info, (background, ConsoleColor.White) },
-                { LogLevel.Debug, (background, ConsoleColor.DarkGray) }
-            };
-            return palette;
-        }
+            { LogLevel.Error, (ConsoleColor.DarkRed, ConsoleColor.White) },
+            { LogLevel.Warn, (background, ConsoleColor.Yellow) },
+            { LogLevel.Info, (background, ConsoleColor.White) },
+            { LogLevel.Debug, (background, ConsoleColor.DarkGray) }
+        };
+        return palette;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Logging/Disposable.cs b/src/GitVersion.Core/Logging/Disposable.cs
index 117509e6f2..c682e8ef0a 100644
--- a/src/GitVersion.Core/Logging/Disposable.cs
+++ b/src/GitVersion.Core/Logging/Disposable.cs
@@ -1,24 +1,23 @@
 using System;
 
-namespace GitVersion.Logging
-{
-    public static class Disposable
-    {
-        public static IDisposable Create(Action disposer) => new AnonymousDisposable(disposer);
+namespace GitVersion.Logging;
 
-        public static readonly IDisposable Empty = Create(() => { });
+public static class Disposable
+{
+    public static IDisposable Create(Action disposer) => new AnonymousDisposable(disposer);
 
-        private sealed class AnonymousDisposable : IDisposable
-        {
-            public AnonymousDisposable(Action disposer) => this.disposer = disposer ?? throw new ArgumentNullException(nameof(disposer));
+    public static readonly IDisposable Empty = Create(() => { });
 
-            public void Dispose()
-            {
-                this.disposer?.Invoke();
-                this.disposer = null;
-            }
+    private sealed class AnonymousDisposable : IDisposable
+    {
+        public AnonymousDisposable(Action disposer) => this.disposer = disposer ?? throw new ArgumentNullException(nameof(disposer));
 
-            private Action? disposer;
+        public void Dispose()
+        {
+            this.disposer?.Invoke();
+            this.disposer = null;
         }
+
+        private Action? disposer;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Logging/FileAppender.cs b/src/GitVersion.Core/Logging/FileAppender.cs
index 5594793c1b..35c41d66eb 100644
--- a/src/GitVersion.Core/Logging/FileAppender.cs
+++ b/src/GitVersion.Core/Logging/FileAppender.cs
@@ -1,41 +1,40 @@
 using System;
 using System.IO;
 
-namespace GitVersion.Logging
+namespace GitVersion.Logging;
+
+public class FileAppender : ILogAppender
 {
-    public class FileAppender : ILogAppender
-    {
-        private readonly string filePath;
+    private readonly string filePath;
 
-        public FileAppender(string filePath)
-        {
-            this.filePath = filePath;
+    public FileAppender(string filePath)
+    {
+        this.filePath = filePath;
 
-            var logFile = new FileInfo(Path.GetFullPath(filePath));
+        var logFile = new FileInfo(Path.GetFullPath(filePath));
 
-            // NOTE: logFile.Directory will be null if the path is i.e. C:\logfile.log. @asbjornu
-            logFile.Directory?.Create();
-            if (logFile.Exists) return;
+        // NOTE: logFile.Directory will be null if the path is i.e. C:\logfile.log. @asbjornu
+        logFile.Directory?.Create();
+        if (logFile.Exists) return;
 
-            using (logFile.CreateText()) { }
-        }
+        using (logFile.CreateText()) { }
+    }
 
-        public void WriteTo(LogLevel level, string message)
+    public void WriteTo(LogLevel level, string message)
+    {
+        try
         {
-            try
-            {
-                WriteLogEntry(this.filePath, message);
-            }
-            catch (Exception)
-            {
-                //
-            }
+            WriteLogEntry(this.filePath, message);
         }
-
-        private static void WriteLogEntry(string logFilePath, string str)
+        catch (Exception)
         {
-            var contents = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss}\t\t{str}{System.Environment.NewLine}";
-            File.AppendAllText(logFilePath, contents);
+            //
         }
     }
-}
+
+    private static void WriteLogEntry(string logFilePath, string str)
+    {
+        var contents = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss}\t\t{str}{System.Environment.NewLine}";
+        File.AppendAllText(logFilePath, contents);
+    }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Logging/Log.cs b/src/GitVersion.Core/Logging/Log.cs
index edcb4e15e5..59efab7d16 100644
--- a/src/GitVersion.Core/Logging/Log.cs
+++ b/src/GitVersion.Core/Logging/Log.cs
@@ -5,67 +5,66 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace GitVersion.Logging
+namespace GitVersion.Logging;
+
+public sealed class Log : ILog
 {
-    public sealed class Log : ILog
+    private IEnumerable<ILogAppender> appenders;
+    private readonly Regex obscurePasswordRegex = new("(https?://)(.+)(:.+@)", RegexOptions.Compiled);
+    private readonly StringBuilder sb;
+    private string indent = string.Empty;
+
+    public Log() : this(Array.Empty<ILogAppender>())
     {
-        private IEnumerable<ILogAppender> appenders;
-        private readonly Regex obscurePasswordRegex = new("(https?://)(.+)(:.+@)", RegexOptions.Compiled);
-        private readonly StringBuilder sb;
-        private string indent = string.Empty;
+    }
 
-        public Log() : this(Array.Empty<ILogAppender>())
-        {
-        }
+    public Log(params ILogAppender[] appenders)
+    {
+        this.appenders = appenders ?? Array.Empty<ILogAppender>();
+        this.sb = new StringBuilder();
+        Verbosity = Verbosity.Normal;
+    }
+
+    public Verbosity Verbosity { get; set; }
 
-        public Log(params ILogAppender[] appenders)
+    public void Write(Verbosity verbosity, LogLevel level, string format, params object[] args)
+    {
+        if (verbosity > Verbosity)
         {
-            this.appenders = appenders ?? Array.Empty<ILogAppender>();
-            this.sb = new StringBuilder();
-            Verbosity = Verbosity.Normal;
+            return;
         }
 
-        public Verbosity Verbosity { get; set; }
-
-        public void Write(Verbosity verbosity, LogLevel level, string format, params object[] args)
+        var message = args.Any() ? string.Format(format, args) : format;
+        var formattedString = FormatMessage(message, level.ToString().ToUpperInvariant());
+        foreach (var appender in this.appenders)
         {
-            if (verbosity > Verbosity)
-            {
-                return;
-            }
+            appender.WriteTo(level, formattedString);
+        }
 
-            var message = args.Any() ? string.Format(format, args) : format;
-            var formattedString = FormatMessage(message, level.ToString().ToUpperInvariant());
-            foreach (var appender in this.appenders)
-            {
-                appender.WriteTo(level, formattedString);
-            }
+        this.sb.AppendLine(formattedString);
+    }
 
-            this.sb.AppendLine(formattedString);
-        }
+    public IDisposable IndentLog(string operationDescription)
+    {
+        var start = DateTime.Now;
+        Write(Verbosity.Normal, LogLevel.Info, $"Begin: {operationDescription}");
+        this.indent += "  ";
 
-        public IDisposable IndentLog(string operationDescription)
+        return Disposable.Create(() =>
         {
-            var start = DateTime.Now;
-            Write(Verbosity.Normal, LogLevel.Info, $"Begin: {operationDescription}");
-            this.indent += "  ";
-
-            return Disposable.Create(() =>
-            {
-                var length = this.indent.Length - 2;
-                this.indent = length > 0 ? this.indent.Substring(0, length) : this.indent;
-                Write(Verbosity.Normal, LogLevel.Info, string.Format(CultureInfo.InvariantCulture, "End: {0} (Took: {1:N}ms)", operationDescription, DateTime.Now.Subtract(start).TotalMilliseconds));
-            });
-        }
+            var length = this.indent.Length - 2;
+            this.indent = length > 0 ? this.indent.Substring(0, length) : this.indent;
+            Write(Verbosity.Normal, LogLevel.Info, string.Format(CultureInfo.InvariantCulture, "End: {0} (Took: {1:N}ms)", operationDescription, DateTime.Now.Subtract(start).TotalMilliseconds));
+        });
+    }
 
-        public void AddLogAppender(ILogAppender logAppender) => this.appenders = this.appenders.Concat(new[] { logAppender });
+    public void AddLogAppender(ILogAppender logAppender) => this.appenders = this.appenders.Concat(new[] { logAppender });
 
-        public override string ToString() => this.sb.ToString();
+    public override string ToString() => this.sb.ToString();
 
-        private string FormatMessage(string message, string level)
-        {
-            var obscuredMessage = this.obscurePasswordRegex.Replace(message, "$1$2:*******@");
-            return string.Format(CultureInfo.InvariantCulture, "{0}{1} [{2:MM/dd/yy H:mm:ss:ff}] {3}", this.indent, level, DateTime.Now, obscuredMessage);
-        }
+    private string FormatMessage(string message, string level)
+    {
+        var obscuredMessage = this.obscurePasswordRegex.Replace(message, "$1$2:*******@");
+        return string.Format(CultureInfo.InvariantCulture, "{0}{1} [{2:MM/dd/yy H:mm:ss:ff}] {3}", this.indent, level, DateTime.Now, obscuredMessage);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Logging/LogAction.cs b/src/GitVersion.Core/Logging/LogAction.cs
index 850274bde5..bd4b01cbab 100644
--- a/src/GitVersion.Core/Logging/LogAction.cs
+++ b/src/GitVersion.Core/Logging/LogAction.cs
@@ -1,6 +1,5 @@
-namespace GitVersion.Logging
-{
-    public delegate void LogAction(LogActionEntry actionEntry);
+namespace GitVersion.Logging;
 
-    public delegate void LogActionEntry(string format, params object[] args);
-}
+public delegate void LogAction(LogActionEntry actionEntry);
+
+public delegate void LogActionEntry(string format, params object[] args);
\ No newline at end of file
diff --git a/src/GitVersion.Core/Logging/LogExtensions.cs b/src/GitVersion.Core/Logging/LogExtensions.cs
index 4f5da63996..08a30e2252 100644
--- a/src/GitVersion.Core/Logging/LogExtensions.cs
+++ b/src/GitVersion.Core/Logging/LogExtensions.cs
@@ -1,124 +1,123 @@
 using System;
 using System.Collections.Generic;
 
-namespace GitVersion.Logging
-{
-    public static class LogExtensions
-    {
-        public static void Debug(this ILog log, string format, params object[] args) => log?.Write(LogLevel.Debug, format, args);
+namespace GitVersion.Logging;
 
-        public static void Debug(this ILog log, Verbosity verbosity, string format, params object[] args) => log?.Write(verbosity, LogLevel.Debug, format, args);
+public static class LogExtensions
+{
+    public static void Debug(this ILog log, string format, params object[] args) => log?.Write(LogLevel.Debug, format, args);
 
-        public static void Debug(this ILog log, LogAction logAction) => log?.Write(LogLevel.Debug, logAction);
+    public static void Debug(this ILog log, Verbosity verbosity, string format, params object[] args) => log?.Write(verbosity, LogLevel.Debug, format, args);
 
-        public static void Debug(this ILog log, Verbosity verbosity, LogAction logAction) => log?.Write(verbosity, LogLevel.Debug, logAction);
+    public static void Debug(this ILog log, LogAction logAction) => log?.Write(LogLevel.Debug, logAction);
 
-        public static void Warning(this ILog log, string format, params object[] args) => log?.Write(LogLevel.Warn, format, args);
+    public static void Debug(this ILog log, Verbosity verbosity, LogAction logAction) => log?.Write(verbosity, LogLevel.Debug, logAction);
 
-        public static void Warning(this ILog log, Verbosity verbosity, string format, params object[] args) => log?.Write(verbosity, LogLevel.Warn, format, args);
+    public static void Warning(this ILog log, string format, params object[] args) => log?.Write(LogLevel.Warn, format, args);
 
-        public static void Warning(this ILog log, LogAction logAction) => log?.Write(LogLevel.Warn, logAction);
+    public static void Warning(this ILog log, Verbosity verbosity, string format, params object[] args) => log?.Write(verbosity, LogLevel.Warn, format, args);
 
-        public static void Warning(this ILog log, Verbosity verbosity, LogAction logAction) => log?.Write(verbosity, LogLevel.Warn, logAction);
+    public static void Warning(this ILog log, LogAction logAction) => log?.Write(LogLevel.Warn, logAction);
 
-        public static void Info(this ILog log, string format, params object[] args) => log?.Write(LogLevel.Info, format, args);
+    public static void Warning(this ILog log, Verbosity verbosity, LogAction logAction) => log?.Write(verbosity, LogLevel.Warn, logAction);
 
-        public static void Info(this ILog log, Verbosity verbosity, string format, params object[] args) => log?.Write(verbosity, LogLevel.Info, format, args);
+    public static void Info(this ILog log, string format, params object[] args) => log?.Write(LogLevel.Info, format, args);
 
-        public static void Info(this ILog log, LogAction logAction) => log?.Write(LogLevel.Info, logAction);
+    public static void Info(this ILog log, Verbosity verbosity, string format, params object[] args) => log?.Write(verbosity, LogLevel.Info, format, args);
 
-        public static void Info(this ILog log, Verbosity verbosity, LogAction logAction) => log?.Write(verbosity, LogLevel.Info, logAction);
+    public static void Info(this ILog log, LogAction logAction) => log?.Write(LogLevel.Info, logAction);
 
-        public static void Verbose(this ILog log, string format, params object[] args) => log?.Write(LogLevel.Verbose, format, args);
+    public static void Info(this ILog log, Verbosity verbosity, LogAction logAction) => log?.Write(verbosity, LogLevel.Info, logAction);
 
-        public static void Verbose(this ILog log, Verbosity verbosity, string format, params object[] args) => log?.Write(verbosity, LogLevel.Verbose, format, args);
+    public static void Verbose(this ILog log, string format, params object[] args) => log?.Write(LogLevel.Verbose, format, args);
 
-        public static void Verbose(this ILog log, LogAction logAction) => log?.Write(LogLevel.Verbose, logAction);
+    public static void Verbose(this ILog log, Verbosity verbosity, string format, params object[] args) => log?.Write(verbosity, LogLevel.Verbose, format, args);
 
-        public static void Verbose(this ILog log, Verbosity verbosity, LogAction logAction) => log?.Write(verbosity, LogLevel.Verbose, logAction);
+    public static void Verbose(this ILog log, LogAction logAction) => log?.Write(LogLevel.Verbose, logAction);
 
-        public static void Error(this ILog log, string format, params object[] args) => log?.Write(LogLevel.Error, format, args);
+    public static void Verbose(this ILog log, Verbosity verbosity, LogAction logAction) => log?.Write(verbosity, LogLevel.Verbose, logAction);
 
-        public static void Error(this ILog log, Verbosity verbosity, string format, params object[] args) => log?.Write(verbosity, LogLevel.Error, format, args);
+    public static void Error(this ILog log, string format, params object[] args) => log?.Write(LogLevel.Error, format, args);
 
-        public static void Error(this ILog log, LogAction logAction) => log?.Write(LogLevel.Error, logAction);
+    public static void Error(this ILog log, Verbosity verbosity, string format, params object[] args) => log?.Write(verbosity, LogLevel.Error, format, args);
 
-        public static void Error(this ILog log, Verbosity verbosity, LogAction logAction) => log?.Write(verbosity, LogLevel.Error, logAction);
+    public static void Error(this ILog log, LogAction logAction) => log?.Write(LogLevel.Error, logAction);
 
-        public static void Write(this ILog log, LogLevel level, string format, params object[] args)
-        {
-            if (log == null)
-                return;
+    public static void Error(this ILog log, Verbosity verbosity, LogAction logAction) => log?.Write(verbosity, LogLevel.Error, logAction);
 
-            var verbosity = GetVerbosityForLevel(level);
-            if (verbosity > log.Verbosity)
-            {
-                return;
-            }
+    public static void Write(this ILog log, LogLevel level, string format, params object[] args)
+    {
+        if (log == null)
+            return;
 
-            log.Write(verbosity, level, format, args);
+        var verbosity = GetVerbosityForLevel(level);
+        if (verbosity > log.Verbosity)
+        {
+            return;
         }
 
-        public static void Write(this ILog log, Verbosity verbosity, LogLevel level, LogAction logAction)
-        {
-            if (log == null || logAction == null)
-                return;
+        log.Write(verbosity, level, format, args);
+    }
 
-            if (verbosity > log.Verbosity)
-            {
-                return;
-            }
+    public static void Write(this ILog log, Verbosity verbosity, LogLevel level, LogAction logAction)
+    {
+        if (log == null || logAction == null)
+            return;
 
-            void ActionEntry(string format, object[] args) => log.Write(verbosity, level, format, args);
-            logAction(ActionEntry);
+        if (verbosity > log.Verbosity)
+        {
+            return;
         }
 
-        public static void Write(this ILog log, LogLevel level, LogAction logAction)
-        {
-            if (log == null || logAction == null)
-                return;
+        void ActionEntry(string format, object[] args) => log.Write(verbosity, level, format, args);
+        logAction(ActionEntry);
+    }
 
-            var verbosity = GetVerbosityForLevel(level);
-            if (verbosity > log.Verbosity)
-            {
-                return;
-            }
+    public static void Write(this ILog log, LogLevel level, LogAction logAction)
+    {
+        if (log == null || logAction == null)
+            return;
 
-            void ActionEntry(string format, object[] args) => log.Write(verbosity, level, format, args);
-            logAction(ActionEntry);
+        var verbosity = GetVerbosityForLevel(level);
+        if (verbosity > log.Verbosity)
+        {
+            return;
         }
 
-        public static IDisposable QuietVerbosity(this ILog log) => log.WithVerbosity(Verbosity.Quiet);
+        void ActionEntry(string format, object[] args) => log.Write(verbosity, level, format, args);
+        logAction(ActionEntry);
+    }
+
+    public static IDisposable QuietVerbosity(this ILog log) => log.WithVerbosity(Verbosity.Quiet);
 
-        public static IDisposable MinimalVerbosity(this ILog log) => log.WithVerbosity(Verbosity.Minimal);
+    public static IDisposable MinimalVerbosity(this ILog log) => log.WithVerbosity(Verbosity.Minimal);
 
-        public static IDisposable NormalVerbosity(this ILog log) => log.WithVerbosity(Verbosity.Normal);
+    public static IDisposable NormalVerbosity(this ILog log) => log.WithVerbosity(Verbosity.Normal);
 
-        public static IDisposable VerboseVerbosity(this ILog log) => log.WithVerbosity(Verbosity.Verbose);
+    public static IDisposable VerboseVerbosity(this ILog log) => log.WithVerbosity(Verbosity.Verbose);
 
-        public static IDisposable DiagnosticVerbosity(this ILog log) => log.WithVerbosity(Verbosity.Diagnostic);
+    public static IDisposable DiagnosticVerbosity(this ILog log) => log.WithVerbosity(Verbosity.Diagnostic);
 
-        public static IDisposable WithVerbosity(this ILog log, Verbosity verbosity)
+    public static IDisposable WithVerbosity(this ILog log, Verbosity verbosity)
+    {
+        if (log == null)
         {
-            if (log == null)
-            {
-                throw new ArgumentNullException(nameof(log));
-            }
-            var lastVerbosity = log.Verbosity;
-            log.Verbosity = verbosity;
-            return Disposable.Create(() => log.Verbosity = lastVerbosity);
+            throw new ArgumentNullException(nameof(log));
         }
+        var lastVerbosity = log.Verbosity;
+        log.Verbosity = verbosity;
+        return Disposable.Create(() => log.Verbosity = lastVerbosity);
+    }
 
-        public static Verbosity GetVerbosityForLevel(LogLevel level) => VerbosityMaps[level];
+    public static Verbosity GetVerbosityForLevel(LogLevel level) => VerbosityMaps[level];
 
-        private static readonly IDictionary<LogLevel, Verbosity> VerbosityMaps = new Dictionary<LogLevel, Verbosity>
-        {
-            { LogLevel.Verbose, Verbosity.Verbose },
-            { LogLevel.Debug, Verbosity.Diagnostic },
-            { LogLevel.Info, Verbosity.Normal },
-            { LogLevel.Warn, Verbosity.Minimal },
-            { LogLevel.Error, Verbosity.Quiet },
-            { LogLevel.Fatal, Verbosity.Quiet },
-        };
-    }
-}
+    private static readonly IDictionary<LogLevel, Verbosity> VerbosityMaps = new Dictionary<LogLevel, Verbosity>
+    {
+        { LogLevel.Verbose, Verbosity.Verbose },
+        { LogLevel.Debug, Verbosity.Diagnostic },
+        { LogLevel.Info, Verbosity.Normal },
+        { LogLevel.Warn, Verbosity.Minimal },
+        { LogLevel.Error, Verbosity.Quiet },
+        { LogLevel.Fatal, Verbosity.Quiet },
+    };
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Logging/LogLevel.cs b/src/GitVersion.Core/Logging/LogLevel.cs
index 61c9d1568d..e213029b4f 100644
--- a/src/GitVersion.Core/Logging/LogLevel.cs
+++ b/src/GitVersion.Core/Logging/LogLevel.cs
@@ -1,12 +1,11 @@
-namespace GitVersion.Logging
+namespace GitVersion.Logging;
+
+public enum LogLevel
 {
-    public enum LogLevel
-    {
-        Fatal,
-        Error,
-        Warn,
-        Info,
-        Verbose,
-        Debug
-    }
-}
+    Fatal,
+    Error,
+    Warn,
+    Info,
+    Verbose,
+    Debug
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Logging/NullLog.cs b/src/GitVersion.Core/Logging/NullLog.cs
index d2eeec8c3d..79aed3165c 100644
--- a/src/GitVersion.Core/Logging/NullLog.cs
+++ b/src/GitVersion.Core/Logging/NullLog.cs
@@ -1,21 +1,20 @@
 using System;
 
-namespace GitVersion.Logging
-{
-    public sealed class NullLog : ILog
-    {
-        public Verbosity Verbosity { get; set; }
+namespace GitVersion.Logging;
 
-        public void Write(Verbosity verbosity, LogLevel level, string format, params object[] args)
-        {
-        }
+public sealed class NullLog : ILog
+{
+    public Verbosity Verbosity { get; set; }
 
-        public IDisposable IndentLog(string operationDescription) => Disposable.Empty;
+    public void Write(Verbosity verbosity, LogLevel level, string format, params object[] args)
+    {
+    }
 
-        public void AddLogAppender(ILogAppender logAppender)
-        {
-        }
+    public IDisposable IndentLog(string operationDescription) => Disposable.Empty;
 
-        public string? Indent { get; set; }
+    public void AddLogAppender(ILogAppender logAppender)
+    {
     }
-}
+
+    public string? Indent { get; set; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Logging/Verbosity.cs b/src/GitVersion.Core/Logging/Verbosity.cs
index de90aa73c5..2a0a45ee1a 100644
--- a/src/GitVersion.Core/Logging/Verbosity.cs
+++ b/src/GitVersion.Core/Logging/Verbosity.cs
@@ -1,11 +1,10 @@
-namespace GitVersion.Logging
+namespace GitVersion.Logging;
+
+public enum Verbosity
 {
-    public enum Verbosity
-    {
-        Quiet = 0,
-        Minimal = 1,
-        Normal = 2,
-        Verbose = 3,
-        Diagnostic = 4
-    }
-}
+    Quiet = 0,
+    Minimal = 1,
+    Normal = 2,
+    Verbose = 3,
+    Diagnostic = 4
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/AssemblyInfoData.cs b/src/GitVersion.Core/Model/AssemblyInfoData.cs
index 36d6f23552..93cfcc1b85 100644
--- a/src/GitVersion.Core/Model/AssemblyInfoData.cs
+++ b/src/GitVersion.Core/Model/AssemblyInfoData.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class AssemblyInfoData
 {
-    public class AssemblyInfoData
-    {
-        public bool UpdateAssemblyInfo;
-        public bool UpdateProjectFiles;
-        public bool EnsureAssemblyInfo;
-        public ISet<string> Files = new HashSet<string>();
-    }
-}
+    public bool UpdateAssemblyInfo;
+    public bool UpdateProjectFiles;
+    public bool EnsureAssemblyInfo;
+    public ISet<string> Files = new HashSet<string>();
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/AuthenticationInfo.cs b/src/GitVersion.Core/Model/AuthenticationInfo.cs
index 44c912cfde..062a411cab 100644
--- a/src/GitVersion.Core/Model/AuthenticationInfo.cs
+++ b/src/GitVersion.Core/Model/AuthenticationInfo.cs
@@ -1,9 +1,8 @@
-namespace GitVersion
+namespace GitVersion;
+
+public class AuthenticationInfo
 {
-    public class AuthenticationInfo
-    {
-        public string? Username { get; set; }
-        public string? Password { get; set; }
-        public string? Token { get; set; }
-    }
-}
+    public string? Username { get; set; }
+    public string? Password { get; set; }
+    public string? Token { get; set; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/BranchCommit.cs b/src/GitVersion.Core/Model/BranchCommit.cs
index 9df999480f..f9425f6ea1 100644
--- a/src/GitVersion.Core/Model/BranchCommit.cs
+++ b/src/GitVersion.Core/Model/BranchCommit.cs
@@ -1,37 +1,36 @@
 using System;
 
-namespace GitVersion
+namespace GitVersion;
+
+/// <summary>
+/// A commit, together with the branch to which the commit belongs.
+/// </summary>
+public readonly struct BranchCommit : IEquatable<BranchCommit?>
 {
-    /// <summary>
-    /// A commit, together with the branch to which the commit belongs.
-    /// </summary>
-    public readonly struct BranchCommit : IEquatable<BranchCommit?>
-    {
-        public static readonly BranchCommit Empty = new();
+    public static readonly BranchCommit Empty = new();
 
-        public BranchCommit(ICommit commit, IBranch branch) : this()
-        {
-            Branch = branch ?? throw new ArgumentNullException(nameof(branch));
-            Commit = commit ?? throw new ArgumentNullException(nameof(commit));
-        }
+    public BranchCommit(ICommit commit, IBranch branch) : this()
+    {
+        Branch = branch ?? throw new ArgumentNullException(nameof(branch));
+        Commit = commit ?? throw new ArgumentNullException(nameof(commit));
+    }
 
-        public IBranch Branch { get; }
-        public ICommit Commit { get; }
+    public IBranch Branch { get; }
+    public ICommit Commit { get; }
 
-        public bool Equals(BranchCommit? other) => Equals(Branch, other?.Branch) && Equals(Commit, other?.Commit);
+    public bool Equals(BranchCommit? other) => Equals(Branch, other?.Branch) && Equals(Commit, other?.Commit);
 
-        public override bool Equals(object obj) => obj is null ? false : Equals(obj as BranchCommit?);
+    public override bool Equals(object obj) => obj is null ? false : Equals(obj as BranchCommit?);
 
-        public override int GetHashCode()
+    public override int GetHashCode()
+    {
+        unchecked
         {
-            unchecked
-            {
-                return ((Branch != null ? Branch.GetHashCode() : 0) * 397) ^ (Commit != null ? Commit.GetHashCode() : 0);
-            }
+            return ((Branch != null ? Branch.GetHashCode() : 0) * 397) ^ (Commit != null ? Commit.GetHashCode() : 0);
         }
+    }
 
-        public static bool operator ==(BranchCommit left, BranchCommit right) => left.Equals(right);
+    public static bool operator ==(BranchCommit left, BranchCommit right) => left.Equals(right);
 
-        public static bool operator !=(BranchCommit left, BranchCommit right) => !left.Equals(right);
-    }
-}
+    public static bool operator !=(BranchCommit left, BranchCommit right) => !left.Equals(right);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/ConfigInfo.cs b/src/GitVersion.Core/Model/ConfigInfo.cs
index 14b09489f5..ece9bb11bd 100644
--- a/src/GitVersion.Core/Model/ConfigInfo.cs
+++ b/src/GitVersion.Core/Model/ConfigInfo.cs
@@ -1,11 +1,10 @@
 using GitVersion.Model.Configuration;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class ConfigInfo
 {
-    public class ConfigInfo
-    {
-        public string? ConfigFile;
-        public Config? OverrideConfig;
-        public bool ShowConfig;
-    }
-}
+    public string? ConfigFile;
+    public Config? OverrideConfig;
+    public bool ShowConfig;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/Configuration/BranchConfig.cs b/src/GitVersion.Core/Model/Configuration/BranchConfig.cs
index 07dbb99535..1b17fd9a9f 100644
--- a/src/GitVersion.Core/Model/Configuration/BranchConfig.cs
+++ b/src/GitVersion.Core/Model/Configuration/BranchConfig.cs
@@ -4,124 +4,123 @@
 using JetBrains.Annotations;
 using YamlDotNet.Serialization;
 
-namespace GitVersion.Model.Configuration
+namespace GitVersion.Model.Configuration;
+
+public class BranchConfig
 {
-    public class BranchConfig
+    public BranchConfig()
+    {
+    }
+
+    /// <summary>
+    /// Creates a clone of the given <paramref name="branchConfiguration"/>.
+    /// </summary>
+    public BranchConfig(BranchConfig branchConfiguration)
+    {
+        VersioningMode = branchConfiguration.VersioningMode;
+        Tag = branchConfiguration.Tag;
+        Increment = branchConfiguration.Increment;
+        PreventIncrementOfMergedBranchVersion = branchConfiguration.PreventIncrementOfMergedBranchVersion;
+        TagNumberPattern = branchConfiguration.TagNumberPattern;
+        TrackMergeTarget = branchConfiguration.TrackMergeTarget;
+        CommitMessageIncrementing = branchConfiguration.CommitMessageIncrementing;
+        TracksReleaseBranches = branchConfiguration.TracksReleaseBranches;
+        Regex = branchConfiguration.Regex;
+        IsReleaseBranch = branchConfiguration.IsReleaseBranch;
+        IsMainline = branchConfiguration.IsMainline;
+        Name = branchConfiguration.Name;
+        SourceBranches = branchConfiguration.SourceBranches;
+        IsSourceBranchFor = branchConfiguration.IsSourceBranchFor;
+        PreReleaseWeight = branchConfiguration.PreReleaseWeight;
+    }
+
+    [YamlMember(Alias = "mode")]
+    public VersioningMode? VersioningMode { get; set; }
+
+    /// <summary>
+    /// Special value 'useBranchName' will extract the tag from the branch name
+    /// </summary>
+    [YamlMember(Alias = "tag")]
+    public string? Tag { get; set; }
+
+    [YamlMember(Alias = "increment")]
+    public IncrementStrategy? Increment { get; set; }
+
+    [YamlMember(Alias = "prevent-increment-of-merged-branch-version")]
+    public bool? PreventIncrementOfMergedBranchVersion { get; set; }
+
+    [YamlMember(Alias = "tag-number-pattern")]
+    public string? TagNumberPattern { get; set; }
+
+    [YamlMember(Alias = "track-merge-target")]
+    public bool? TrackMergeTarget { get; set; }
+
+    [YamlMember(Alias = "commit-message-incrementing")]
+    public CommitMessageIncrementMode? CommitMessageIncrementing { get; set; }
+
+    [YamlMember(Alias = "regex")]
+    public string? Regex { get; set; }
+
+    [YamlMember(Alias = "source-branches")]
+    public HashSet<string>? SourceBranches { get; set; }
+
+    [YamlMember(Alias = "is-source-branch-for")]
+    public HashSet<string>? IsSourceBranchFor { get; set; }
+
+    [YamlMember(Alias = "tracks-release-branches")]
+    public bool? TracksReleaseBranches { get; set; }
+
+    [YamlMember(Alias = "is-release-branch")]
+    public bool? IsReleaseBranch { get; set; }
+
+    [YamlMember(Alias = "is-mainline")]
+    public bool? IsMainline { get; set; }
+
+    [YamlMember(Alias = "pre-release-weight")]
+    public int? PreReleaseWeight { get; set; }
+
+    /// <summary>
+    /// The name given to this configuration in the config file.
+    /// </summary>
+    [YamlIgnore]
+    public string? Name { get; set; }
+
+    public void MergeTo([NotNull] BranchConfig targetConfig)
     {
-        public BranchConfig()
-        {
-        }
-
-        /// <summary>
-        /// Creates a clone of the given <paramref name="branchConfiguration"/>.
-        /// </summary>
-        public BranchConfig(BranchConfig branchConfiguration)
-        {
-            VersioningMode = branchConfiguration.VersioningMode;
-            Tag = branchConfiguration.Tag;
-            Increment = branchConfiguration.Increment;
-            PreventIncrementOfMergedBranchVersion = branchConfiguration.PreventIncrementOfMergedBranchVersion;
-            TagNumberPattern = branchConfiguration.TagNumberPattern;
-            TrackMergeTarget = branchConfiguration.TrackMergeTarget;
-            CommitMessageIncrementing = branchConfiguration.CommitMessageIncrementing;
-            TracksReleaseBranches = branchConfiguration.TracksReleaseBranches;
-            Regex = branchConfiguration.Regex;
-            IsReleaseBranch = branchConfiguration.IsReleaseBranch;
-            IsMainline = branchConfiguration.IsMainline;
-            Name = branchConfiguration.Name;
-            SourceBranches = branchConfiguration.SourceBranches;
-            IsSourceBranchFor = branchConfiguration.IsSourceBranchFor;
-            PreReleaseWeight = branchConfiguration.PreReleaseWeight;
-        }
-
-        [YamlMember(Alias = "mode")]
-        public VersioningMode? VersioningMode { get; set; }
-
-        /// <summary>
-        /// Special value 'useBranchName' will extract the tag from the branch name
-        /// </summary>
-        [YamlMember(Alias = "tag")]
-        public string? Tag { get; set; }
-
-        [YamlMember(Alias = "increment")]
-        public IncrementStrategy? Increment { get; set; }
-
-        [YamlMember(Alias = "prevent-increment-of-merged-branch-version")]
-        public bool? PreventIncrementOfMergedBranchVersion { get; set; }
-
-        [YamlMember(Alias = "tag-number-pattern")]
-        public string? TagNumberPattern { get; set; }
-
-        [YamlMember(Alias = "track-merge-target")]
-        public bool? TrackMergeTarget { get; set; }
-
-        [YamlMember(Alias = "commit-message-incrementing")]
-        public CommitMessageIncrementMode? CommitMessageIncrementing { get; set; }
-
-        [YamlMember(Alias = "regex")]
-        public string? Regex { get; set; }
-
-        [YamlMember(Alias = "source-branches")]
-        public HashSet<string>? SourceBranches { get; set; }
-
-        [YamlMember(Alias = "is-source-branch-for")]
-        public HashSet<string>? IsSourceBranchFor { get; set; }
-
-        [YamlMember(Alias = "tracks-release-branches")]
-        public bool? TracksReleaseBranches { get; set; }
-
-        [YamlMember(Alias = "is-release-branch")]
-        public bool? IsReleaseBranch { get; set; }
-
-        [YamlMember(Alias = "is-mainline")]
-        public bool? IsMainline { get; set; }
-
-        [YamlMember(Alias = "pre-release-weight")]
-        public int? PreReleaseWeight { get; set; }
-
-        /// <summary>
-        /// The name given to this configuration in the config file.
-        /// </summary>
-        [YamlIgnore]
-        public string? Name { get; set; }
-
-        public void MergeTo([NotNull] BranchConfig targetConfig)
-        {
-            if (targetConfig == null) throw new ArgumentNullException(nameof(targetConfig));
-
-            targetConfig.VersioningMode = this.VersioningMode ?? targetConfig.VersioningMode;
-            targetConfig.Tag = this.Tag ?? targetConfig.Tag;
-            targetConfig.Increment = this.Increment ?? targetConfig.Increment;
-            targetConfig.PreventIncrementOfMergedBranchVersion = this.PreventIncrementOfMergedBranchVersion ?? targetConfig.PreventIncrementOfMergedBranchVersion;
-            targetConfig.TagNumberPattern = this.TagNumberPattern ?? targetConfig.TagNumberPattern;
-            targetConfig.TrackMergeTarget = this.TrackMergeTarget ?? targetConfig.TrackMergeTarget;
-            targetConfig.CommitMessageIncrementing = this.CommitMessageIncrementing ?? targetConfig.CommitMessageIncrementing;
-            targetConfig.Regex = this.Regex ?? targetConfig.Regex;
-            targetConfig.SourceBranches = this.SourceBranches ?? targetConfig.SourceBranches;
-            targetConfig.IsSourceBranchFor = this.IsSourceBranchFor ?? targetConfig.IsSourceBranchFor;
-            targetConfig.TracksReleaseBranches = this.TracksReleaseBranches ?? targetConfig.TracksReleaseBranches;
-            targetConfig.IsReleaseBranch = this.IsReleaseBranch ?? targetConfig.IsReleaseBranch;
-            targetConfig.IsMainline = this.IsMainline ?? targetConfig.IsMainline;
-            targetConfig.PreReleaseWeight = this.PreReleaseWeight ?? targetConfig.PreReleaseWeight;
-        }
-
-        public BranchConfig Apply([NotNull] BranchConfig overrides)
-        {
-            if (overrides == null) throw new ArgumentNullException(nameof(overrides));
-
-            overrides.MergeTo(this);
-            return this;
-        }
-
-        public static BranchConfig CreateDefaultBranchConfig(string name) => new()
-        {
-            Name = name,
-            Tag = "useBranchName",
-            PreventIncrementOfMergedBranchVersion = false,
-            TrackMergeTarget = false,
-            TracksReleaseBranches = false,
-            IsReleaseBranch = false,
-            IsMainline = false,
-        };
+        if (targetConfig == null) throw new ArgumentNullException(nameof(targetConfig));
+
+        targetConfig.VersioningMode = this.VersioningMode ?? targetConfig.VersioningMode;
+        targetConfig.Tag = this.Tag ?? targetConfig.Tag;
+        targetConfig.Increment = this.Increment ?? targetConfig.Increment;
+        targetConfig.PreventIncrementOfMergedBranchVersion = this.PreventIncrementOfMergedBranchVersion ?? targetConfig.PreventIncrementOfMergedBranchVersion;
+        targetConfig.TagNumberPattern = this.TagNumberPattern ?? targetConfig.TagNumberPattern;
+        targetConfig.TrackMergeTarget = this.TrackMergeTarget ?? targetConfig.TrackMergeTarget;
+        targetConfig.CommitMessageIncrementing = this.CommitMessageIncrementing ?? targetConfig.CommitMessageIncrementing;
+        targetConfig.Regex = this.Regex ?? targetConfig.Regex;
+        targetConfig.SourceBranches = this.SourceBranches ?? targetConfig.SourceBranches;
+        targetConfig.IsSourceBranchFor = this.IsSourceBranchFor ?? targetConfig.IsSourceBranchFor;
+        targetConfig.TracksReleaseBranches = this.TracksReleaseBranches ?? targetConfig.TracksReleaseBranches;
+        targetConfig.IsReleaseBranch = this.IsReleaseBranch ?? targetConfig.IsReleaseBranch;
+        targetConfig.IsMainline = this.IsMainline ?? targetConfig.IsMainline;
+        targetConfig.PreReleaseWeight = this.PreReleaseWeight ?? targetConfig.PreReleaseWeight;
     }
-}
+
+    public BranchConfig Apply([NotNull] BranchConfig overrides)
+    {
+        if (overrides == null) throw new ArgumentNullException(nameof(overrides));
+
+        overrides.MergeTo(this);
+        return this;
+    }
+
+    public static BranchConfig CreateDefaultBranchConfig(string name) => new()
+    {
+        Name = name,
+        Tag = "useBranchName",
+        PreventIncrementOfMergedBranchVersion = false,
+        TrackMergeTarget = false,
+        TracksReleaseBranches = false,
+        IsReleaseBranch = false,
+        IsMainline = false,
+    };
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/Configuration/Config.cs b/src/GitVersion.Core/Model/Configuration/Config.cs
index fcf6e8ca8e..b94a2f4654 100644
--- a/src/GitVersion.Core/Model/Configuration/Config.cs
+++ b/src/GitVersion.Core/Model/Configuration/Config.cs
@@ -7,121 +7,120 @@
 using GitVersion.VersionCalculation;
 using YamlDotNet.Serialization;
 
-namespace GitVersion.Model.Configuration
+namespace GitVersion.Model.Configuration;
+
+public class Config
 {
-    public class Config
+    private string? nextVersion;
+
+    public Config()
     {
-        private string? nextVersion;
+        Branches = new Dictionary<string, BranchConfig?>();
+        Ignore = new IgnoreConfig();
+    }
+
+    [YamlMember(Alias = "assembly-versioning-scheme")]
+    public AssemblyVersioningScheme? AssemblyVersioningScheme { get; set; }
+
+    [YamlMember(Alias = "assembly-file-versioning-scheme")]
+    public AssemblyFileVersioningScheme? AssemblyFileVersioningScheme { get; set; }
+
+    [YamlMember(Alias = "assembly-informational-format")]
+    public string? AssemblyInformationalFormat { get; set; }
+
+    [YamlMember(Alias = "assembly-versioning-format")]
+    public string? AssemblyVersioningFormat { get; set; }
+
+    [YamlMember(Alias = "assembly-file-versioning-format")]
+    public string? AssemblyFileVersioningFormat { get; set; }
 
-        public Config()
-        {
-            Branches = new Dictionary<string, BranchConfig?>();
-            Ignore = new IgnoreConfig();
-        }
+    [YamlMember(Alias = "mode")]
+    public VersioningMode? VersioningMode { get; set; }
 
-        [YamlMember(Alias = "assembly-versioning-scheme")]
-        public AssemblyVersioningScheme? AssemblyVersioningScheme { get; set; }
+    [YamlMember(Alias = "tag-prefix")]
+    public string? TagPrefix { get; set; }
 
-        [YamlMember(Alias = "assembly-file-versioning-scheme")]
-        public AssemblyFileVersioningScheme? AssemblyFileVersioningScheme { get; set; }
-
-        [YamlMember(Alias = "assembly-informational-format")]
-        public string? AssemblyInformationalFormat { get; set; }
-
-        [YamlMember(Alias = "assembly-versioning-format")]
-        public string? AssemblyVersioningFormat { get; set; }
-
-        [YamlMember(Alias = "assembly-file-versioning-format")]
-        public string? AssemblyFileVersioningFormat { get; set; }
-
-        [YamlMember(Alias = "mode")]
-        public VersioningMode? VersioningMode { get; set; }
-
-        [YamlMember(Alias = "tag-prefix")]
-        public string? TagPrefix { get; set; }
-
-        [YamlMember(Alias = "continuous-delivery-fallback-tag")]
-        public string? ContinuousDeploymentFallbackTag { get; set; }
-
-        [YamlMember(Alias = "next-version")]
-        public string? NextVersion
-        {
-            get => this.nextVersion;
-            set =>
-                this.nextVersion = int.TryParse(value, NumberStyles.Any, NumberFormatInfo.InvariantInfo, out var major)
-                    ? $"{major}.0"
-                    : value;
-        }
-
-        [YamlMember(Alias = "major-version-bump-message")]
-        public string? MajorVersionBumpMessage { get; set; }
-
-        [YamlMember(Alias = "minor-version-bump-message")]
-        public string? MinorVersionBumpMessage { get; set; }
-
-        [YamlMember(Alias = "patch-version-bump-message")]
-        public string? PatchVersionBumpMessage { get; set; }
-
-        [YamlMember(Alias = "no-bump-message")]
-        public string? NoBumpMessage { get; set; }
-
-        [YamlMember(Alias = "legacy-semver-padding")]
-        public int? LegacySemVerPadding { get; set; }
-
-        [YamlMember(Alias = "build-metadata-padding")]
-        public int? BuildMetaDataPadding { get; set; }
-
-        [YamlMember(Alias = "commits-since-version-source-padding")]
-        public int? CommitsSinceVersionSourcePadding { get; set; }
-
-        [YamlMember(Alias = "tag-pre-release-weight")]
-        public int? TagPreReleaseWeight { get; set; }
-
-        [YamlMember(Alias = "commit-message-incrementing")]
-        public CommitMessageIncrementMode? CommitMessageIncrementing { get; set; }
-
-        [YamlMember(Alias = "branches")]
-        public Dictionary<string, BranchConfig?> Branches { get; set; }
-
-        [YamlMember(Alias = "ignore")]
-        public IgnoreConfig Ignore { get; set; }
-
-        [YamlMember(Alias = "increment")]
-        public IncrementStrategy? Increment { get; set; }
-
-        [YamlMember(Alias = "commit-date-format")]
-        public string? CommitDateFormat { get; set; }
-
-        [YamlMember(Alias = "merge-message-formats")]
-        public Dictionary<string, string> MergeMessageFormats { get; set; } = new Dictionary<string, string>();
-
-        [YamlMember(Alias = "update-build-number")]
-        public bool? UpdateBuildNumber { get; set; }
-
-        public override string ToString()
-        {
-            var stringBuilder = new StringBuilder();
-            using var stream = new StringWriter(stringBuilder);
-            ConfigSerializer.Write(this, stream);
-            stream.Flush();
-            return stringBuilder.ToString();
-        }
-
-        public const string DefaultTagPrefix = "[vV]";
-        public const string ReleaseBranchRegex = "^releases?[/-]";
-        public const string FeatureBranchRegex = "^features?[/-]";
-        public const string PullRequestRegex = @"^(pull|pull\-requests|pr)[/-]";
-        public const string HotfixBranchRegex = "^hotfix(es)?[/-]";
-        public const string SupportBranchRegex = "^support[/-]";
-        public const string DevelopBranchRegex = "^dev(elop)?(ment)?$";
-        public const string MainBranchRegex = "^master$|^main$";
-        public const string MainBranchKey = "main";
-        public const string MasterBranchKey = "master";
-        public const string ReleaseBranchKey = "release";
-        public const string FeatureBranchKey = "feature";
-        public const string PullRequestBranchKey = "pull-request";
-        public const string HotfixBranchKey = "hotfix";
-        public const string SupportBranchKey = "support";
-        public const string DevelopBranchKey = "develop";
+    [YamlMember(Alias = "continuous-delivery-fallback-tag")]
+    public string? ContinuousDeploymentFallbackTag { get; set; }
+
+    [YamlMember(Alias = "next-version")]
+    public string? NextVersion
+    {
+        get => this.nextVersion;
+        set =>
+            this.nextVersion = int.TryParse(value, NumberStyles.Any, NumberFormatInfo.InvariantInfo, out var major)
+                ? $"{major}.0"
+                : value;
     }
-}
+
+    [YamlMember(Alias = "major-version-bump-message")]
+    public string? MajorVersionBumpMessage { get; set; }
+
+    [YamlMember(Alias = "minor-version-bump-message")]
+    public string? MinorVersionBumpMessage { get; set; }
+
+    [YamlMember(Alias = "patch-version-bump-message")]
+    public string? PatchVersionBumpMessage { get; set; }
+
+    [YamlMember(Alias = "no-bump-message")]
+    public string? NoBumpMessage { get; set; }
+
+    [YamlMember(Alias = "legacy-semver-padding")]
+    public int? LegacySemVerPadding { get; set; }
+
+    [YamlMember(Alias = "build-metadata-padding")]
+    public int? BuildMetaDataPadding { get; set; }
+
+    [YamlMember(Alias = "commits-since-version-source-padding")]
+    public int? CommitsSinceVersionSourcePadding { get; set; }
+
+    [YamlMember(Alias = "tag-pre-release-weight")]
+    public int? TagPreReleaseWeight { get; set; }
+
+    [YamlMember(Alias = "commit-message-incrementing")]
+    public CommitMessageIncrementMode? CommitMessageIncrementing { get; set; }
+
+    [YamlMember(Alias = "branches")]
+    public Dictionary<string, BranchConfig?> Branches { get; set; }
+
+    [YamlMember(Alias = "ignore")]
+    public IgnoreConfig Ignore { get; set; }
+
+    [YamlMember(Alias = "increment")]
+    public IncrementStrategy? Increment { get; set; }
+
+    [YamlMember(Alias = "commit-date-format")]
+    public string? CommitDateFormat { get; set; }
+
+    [YamlMember(Alias = "merge-message-formats")]
+    public Dictionary<string, string> MergeMessageFormats { get; set; } = new Dictionary<string, string>();
+
+    [YamlMember(Alias = "update-build-number")]
+    public bool? UpdateBuildNumber { get; set; }
+
+    public override string ToString()
+    {
+        var stringBuilder = new StringBuilder();
+        using var stream = new StringWriter(stringBuilder);
+        ConfigSerializer.Write(this, stream);
+        stream.Flush();
+        return stringBuilder.ToString();
+    }
+
+    public const string DefaultTagPrefix = "[vV]";
+    public const string ReleaseBranchRegex = "^releases?[/-]";
+    public const string FeatureBranchRegex = "^features?[/-]";
+    public const string PullRequestRegex = @"^(pull|pull\-requests|pr)[/-]";
+    public const string HotfixBranchRegex = "^hotfix(es)?[/-]";
+    public const string SupportBranchRegex = "^support[/-]";
+    public const string DevelopBranchRegex = "^dev(elop)?(ment)?$";
+    public const string MainBranchRegex = "^master$|^main$";
+    public const string MainBranchKey = "main";
+    public const string MasterBranchKey = "master";
+    public const string ReleaseBranchKey = "release";
+    public const string FeatureBranchKey = "feature";
+    public const string PullRequestBranchKey = "pull-request";
+    public const string HotfixBranchKey = "hotfix";
+    public const string SupportBranchKey = "support";
+    public const string DevelopBranchKey = "develop";
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/Configuration/EffectiveConfiguration.cs b/src/GitVersion.Core/Model/Configuration/EffectiveConfiguration.cs
index 1c4228ddc2..058bc46f3a 100644
--- a/src/GitVersion.Core/Model/Configuration/EffectiveConfiguration.cs
+++ b/src/GitVersion.Core/Model/Configuration/EffectiveConfiguration.cs
@@ -2,131 +2,130 @@
 using GitVersion.Extensions;
 using GitVersion.VersionCalculation;
 
-namespace GitVersion.Model.Configuration
+namespace GitVersion.Model.Configuration;
+
+/// <summary>
+/// Configuration can be applied to different things, effective configuration is the result after applying the appropriate configuration
+/// </summary>
+public class EffectiveConfiguration
 {
-    /// <summary>
-    /// Configuration can be applied to different things, effective configuration is the result after applying the appropriate configuration
-    /// </summary>
-    public class EffectiveConfiguration
+    public EffectiveConfiguration(
+        AssemblyVersioningScheme assemblyVersioningScheme,
+        AssemblyFileVersioningScheme assemblyFileVersioningScheme,
+        string? assemblyInformationalFormat,
+        string? assemblyVersioningFormat,
+        string? assemblyFileVersioningFormat,
+        VersioningMode versioningMode, string? gitTagPrefix,
+        string? tag, string? nextVersion, IncrementStrategy increment,
+        string? branchPrefixToTrim,
+        bool preventIncrementForMergedBranchVersion,
+        string? tagNumberPattern,
+        string? continuousDeploymentFallbackTag,
+        bool trackMergeTarget,
+        string? majorVersionBumpMessage,
+        string? minorVersionBumpMessage,
+        string? patchVersionBumpMessage,
+        string? noBumpMessage,
+        CommitMessageIncrementMode commitMessageIncrementing,
+        int legacySemVerPaddding,
+        int buildMetaDataPadding,
+        int commitsSinceVersionSourcePadding,
+        IEnumerable<IVersionFilter> versionFilters,
+        bool tracksReleaseBranches,
+        bool isCurrentBranchRelease,
+        string? commitDateFormat,
+        bool updateBuildNumber,
+        int preReleaseWeight,
+        int tagPreReleaseWeight)
     {
-        public EffectiveConfiguration(
-            AssemblyVersioningScheme assemblyVersioningScheme,
-            AssemblyFileVersioningScheme assemblyFileVersioningScheme,
-            string? assemblyInformationalFormat,
-            string? assemblyVersioningFormat,
-            string? assemblyFileVersioningFormat,
-            VersioningMode versioningMode, string? gitTagPrefix,
-            string? tag, string? nextVersion, IncrementStrategy increment,
-            string? branchPrefixToTrim,
-            bool preventIncrementForMergedBranchVersion,
-            string? tagNumberPattern,
-            string? continuousDeploymentFallbackTag,
-            bool trackMergeTarget,
-            string? majorVersionBumpMessage,
-            string? minorVersionBumpMessage,
-            string? patchVersionBumpMessage,
-            string? noBumpMessage,
-            CommitMessageIncrementMode commitMessageIncrementing,
-            int legacySemVerPaddding,
-            int buildMetaDataPadding,
-            int commitsSinceVersionSourcePadding,
-            IEnumerable<IVersionFilter> versionFilters,
-            bool tracksReleaseBranches,
-            bool isCurrentBranchRelease,
-            string? commitDateFormat,
-            bool updateBuildNumber,
-            int preReleaseWeight,
-            int tagPreReleaseWeight)
-        {
-            AssemblyVersioningScheme = assemblyVersioningScheme;
-            AssemblyFileVersioningScheme = assemblyFileVersioningScheme;
-            AssemblyInformationalFormat = assemblyInformationalFormat;
-            AssemblyVersioningFormat = assemblyVersioningFormat;
-            AssemblyFileVersioningFormat = assemblyFileVersioningFormat;
-            VersioningMode = versioningMode;
-            GitTagPrefix = gitTagPrefix;
-            Tag = tag;
-            NextVersion = nextVersion;
-            Increment = increment;
-            BranchPrefixToTrim = branchPrefixToTrim;
-            PreventIncrementForMergedBranchVersion = preventIncrementForMergedBranchVersion;
-            TagNumberPattern = tagNumberPattern;
-            ContinuousDeploymentFallbackTag = continuousDeploymentFallbackTag;
-            TrackMergeTarget = trackMergeTarget;
-            MajorVersionBumpMessage = majorVersionBumpMessage;
-            MinorVersionBumpMessage = minorVersionBumpMessage;
-            PatchVersionBumpMessage = patchVersionBumpMessage;
-            NoBumpMessage = noBumpMessage;
-            CommitMessageIncrementing = commitMessageIncrementing;
-            LegacySemVerPadding = legacySemVerPaddding;
-            BuildMetaDataPadding = buildMetaDataPadding;
-            CommitsSinceVersionSourcePadding = commitsSinceVersionSourcePadding;
-            VersionFilters = versionFilters;
-            TracksReleaseBranches = tracksReleaseBranches;
-            IsCurrentBranchRelease = isCurrentBranchRelease;
-            CommitDateFormat = commitDateFormat;
-            UpdateBuildNumber = updateBuildNumber;
-            PreReleaseWeight = preReleaseWeight;
-            TagPreReleaseWeight = tagPreReleaseWeight;
-        }
-
-        public bool TracksReleaseBranches { get; private set; }
-        public bool IsCurrentBranchRelease { get; private set; }
-
-        public VersioningMode VersioningMode { get; private set; }
-
-        public AssemblyVersioningScheme AssemblyVersioningScheme { get; private set; }
-        public AssemblyFileVersioningScheme AssemblyFileVersioningScheme { get; private set; }
-        public string? AssemblyInformationalFormat { get; private set; }
-        public string? AssemblyVersioningFormat { get; private set; }
-        public string? AssemblyFileVersioningFormat { get; private set; }
-
-        /// <summary>
-        /// Git tag prefix
-        /// </summary>
-        public string? GitTagPrefix { get; private set; }
-
-        /// <summary>
-        /// Tag to use when calculating SemVer
-        /// </summary>
-        public string? Tag { get; private set; }
-
-        public string? NextVersion { get; private set; }
-
-        public IncrementStrategy Increment { get; private set; }
-
-        public string? BranchPrefixToTrim { get; private set; }
-
-        public bool PreventIncrementForMergedBranchVersion { get; private set; }
-
-        public string? TagNumberPattern { get; private set; }
-
-        public string? ContinuousDeploymentFallbackTag { get; private set; }
-
-        public bool TrackMergeTarget { get; private set; }
-
-        public string? MajorVersionBumpMessage { get; private set; }
-
-        public string? MinorVersionBumpMessage { get; private set; }
-
-        public string? PatchVersionBumpMessage { get; private set; }
-
-        public string? NoBumpMessage { get; private set; }
-        public int LegacySemVerPadding { get; private set; }
-        public int BuildMetaDataPadding { get; private set; }
-
-        public int CommitsSinceVersionSourcePadding { get; private set; }
-
-        public CommitMessageIncrementMode CommitMessageIncrementing { get; private set; }
-
-        public IEnumerable<IVersionFilter> VersionFilters { get; private set; }
-
-        public string? CommitDateFormat { get; private set; }
-
-        public bool UpdateBuildNumber { get; private set; }
-
-        public int PreReleaseWeight { get; private set; }
-
-        public int TagPreReleaseWeight { get; private set; }
+        AssemblyVersioningScheme = assemblyVersioningScheme;
+        AssemblyFileVersioningScheme = assemblyFileVersioningScheme;
+        AssemblyInformationalFormat = assemblyInformationalFormat;
+        AssemblyVersioningFormat = assemblyVersioningFormat;
+        AssemblyFileVersioningFormat = assemblyFileVersioningFormat;
+        VersioningMode = versioningMode;
+        GitTagPrefix = gitTagPrefix;
+        Tag = tag;
+        NextVersion = nextVersion;
+        Increment = increment;
+        BranchPrefixToTrim = branchPrefixToTrim;
+        PreventIncrementForMergedBranchVersion = preventIncrementForMergedBranchVersion;
+        TagNumberPattern = tagNumberPattern;
+        ContinuousDeploymentFallbackTag = continuousDeploymentFallbackTag;
+        TrackMergeTarget = trackMergeTarget;
+        MajorVersionBumpMessage = majorVersionBumpMessage;
+        MinorVersionBumpMessage = minorVersionBumpMessage;
+        PatchVersionBumpMessage = patchVersionBumpMessage;
+        NoBumpMessage = noBumpMessage;
+        CommitMessageIncrementing = commitMessageIncrementing;
+        LegacySemVerPadding = legacySemVerPaddding;
+        BuildMetaDataPadding = buildMetaDataPadding;
+        CommitsSinceVersionSourcePadding = commitsSinceVersionSourcePadding;
+        VersionFilters = versionFilters;
+        TracksReleaseBranches = tracksReleaseBranches;
+        IsCurrentBranchRelease = isCurrentBranchRelease;
+        CommitDateFormat = commitDateFormat;
+        UpdateBuildNumber = updateBuildNumber;
+        PreReleaseWeight = preReleaseWeight;
+        TagPreReleaseWeight = tagPreReleaseWeight;
     }
-}
+
+    public bool TracksReleaseBranches { get; private set; }
+    public bool IsCurrentBranchRelease { get; private set; }
+
+    public VersioningMode VersioningMode { get; private set; }
+
+    public AssemblyVersioningScheme AssemblyVersioningScheme { get; private set; }
+    public AssemblyFileVersioningScheme AssemblyFileVersioningScheme { get; private set; }
+    public string? AssemblyInformationalFormat { get; private set; }
+    public string? AssemblyVersioningFormat { get; private set; }
+    public string? AssemblyFileVersioningFormat { get; private set; }
+
+    /// <summary>
+    /// Git tag prefix
+    /// </summary>
+    public string? GitTagPrefix { get; private set; }
+
+    /// <summary>
+    /// Tag to use when calculating SemVer
+    /// </summary>
+    public string? Tag { get; private set; }
+
+    public string? NextVersion { get; private set; }
+
+    public IncrementStrategy Increment { get; private set; }
+
+    public string? BranchPrefixToTrim { get; private set; }
+
+    public bool PreventIncrementForMergedBranchVersion { get; private set; }
+
+    public string? TagNumberPattern { get; private set; }
+
+    public string? ContinuousDeploymentFallbackTag { get; private set; }
+
+    public bool TrackMergeTarget { get; private set; }
+
+    public string? MajorVersionBumpMessage { get; private set; }
+
+    public string? MinorVersionBumpMessage { get; private set; }
+
+    public string? PatchVersionBumpMessage { get; private set; }
+
+    public string? NoBumpMessage { get; private set; }
+    public int LegacySemVerPadding { get; private set; }
+    public int BuildMetaDataPadding { get; private set; }
+
+    public int CommitsSinceVersionSourcePadding { get; private set; }
+
+    public CommitMessageIncrementMode CommitMessageIncrementing { get; private set; }
+
+    public IEnumerable<IVersionFilter> VersionFilters { get; private set; }
+
+    public string? CommitDateFormat { get; private set; }
+
+    public bool UpdateBuildNumber { get; private set; }
+
+    public int PreReleaseWeight { get; private set; }
+
+    public int TagPreReleaseWeight { get; private set; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/Configuration/IgnoreConfig.cs b/src/GitVersion.Core/Model/Configuration/IgnoreConfig.cs
index 3db1b4b2ff..c2f424d745 100644
--- a/src/GitVersion.Core/Model/Configuration/IgnoreConfig.cs
+++ b/src/GitVersion.Core/Model/Configuration/IgnoreConfig.cs
@@ -4,26 +4,25 @@
 using GitVersion.VersionCalculation;
 using YamlDotNet.Serialization;
 
-namespace GitVersion.Model.Configuration
+namespace GitVersion.Model.Configuration;
+
+public class IgnoreConfig
 {
-    public class IgnoreConfig
-    {
-        public IgnoreConfig() => ShAs = Enumerable.Empty<string>();
+    public IgnoreConfig() => ShAs = Enumerable.Empty<string>();
 
-        [YamlMember(Alias = "commits-before")]
-        public DateTimeOffset? Before { get; set; }
+    [YamlMember(Alias = "commits-before")]
+    public DateTimeOffset? Before { get; set; }
 
-        [YamlMember(Alias = "sha")]
-        public IEnumerable<string> ShAs { get; set; }
+    [YamlMember(Alias = "sha")]
+    public IEnumerable<string> ShAs { get; set; }
 
-        [YamlIgnore]
-        public virtual bool IsEmpty => Before == null
-                                       && (ShAs == null || ShAs.Any() == false);
+    [YamlIgnore]
+    public virtual bool IsEmpty => Before == null
+                                   && (ShAs == null || ShAs.Any() == false);
 
-        public virtual IEnumerable<IVersionFilter> ToFilters()
-        {
-            if (ShAs.Any()) yield return new ShaVersionFilter(ShAs);
-            if (Before.HasValue) yield return new MinDateVersionFilter(Before.Value);
-        }
+    public virtual IEnumerable<IVersionFilter> ToFilters()
+    {
+        if (ShAs.Any()) yield return new ShaVersionFilter(ShAs);
+        if (Before.HasValue) yield return new MinDateVersionFilter(Before.Value);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/Exceptions/BugException.cs b/src/GitVersion.Core/Model/Exceptions/BugException.cs
index 3cf97b53a9..50e8e572b6 100644
--- a/src/GitVersion.Core/Model/Exceptions/BugException.cs
+++ b/src/GitVersion.Core/Model/Exceptions/BugException.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class BugException : Exception
 {
-    public class BugException : Exception
+    public BugException(string message) : base(message)
     {
-        public BugException(string message) : base(message)
-        {
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/Exceptions/ConfigurationException.cs b/src/GitVersion.Core/Model/Exceptions/ConfigurationException.cs
index 94b084ae14..4e3f8e78a6 100644
--- a/src/GitVersion.Core/Model/Exceptions/ConfigurationException.cs
+++ b/src/GitVersion.Core/Model/Exceptions/ConfigurationException.cs
@@ -1,13 +1,12 @@
 using System;
 
-namespace GitVersion.Configuration
+namespace GitVersion.Configuration;
+
+[Serializable]
+public class ConfigurationException : GitVersionException
 {
-    [Serializable]
-    public class ConfigurationException : GitVersionException
+    public ConfigurationException(string msg)
+        : base(msg)
     {
-        public ConfigurationException(string msg)
-            : base(msg)
-        {
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/Exceptions/GitToolsException.cs b/src/GitVersion.Core/Model/Exceptions/GitToolsException.cs
index d652d0931f..4c54c6a175 100644
--- a/src/GitVersion.Core/Model/Exceptions/GitToolsException.cs
+++ b/src/GitVersion.Core/Model/Exceptions/GitToolsException.cs
@@ -1,18 +1,17 @@
 using System;
 
-namespace GitVersion
+namespace GitVersion;
+
+[Serializable]
+public class GitToolsException : Exception
 {
-    [Serializable]
-    public class GitToolsException : Exception
+    public GitToolsException(string messageFormat, params object[] args)
+        : base(string.Format(messageFormat, args))
     {
-        public GitToolsException(string messageFormat, params object[] args)
-            : base(string.Format(messageFormat, args))
-        {
-        }
+    }
 
-        public GitToolsException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+    public GitToolsException(string message, Exception innerException)
+        : base(message, innerException)
+    {
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/Exceptions/GitVersionException.cs b/src/GitVersion.Core/Model/Exceptions/GitVersionException.cs
index 286ff05c6c..c2dda83b45 100644
--- a/src/GitVersion.Core/Model/Exceptions/GitVersionException.cs
+++ b/src/GitVersion.Core/Model/Exceptions/GitVersionException.cs
@@ -1,19 +1,18 @@
 using System;
 
-namespace GitVersion
+namespace GitVersion;
+
+[Serializable]
+public class GitVersionException : GitToolsException
 {
-    [Serializable]
-    public class GitVersionException : GitToolsException
+    public GitVersionException(string message)
+        : base(message)
     {
-        public GitVersionException(string message)
-            : base(message)
-        {
-        }
+    }
 
 
-        public GitVersionException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+    public GitVersionException(string message, Exception innerException)
+        : base(message, innerException)
+    {
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/Exceptions/LockedFileException.cs b/src/GitVersion.Core/Model/Exceptions/LockedFileException.cs
index f53226812e..acdfb13fc0 100644
--- a/src/GitVersion.Core/Model/Exceptions/LockedFileException.cs
+++ b/src/GitVersion.Core/Model/Exceptions/LockedFileException.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class LockedFileException : Exception
 {
-    public class LockedFileException : Exception
+    public LockedFileException(Exception inner) : base(inner.Message, inner)
     {
-        public LockedFileException(Exception inner) : base(inner.Message, inner)
-        {
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/Exceptions/WarningException.cs b/src/GitVersion.Core/Model/Exceptions/WarningException.cs
index 49fb4cebc3..59b1065b5f 100644
--- a/src/GitVersion.Core/Model/Exceptions/WarningException.cs
+++ b/src/GitVersion.Core/Model/Exceptions/WarningException.cs
@@ -1,13 +1,12 @@
 using System;
 
-namespace GitVersion
+namespace GitVersion;
+
+[Serializable]
+public class WarningException : Exception
 {
-    [Serializable]
-    public class WarningException : Exception
+    public WarningException(string message)
+        : base(message)
     {
-        public WarningException(string message)
-            : base(message)
-        {
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/FileWriteInfo.cs b/src/GitVersion.Core/Model/FileWriteInfo.cs
index 1dfac67a1e..cb6e15b94a 100644
--- a/src/GitVersion.Core/Model/FileWriteInfo.cs
+++ b/src/GitVersion.Core/Model/FileWriteInfo.cs
@@ -1,16 +1,15 @@
-namespace GitVersion
+namespace GitVersion;
+
+public sealed class FileWriteInfo
 {
-    public sealed class FileWriteInfo
+    public FileWriteInfo(string workingDirectory, string fileName, string fileExtension)
     {
-        public FileWriteInfo(string workingDirectory, string fileName, string fileExtension)
-        {
-            WorkingDirectory = workingDirectory;
-            FileName = fileName;
-            FileExtension = fileExtension;
-        }
-
-        public string WorkingDirectory { get; }
-        public string FileName { get; }
-        public string FileExtension { get; }
+        WorkingDirectory = workingDirectory;
+        FileName = fileName;
+        FileExtension = fileExtension;
     }
-}
+
+    public string WorkingDirectory { get; }
+    public string FileName { get; }
+    public string FileExtension { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/GitVersionCacheKey.cs b/src/GitVersion.Core/Model/GitVersionCacheKey.cs
index 0315f266db..3e37f78a17 100644
--- a/src/GitVersion.Core/Model/GitVersionCacheKey.cs
+++ b/src/GitVersion.Core/Model/GitVersionCacheKey.cs
@@ -1,20 +1,19 @@
 using System;
 using GitVersion.Extensions;
 
-namespace GitVersion.Cache
+namespace GitVersion.Cache;
+
+public class GitVersionCacheKey
 {
-    public class GitVersionCacheKey
+    public GitVersionCacheKey(string value)
     {
-        public GitVersionCacheKey(string value)
+        if (value.IsNullOrEmpty())
         {
-            if (value.IsNullOrEmpty())
-            {
-                throw new ArgumentNullException(nameof(value));
-            }
-
-            Value = value;
+            throw new ArgumentNullException(nameof(value));
         }
 
-        public string Value { get; private set; }
+        Value = value;
     }
-}
+
+    public string Value { get; private set; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/GitVersionContext.cs b/src/GitVersion.Core/Model/GitVersionContext.cs
index 06d9ea4b2c..8ee35bef80 100644
--- a/src/GitVersion.Core/Model/GitVersionContext.cs
+++ b/src/GitVersion.Core/Model/GitVersionContext.cs
@@ -1,41 +1,40 @@
 using GitVersion.Model.Configuration;
 
-namespace GitVersion
+namespace GitVersion;
+
+/// <summary>
+/// Contextual information about where GitVersion is being run
+/// </summary>
+public class GitVersionContext
 {
     /// <summary>
-    /// Contextual information about where GitVersion is being run
+    /// Contains the raw configuration, use Configuration for specific config based on the current GitVersion context.
     /// </summary>
-    public class GitVersionContext
-    {
-        /// <summary>
-        /// Contains the raw configuration, use Configuration for specific config based on the current GitVersion context.
-        /// </summary>
-        public Config? FullConfiguration { get; }
+    public Config? FullConfiguration { get; }
 
-        public SemanticVersion? CurrentCommitTaggedVersion { get; }
-        public EffectiveConfiguration? Configuration { get; }
-        public IBranch? CurrentBranch { get; }
-        public ICommit? CurrentCommit { get; }
-        public bool IsCurrentCommitTagged => CurrentCommitTaggedVersion != null;
+    public SemanticVersion? CurrentCommitTaggedVersion { get; }
+    public EffectiveConfiguration? Configuration { get; }
+    public IBranch? CurrentBranch { get; }
+    public ICommit? CurrentCommit { get; }
+    public bool IsCurrentCommitTagged => CurrentCommitTaggedVersion != null;
 
-        public int NumberOfUncommittedChanges { get; }
+    public int NumberOfUncommittedChanges { get; }
 
-        public GitVersionContext()
-        {
-        }
+    public GitVersionContext()
+    {
+    }
 
-        public GitVersionContext(IBranch currentBranch, ICommit? currentCommit,
-            Config configuration, EffectiveConfiguration effectiveConfiguration, SemanticVersion currentCommitTaggedVersion, int numberOfUncommittedChanges)
-        {
-            CurrentCommit = currentCommit;
-            CurrentBranch = currentBranch;
+    public GitVersionContext(IBranch currentBranch, ICommit? currentCommit,
+        Config configuration, EffectiveConfiguration effectiveConfiguration, SemanticVersion currentCommitTaggedVersion, int numberOfUncommittedChanges)
+    {
+        CurrentCommit = currentCommit;
+        CurrentBranch = currentBranch;
 
-            FullConfiguration = configuration;
-            Configuration = effectiveConfiguration;
+        FullConfiguration = configuration;
+        Configuration = effectiveConfiguration;
 
-            CurrentCommitTaggedVersion = currentCommitTaggedVersion;
+        CurrentCommitTaggedVersion = currentCommitTaggedVersion;
 
-            NumberOfUncommittedChanges = numberOfUncommittedChanges;
-        }
+        NumberOfUncommittedChanges = numberOfUncommittedChanges;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/GitVersionOptions.cs b/src/GitVersion.Core/Model/GitVersionOptions.cs
index 1680938e58..fb240eea68 100644
--- a/src/GitVersion.Core/Model/GitVersionOptions.cs
+++ b/src/GitVersion.Core/Model/GitVersionOptions.cs
@@ -2,28 +2,27 @@
 using GitVersion.Logging;
 using GitVersion.Model;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class GitVersionOptions
 {
-    public class GitVersionOptions
-    {
-        public string? WorkingDirectory { get; set; }
+    public string? WorkingDirectory { get; set; }
 
-        public AssemblyInfoData AssemblyInfo { get; } = new AssemblyInfoData();
-        public AuthenticationInfo Authentication { get; } = new AuthenticationInfo();
-        public ConfigInfo ConfigInfo { get; } = new ConfigInfo();
-        public RepositoryInfo RepositoryInfo { get; } = new RepositoryInfo();
-        public WixInfo WixInfo { get; } = new WixInfo();
-        public Settings Settings { get; } = new Settings();
+    public AssemblyInfoData AssemblyInfo { get; } = new AssemblyInfoData();
+    public AuthenticationInfo Authentication { get; } = new AuthenticationInfo();
+    public ConfigInfo ConfigInfo { get; } = new ConfigInfo();
+    public RepositoryInfo RepositoryInfo { get; } = new RepositoryInfo();
+    public WixInfo WixInfo { get; } = new WixInfo();
+    public Settings Settings { get; } = new Settings();
 
-        public bool Init;
-        public bool Diag;
-        public bool IsVersion;
-        public bool IsHelp;
+    public bool Init;
+    public bool Diag;
+    public bool IsVersion;
+    public bool IsHelp;
 
-        public string? LogFilePath;
-        public string? ShowVariable;
-        public string? OutputFile;
-        public ISet<OutputType> Output = new HashSet<OutputType>();
-        public Verbosity Verbosity = Verbosity.Normal;
-    }
-}
+    public string? LogFilePath;
+    public string? ShowVariable;
+    public string? OutputFile;
+    public ISet<OutputType> Output = new HashSet<OutputType>();
+    public Verbosity Verbosity = Verbosity.Normal;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/MergeMessage.cs b/src/GitVersion.Core/Model/MergeMessage.cs
index d50008346e..940265300b 100644
--- a/src/GitVersion.Core/Model/MergeMessage.cs
+++ b/src/GitVersion.Core/Model/MergeMessage.cs
@@ -4,94 +4,93 @@
 using System.Text.RegularExpressions;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class MergeMessage
 {
-    public class MergeMessage
+    private static readonly IList<MergeMessageFormat> DefaultFormats = new List<MergeMessageFormat>
     {
-        private static readonly IList<MergeMessageFormat> DefaultFormats = new List<MergeMessageFormat>
-        {
-            new MergeMessageFormat("Default", @"^Merge (branch|tag) '(?<SourceBranch>[^']*)'(?: into (?<TargetBranch>[^\s]*))*"),
-            new MergeMessageFormat("SmartGit",  @"^Finish (?<SourceBranch>[^\s]*)(?: into (?<TargetBranch>[^\s]*))*"),
-            new MergeMessageFormat("BitBucketPull", @"^Merge pull request #(?<PullRequestNumber>\d+) (from|in) (?<Source>.*) from (?<SourceBranch>[^\s]*) to (?<TargetBranch>[^\s]*)"),
-            new MergeMessageFormat("BitBucketPullv7", @"^Pull request #(?<PullRequestNumber>\d+).*\r?\n\r?\nMerge in (?<Source>.*) from (?<SourceBranch>[^\s]*) to (?<TargetBranch>[^\s]*)"),
-            new MergeMessageFormat("GitHubPull", @"^Merge pull request #(?<PullRequestNumber>\d+) (from|in) (?:(?<SourceBranch>[^\s]*))(?: into (?<TargetBranch>[^\s]*))*"),
-            new MergeMessageFormat("RemoteTracking", @"^Merge remote-tracking branch '(?<SourceBranch>[^\s]*)'(?: into (?<TargetBranch>[^\s]*))*")
-        };
-
-        public MergeMessage(string mergeMessage, Config? config)
-        {
-            if (mergeMessage == null)
-                throw new NullReferenceException();
+        new MergeMessageFormat("Default", @"^Merge (branch|tag) '(?<SourceBranch>[^']*)'(?: into (?<TargetBranch>[^\s]*))*"),
+        new MergeMessageFormat("SmartGit",  @"^Finish (?<SourceBranch>[^\s]*)(?: into (?<TargetBranch>[^\s]*))*"),
+        new MergeMessageFormat("BitBucketPull", @"^Merge pull request #(?<PullRequestNumber>\d+) (from|in) (?<Source>.*) from (?<SourceBranch>[^\s]*) to (?<TargetBranch>[^\s]*)"),
+        new MergeMessageFormat("BitBucketPullv7", @"^Pull request #(?<PullRequestNumber>\d+).*\r?\n\r?\nMerge in (?<Source>.*) from (?<SourceBranch>[^\s]*) to (?<TargetBranch>[^\s]*)"),
+        new MergeMessageFormat("GitHubPull", @"^Merge pull request #(?<PullRequestNumber>\d+) (from|in) (?:(?<SourceBranch>[^\s]*))(?: into (?<TargetBranch>[^\s]*))*"),
+        new MergeMessageFormat("RemoteTracking", @"^Merge remote-tracking branch '(?<SourceBranch>[^\s]*)'(?: into (?<TargetBranch>[^\s]*))*")
+    };
+
+    public MergeMessage(string mergeMessage, Config? config)
+    {
+        if (mergeMessage == null)
+            throw new NullReferenceException();
 
-            // Concat config formats with the defaults.
-            // Ensure configs are processed first.
-            var allFormats = config?.MergeMessageFormats
-                .Select(x => new MergeMessageFormat(x.Key, x.Value))
-                .Concat(DefaultFormats);
+        // Concat config formats with the defaults.
+        // Ensure configs are processed first.
+        var allFormats = config?.MergeMessageFormats
+            .Select(x => new MergeMessageFormat(x.Key, x.Value))
+            .Concat(DefaultFormats);
 
-            if (allFormats is null)
-                return;
+        if (allFormats is null)
+            return;
 
-            foreach (var format in allFormats)
+        foreach (var format in allFormats)
+        {
+            var match = format.Pattern.Match(mergeMessage);
+            if (match.Success)
             {
-                var match = format.Pattern.Match(mergeMessage);
-                if (match.Success)
-                {
-                    FormatName = format.Name;
-                    MergedBranch = match.Groups["SourceBranch"].Value;
+                FormatName = format.Name;
+                MergedBranch = match.Groups["SourceBranch"].Value;
 
-                    if (match.Groups["TargetBranch"].Success)
-                    {
-                        TargetBranch = match.Groups["TargetBranch"].Value;
-                    }
+                if (match.Groups["TargetBranch"].Success)
+                {
+                    TargetBranch = match.Groups["TargetBranch"].Value;
+                }
 
-                    if (int.TryParse(match.Groups["PullRequestNumber"].Value, out var pullNumber))
-                    {
-                        PullRequestNumber = pullNumber;
-                    }
+                if (int.TryParse(match.Groups["PullRequestNumber"].Value, out var pullNumber))
+                {
+                    PullRequestNumber = pullNumber;
+                }
 
-                    Version = ParseVersion(config!.TagPrefix!);
+                Version = ParseVersion(config!.TagPrefix!);
 
-                    break;
-                }
+                break;
             }
         }
+    }
 
-        public string? FormatName { get; }
-        public string? TargetBranch { get; }
-        public string MergedBranch { get; } = "";
-        public bool IsMergedPullRequest => PullRequestNumber != null;
-        public int? PullRequestNumber { get; }
-        public SemanticVersion? Version { get; }
+    public string? FormatName { get; }
+    public string? TargetBranch { get; }
+    public string MergedBranch { get; } = "";
+    public bool IsMergedPullRequest => PullRequestNumber != null;
+    public int? PullRequestNumber { get; }
+    public SemanticVersion? Version { get; }
 
-        private SemanticVersion? ParseVersion(string tagPrefix)
+    private SemanticVersion? ParseVersion(string tagPrefix)
+    {
+        // Remove remotes and branch prefixes like release/ feature/ hotfix/ etc
+        var toMatch = Regex.Replace(MergedBranch, @"^(\w+[-/])*", "", RegexOptions.IgnoreCase);
+        toMatch = Regex.Replace(toMatch, $"^{tagPrefix}", "");
+        // We don't match if the version is likely an ip (i.e starts with http://)
+        var versionMatch = new Regex(@"^(?<!://)\d+\.\d+(\.*\d+)*");
+        var version = versionMatch.Match(toMatch);
+
+        if (version.Success && SemanticVersion.TryParse(version.Value, tagPrefix, out var val))
         {
-            // Remove remotes and branch prefixes like release/ feature/ hotfix/ etc
-            var toMatch = Regex.Replace(MergedBranch, @"^(\w+[-/])*", "", RegexOptions.IgnoreCase);
-            toMatch = Regex.Replace(toMatch, $"^{tagPrefix}", "");
-            // We don't match if the version is likely an ip (i.e starts with http://)
-            var versionMatch = new Regex(@"^(?<!://)\d+\.\d+(\.*\d+)*");
-            var version = versionMatch.Match(toMatch);
-
-            if (version.Success && SemanticVersion.TryParse(version.Value, tagPrefix, out var val))
-            {
-                return val;
-            }
-
-            return null;
+            return val;
         }
 
-        private class MergeMessageFormat
+        return null;
+    }
+
+    private class MergeMessageFormat
+    {
+        public MergeMessageFormat(string name, string pattern)
         {
-            public MergeMessageFormat(string name, string pattern)
-            {
-                Name = name;
-                Pattern = new Regex(pattern, RegexOptions.IgnoreCase | RegexOptions.Compiled);
-            }
+            Name = name;
+            Pattern = new Regex(pattern, RegexOptions.IgnoreCase | RegexOptions.Compiled);
+        }
 
-            public string Name { get; }
+        public string Name { get; }
 
-            public Regex Pattern { get; }
-        }
+        public Regex Pattern { get; }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/OutputType.cs b/src/GitVersion.Core/Model/OutputType.cs
index 03497d7e48..7495df8a4e 100644
--- a/src/GitVersion.Core/Model/OutputType.cs
+++ b/src/GitVersion.Core/Model/OutputType.cs
@@ -1,9 +1,8 @@
-namespace GitVersion.Model
+namespace GitVersion.Model;
+
+public enum OutputType
 {
-    public enum OutputType
-    {
-        BuildServer,
-        Json,
-        File
-    }
-}
+    BuildServer,
+    Json,
+    File
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/RepositoryInfo.cs b/src/GitVersion.Core/Model/RepositoryInfo.cs
index 03e3b46c25..394d3df465 100644
--- a/src/GitVersion.Core/Model/RepositoryInfo.cs
+++ b/src/GitVersion.Core/Model/RepositoryInfo.cs
@@ -1,10 +1,9 @@
-namespace GitVersion
+namespace GitVersion;
+
+public class RepositoryInfo
 {
-    public class RepositoryInfo
-    {
-        public string? TargetUrl;
-        public string? TargetBranch;
-        public string? CommitId;
-        public string? DynamicRepositoryClonePath;
-    }
-}
+    public string? TargetUrl;
+    public string? TargetBranch;
+    public string? CommitId;
+    public string? DynamicRepositoryClonePath;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/Settings.cs b/src/GitVersion.Core/Model/Settings.cs
index 0fdc3b81e5..589a0385a5 100644
--- a/src/GitVersion.Core/Model/Settings.cs
+++ b/src/GitVersion.Core/Model/Settings.cs
@@ -1,10 +1,9 @@
-namespace GitVersion
+namespace GitVersion;
+
+public class Settings
 {
-    public class Settings
-    {
-        public bool NoFetch;
-        public bool NoCache;
-        public bool NoNormalize;
-        public bool OnlyTrackedBranches = false;
-    }
-}
+    public bool NoFetch;
+    public bool NoCache;
+    public bool NoNormalize;
+    public bool OnlyTrackedBranches = false;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/VersionVariables.cs b/src/GitVersion.Core/Model/VersionVariables.cs
index c6446e74fd..9d415d2989 100644
--- a/src/GitVersion.Core/Model/VersionVariables.cs
+++ b/src/GitVersion.Core/Model/VersionVariables.cs
@@ -10,220 +10,219 @@
 using YamlDotNet.Serialization;
 using static GitVersion.Extensions.ObjectExtensions;
 
-namespace GitVersion.OutputVariables
+namespace GitVersion.OutputVariables;
+
+public class VersionVariables : IEnumerable<KeyValuePair<string, string>>
 {
-    public class VersionVariables : IEnumerable<KeyValuePair<string, string>>
+    public VersionVariables(string major,
+        string minor,
+        string patch,
+        string? buildMetaData,
+        string? buildMetaDataPadded,
+        string? fullBuildMetaData,
+        string? branchName,
+        string? escapedBranchName,
+        string? sha,
+        string? shortSha,
+        string majorMinorPatch,
+        string semVer,
+        string legacySemVer,
+        string legacySemVerPadded,
+        string fullSemVer,
+        string? assemblySemVer,
+        string? assemblySemFileVer,
+        string? preReleaseTag,
+        string? preReleaseTagWithDash,
+        string? preReleaseLabel,
+        string? preReleaseLabelWithDash,
+        string? preReleaseNumber,
+        string weightedPreReleaseNumber,
+        string? informationalVersion,
+        string? commitDate,
+        string nugetVersion,
+        string nugetVersionV2,
+        string? nugetPreReleaseTag,
+        string? nugetPreReleaseTagV2,
+        string? versionSourceSha,
+        string? commitsSinceVersionSource,
+        string? commitsSinceVersionSourcePadded,
+        string? uncommittedChanges)
     {
-        public VersionVariables(string major,
-            string minor,
-            string patch,
-            string? buildMetaData,
-            string? buildMetaDataPadded,
-            string? fullBuildMetaData,
-            string? branchName,
-            string? escapedBranchName,
-            string? sha,
-            string? shortSha,
-            string majorMinorPatch,
-            string semVer,
-            string legacySemVer,
-            string legacySemVerPadded,
-            string fullSemVer,
-            string? assemblySemVer,
-            string? assemblySemFileVer,
-            string? preReleaseTag,
-            string? preReleaseTagWithDash,
-            string? preReleaseLabel,
-            string? preReleaseLabelWithDash,
-            string? preReleaseNumber,
-            string weightedPreReleaseNumber,
-            string? informationalVersion,
-            string? commitDate,
-            string nugetVersion,
-            string nugetVersionV2,
-            string? nugetPreReleaseTag,
-            string? nugetPreReleaseTagV2,
-            string? versionSourceSha,
-            string? commitsSinceVersionSource,
-            string? commitsSinceVersionSourcePadded,
-            string? uncommittedChanges)
-        {
-            Major = major;
-            Minor = minor;
-            Patch = patch;
-            BuildMetaData = buildMetaData;
-            BuildMetaDataPadded = buildMetaDataPadded;
-            FullBuildMetaData = fullBuildMetaData;
-            BranchName = branchName;
-            EscapedBranchName = escapedBranchName;
-            Sha = sha;
-            ShortSha = shortSha;
-            MajorMinorPatch = majorMinorPatch;
-            SemVer = semVer;
-            LegacySemVer = legacySemVer;
-            LegacySemVerPadded = legacySemVerPadded;
-            FullSemVer = fullSemVer;
-            AssemblySemVer = assemblySemVer;
-            AssemblySemFileVer = assemblySemFileVer;
-            PreReleaseTag = preReleaseTag;
-            PreReleaseTagWithDash = preReleaseTagWithDash;
-            PreReleaseLabel = preReleaseLabel;
-            PreReleaseLabelWithDash = preReleaseLabelWithDash;
-            PreReleaseNumber = preReleaseNumber;
-            WeightedPreReleaseNumber = weightedPreReleaseNumber;
-            InformationalVersion = informationalVersion;
-            CommitDate = commitDate;
-            NuGetVersion = nugetVersion;
-            NuGetVersionV2 = nugetVersionV2;
-            NuGetPreReleaseTag = nugetPreReleaseTag;
-            NuGetPreReleaseTagV2 = nugetPreReleaseTagV2;
-            VersionSourceSha = versionSourceSha;
-            CommitsSinceVersionSource = commitsSinceVersionSource;
-            CommitsSinceVersionSourcePadded = commitsSinceVersionSourcePadded;
-            UncommittedChanges = uncommittedChanges;
-        }
+        Major = major;
+        Minor = minor;
+        Patch = patch;
+        BuildMetaData = buildMetaData;
+        BuildMetaDataPadded = buildMetaDataPadded;
+        FullBuildMetaData = fullBuildMetaData;
+        BranchName = branchName;
+        EscapedBranchName = escapedBranchName;
+        Sha = sha;
+        ShortSha = shortSha;
+        MajorMinorPatch = majorMinorPatch;
+        SemVer = semVer;
+        LegacySemVer = legacySemVer;
+        LegacySemVerPadded = legacySemVerPadded;
+        FullSemVer = fullSemVer;
+        AssemblySemVer = assemblySemVer;
+        AssemblySemFileVer = assemblySemFileVer;
+        PreReleaseTag = preReleaseTag;
+        PreReleaseTagWithDash = preReleaseTagWithDash;
+        PreReleaseLabel = preReleaseLabel;
+        PreReleaseLabelWithDash = preReleaseLabelWithDash;
+        PreReleaseNumber = preReleaseNumber;
+        WeightedPreReleaseNumber = weightedPreReleaseNumber;
+        InformationalVersion = informationalVersion;
+        CommitDate = commitDate;
+        NuGetVersion = nugetVersion;
+        NuGetVersionV2 = nugetVersionV2;
+        NuGetPreReleaseTag = nugetPreReleaseTag;
+        NuGetPreReleaseTagV2 = nugetPreReleaseTagV2;
+        VersionSourceSha = versionSourceSha;
+        CommitsSinceVersionSource = commitsSinceVersionSource;
+        CommitsSinceVersionSourcePadded = commitsSinceVersionSourcePadded;
+        UncommittedChanges = uncommittedChanges;
+    }
 
-        public string Major { get; }
-        public string Minor { get; }
-        public string Patch { get; }
-        public string? PreReleaseTag { get; }
-        public string? PreReleaseTagWithDash { get; }
-        public string? PreReleaseLabel { get; }
-        public string? PreReleaseLabelWithDash { get; }
-        public string? PreReleaseNumber { get; }
-        public string WeightedPreReleaseNumber { get; }
-        public string? BuildMetaData { get; }
-        public string? BuildMetaDataPadded { get; }
-        public string? FullBuildMetaData { get; }
-        public string MajorMinorPatch { get; }
-        public string SemVer { get; }
-        public string LegacySemVer { get; }
-        public string LegacySemVerPadded { get; }
-        public string? AssemblySemVer { get; }
-        public string? AssemblySemFileVer { get; }
-        public string FullSemVer { get; }
-        public string? InformationalVersion { get; }
-        public string? BranchName { get; }
-        public string? EscapedBranchName { get; }
-        public string? Sha { get; }
-        public string? ShortSha { get; }
-        public string NuGetVersionV2 { get; }
-        public string NuGetVersion { get; }
-        public string? NuGetPreReleaseTagV2 { get; }
-        public string? NuGetPreReleaseTag { get; }
-        public string? VersionSourceSha { get; }
-        public string? CommitsSinceVersionSource { get; }
-        public string? CommitsSinceVersionSourcePadded { get; }
-        public string? UncommittedChanges { get; }
-        public string? CommitDate { get; set; }
-
-        [ReflectionIgnore]
-        public static IEnumerable<string> AvailableVariables => typeof(VersionVariables)
-                    .GetProperties()
-                    .Where(p => !p.GetCustomAttributes(typeof(ReflectionIgnoreAttribute), false).Any())
-                    .Select(p => p.Name)
-                    .OrderBy(a => a, StringComparer.Ordinal);
-
-        [ReflectionIgnore]
-        public string? FileName { get; set; }
-
-        [ReflectionIgnore]
-        public string? this[string variable] => typeof(VersionVariables).GetProperty(variable)?.GetValue(this, null) as string;
-
-        public IEnumerator<KeyValuePair<string, string>> GetEnumerator() => this.GetProperties().GetEnumerator();
-
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-
-        // FIX ME: Shall we return an instance with no ctorArgs or explicitly fail when properties is null?
-        public static VersionVariables FromDictionary(IEnumerable<KeyValuePair<string, string>>? properties)
-        {
-            var type = typeof(VersionVariables);
-            var constructors = type.GetConstructors();
-
-            var ctor = constructors.Single();
-            var ctorArgs = ctor.GetParameters()
-                .Select(p => properties.Single(v => string.Equals(v.Key, p.Name, StringComparison.InvariantCultureIgnoreCase)).Value)
-                .Cast<object>()
-                .ToArray();
-            return (VersionVariables)Activator.CreateInstance(type, ctorArgs);
-        }
+    public string Major { get; }
+    public string Minor { get; }
+    public string Patch { get; }
+    public string? PreReleaseTag { get; }
+    public string? PreReleaseTagWithDash { get; }
+    public string? PreReleaseLabel { get; }
+    public string? PreReleaseLabelWithDash { get; }
+    public string? PreReleaseNumber { get; }
+    public string WeightedPreReleaseNumber { get; }
+    public string? BuildMetaData { get; }
+    public string? BuildMetaDataPadded { get; }
+    public string? FullBuildMetaData { get; }
+    public string MajorMinorPatch { get; }
+    public string SemVer { get; }
+    public string LegacySemVer { get; }
+    public string LegacySemVerPadded { get; }
+    public string? AssemblySemVer { get; }
+    public string? AssemblySemFileVer { get; }
+    public string FullSemVer { get; }
+    public string? InformationalVersion { get; }
+    public string? BranchName { get; }
+    public string? EscapedBranchName { get; }
+    public string? Sha { get; }
+    public string? ShortSha { get; }
+    public string NuGetVersionV2 { get; }
+    public string NuGetVersion { get; }
+    public string? NuGetPreReleaseTagV2 { get; }
+    public string? NuGetPreReleaseTag { get; }
+    public string? VersionSourceSha { get; }
+    public string? CommitsSinceVersionSource { get; }
+    public string? CommitsSinceVersionSourcePadded { get; }
+    public string? UncommittedChanges { get; }
+    public string? CommitDate { get; set; }
+
+    [ReflectionIgnore]
+    public static IEnumerable<string> AvailableVariables => typeof(VersionVariables)
+        .GetProperties()
+        .Where(p => !p.GetCustomAttributes(typeof(ReflectionIgnoreAttribute), false).Any())
+        .Select(p => p.Name)
+        .OrderBy(a => a, StringComparer.Ordinal);
+
+    [ReflectionIgnore]
+    public string? FileName { get; set; }
+
+    [ReflectionIgnore]
+    public string? this[string variable] => typeof(VersionVariables).GetProperty(variable)?.GetValue(this, null) as string;
+
+    public IEnumerator<KeyValuePair<string, string>> GetEnumerator() => this.GetProperties().GetEnumerator();
+
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+    // FIX ME: Shall we return an instance with no ctorArgs or explicitly fail when properties is null?
+    public static VersionVariables FromDictionary(IEnumerable<KeyValuePair<string, string>>? properties)
+    {
+        var type = typeof(VersionVariables);
+        var constructors = type.GetConstructors();
+
+        var ctor = constructors.Single();
+        var ctorArgs = ctor.GetParameters()
+            .Select(p => properties.Single(v => string.Equals(v.Key, p.Name, StringComparison.InvariantCultureIgnoreCase)).Value)
+            .Cast<object>()
+            .ToArray();
+        return (VersionVariables)Activator.CreateInstance(type, ctorArgs);
+    }
 
-        public static VersionVariables FromJson(string json)
-        {
-            var serializeOptions = JsonSerializerOptions();
-            var variablePairs = JsonSerializer.Deserialize<Dictionary<string, string>>(json, serializeOptions);
-            return FromDictionary(variablePairs);
-        }
+    public static VersionVariables FromJson(string json)
+    {
+        var serializeOptions = JsonSerializerOptions();
+        var variablePairs = JsonSerializer.Deserialize<Dictionary<string, string>>(json, serializeOptions);
+        return FromDictionary(variablePairs);
+    }
 
-        public static VersionVariables FromFile(string filePath, IFileSystem fileSystem, ILog log)
+    public static VersionVariables FromFile(string filePath, IFileSystem fileSystem, ILog log)
+    {
+        try
         {
-            try
+            if (log == null)
             {
-                if (log == null)
-                {
-                    return FromFileInternal(filePath, fileSystem);
-                }
-                var retryAction = new RetryAction<IOException, VersionVariables>();
-                return retryAction.Execute(() => FromFileInternal(filePath, fileSystem));
+                return FromFileInternal(filePath, fileSystem);
             }
-            catch (AggregateException ex)
+            var retryAction = new RetryAction<IOException, VersionVariables>();
+            return retryAction.Execute(() => FromFileInternal(filePath, fileSystem));
+        }
+        catch (AggregateException ex)
+        {
+            var lastException = ex.InnerExceptions?.LastOrDefault() ?? ex.InnerException;
+            if (lastException != null)
             {
-                var lastException = ex.InnerExceptions?.LastOrDefault() ?? ex.InnerException;
-                if (lastException != null)
-                {
-                    throw lastException;
-                }
-                throw;
+                throw lastException;
             }
+            throw;
         }
-        private static VersionVariables FromFileInternal(string filePath, IFileSystem fileSystem)
+    }
+    private static VersionVariables FromFileInternal(string filePath, IFileSystem fileSystem)
+    {
+        using var stream = fileSystem.OpenRead(filePath);
+        using var reader = new StreamReader(stream);
+        var dictionary = new Deserializer().Deserialize<Dictionary<string, string>>(reader);
+        var versionVariables = FromDictionary(dictionary);
+        versionVariables.FileName = filePath;
+        return versionVariables;
+    }
+
+    public bool TryGetValue(string variable, out string? variableValue)
+    {
+        if (ContainsKey(variable))
         {
-            using var stream = fileSystem.OpenRead(filePath);
-            using var reader = new StreamReader(stream);
-            var dictionary = new Deserializer().Deserialize<Dictionary<string, string>>(reader);
-            var versionVariables = FromDictionary(dictionary);
-            versionVariables.FileName = filePath;
-            return versionVariables;
+            variableValue = this[variable];
+            return true;
         }
 
-        public bool TryGetValue(string variable, out string? variableValue)
-        {
-            if (ContainsKey(variable))
-            {
-                variableValue = this[variable];
-                return true;
-            }
+        variableValue = null;
+        return false;
+    }
 
-            variableValue = null;
-            return false;
-        }
+    private static bool ContainsKey(string variable) => typeof(VersionVariables).GetProperty(variable) != null;
 
-        private static bool ContainsKey(string variable) => typeof(VersionVariables).GetProperty(variable) != null;
+    public override string ToString()
+    {
+        var variablesType = typeof(VersionVariablesJsonModel);
+        var variables = new VersionVariablesJsonModel();
 
-        public override string ToString()
+        foreach (KeyValuePair<string, string> property in this.GetProperties())
         {
-            var variablesType = typeof(VersionVariablesJsonModel);
-            var variables = new VersionVariablesJsonModel();
-
-            foreach (KeyValuePair<string, string> property in this.GetProperties())
-            {
-                variablesType.GetProperty(property.Key).SetValue(variables, property.Value);
-            }
+            variablesType.GetProperty(property.Key).SetValue(variables, property.Value);
+        }
 
-            var serializeOptions = JsonSerializerOptions();
+        var serializeOptions = JsonSerializerOptions();
 
-            return JsonSerializer.Serialize(variables, serializeOptions);
-        }
+        return JsonSerializer.Serialize(variables, serializeOptions);
+    }
 
-        private static JsonSerializerOptions JsonSerializerOptions()
+    private static JsonSerializerOptions JsonSerializerOptions()
+    {
+        var serializeOptions = new JsonSerializerOptions
         {
-            var serializeOptions = new JsonSerializerOptions
-            {
-                WriteIndented = true,
-                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-                Converters = { new VersionVariablesJsonStringConverter() }
-            };
-            return serializeOptions;
-        }
+            WriteIndented = true,
+            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+            Converters = { new VersionVariablesJsonStringConverter() }
+        };
+        return serializeOptions;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/VersionVariablesJsonModel.cs b/src/GitVersion.Core/Model/VersionVariablesJsonModel.cs
index 2900359981..52555a6ec4 100644
--- a/src/GitVersion.Core/Model/VersionVariablesJsonModel.cs
+++ b/src/GitVersion.Core/Model/VersionVariablesJsonModel.cs
@@ -1,74 +1,73 @@
 using System.Text.Json.Serialization;
 
-namespace GitVersion.OutputVariables
+namespace GitVersion.OutputVariables;
+
+public class VersionVariablesJsonModel
 {
-    public class VersionVariablesJsonModel
-    {
-        [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
-        public string? Major { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
-        public string? Minor { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
-        public string? Patch { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? PreReleaseTag { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? PreReleaseTagWithDash { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? PreReleaseLabel { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? PreReleaseLabelWithDash { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
-        public string? PreReleaseNumber { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
-        public string? WeightedPreReleaseNumber { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
-        public string? BuildMetaData { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? BuildMetaDataPadded { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? FullBuildMetaData { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? MajorMinorPatch { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? SemVer { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? LegacySemVer { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? LegacySemVerPadded { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? AssemblySemVer { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? AssemblySemFileVer { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? FullSemVer { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? InformationalVersion { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? BranchName { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? EscapedBranchName { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? Sha { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? ShortSha { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? NuGetVersionV2 { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? NuGetVersion { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? NuGetPreReleaseTagV2 { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? NuGetPreReleaseTag { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? VersionSourceSha { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
-        public string? CommitsSinceVersionSource { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? CommitsSinceVersionSourcePadded { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
-        public string? UncommittedChanges { get; set; }
-        [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
-        public string? CommitDate { get; set; }
-    }
-}
+    [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
+    public string? Major { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
+    public string? Minor { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
+    public string? Patch { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? PreReleaseTag { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? PreReleaseTagWithDash { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? PreReleaseLabel { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? PreReleaseLabelWithDash { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
+    public string? PreReleaseNumber { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
+    public string? WeightedPreReleaseNumber { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
+    public string? BuildMetaData { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? BuildMetaDataPadded { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? FullBuildMetaData { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? MajorMinorPatch { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? SemVer { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? LegacySemVer { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? LegacySemVerPadded { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? AssemblySemVer { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? AssemblySemFileVer { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? FullSemVer { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? InformationalVersion { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? BranchName { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? EscapedBranchName { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? Sha { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? ShortSha { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? NuGetVersionV2 { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? NuGetVersion { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? NuGetPreReleaseTagV2 { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? NuGetPreReleaseTag { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? VersionSourceSha { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
+    public string? CommitsSinceVersionSource { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? CommitsSinceVersionSourcePadded { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonNumberConverter))]
+    public string? UncommittedChanges { get; set; }
+    [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
+    public string? CommitDate { get; set; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/VersionVariablesJsonNumberConverter.cs b/src/GitVersion.Core/Model/VersionVariablesJsonNumberConverter.cs
index 608e010c39..007b6c1989 100644
--- a/src/GitVersion.Core/Model/VersionVariablesJsonNumberConverter.cs
+++ b/src/GitVersion.Core/Model/VersionVariablesJsonNumberConverter.cs
@@ -6,52 +6,51 @@
 using GitVersion.Extensions;
 using JetBrains.Annotations;
 
-namespace GitVersion.OutputVariables
+namespace GitVersion.OutputVariables;
+
+public class VersionVariablesJsonNumberConverter : JsonConverter<string>
 {
-    public class VersionVariablesJsonNumberConverter : JsonConverter<string>
+    public override bool CanConvert(Type typeToConvert)
+        => typeToConvert == typeof(string);
+
+    public override string Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        public override bool CanConvert(Type typeToConvert)
-            => typeToConvert == typeof(string);
+        if (reader.TokenType != JsonTokenType.Number && typeToConvert == typeof(string))
+            return reader.GetString() ?? "";
 
-        public override string Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            if (reader.TokenType != JsonTokenType.Number && typeToConvert == typeof(string))
-                return reader.GetString() ?? "";
+        var span = reader.HasValueSequence ? reader.ValueSequence.ToArray() : reader.ValueSpan;
+        if (Utf8Parser.TryParse(span, out long number, out var bytesConsumed) && span.Length == bytesConsumed)
+            return number.ToString();
 
-            var span = reader.HasValueSequence ? reader.ValueSequence.ToArray() : reader.ValueSpan;
-            if (Utf8Parser.TryParse(span, out long number, out var bytesConsumed) && span.Length == bytesConsumed)
-                return number.ToString();
+        var data = reader.GetString();
 
-            var data = reader.GetString();
+        throw new InvalidOperationException($"'{data}' is not a correct expected value!")
+        {
+            Source = nameof(VersionVariablesJsonNumberConverter)
+        };
+    }
 
-            throw new InvalidOperationException($"'{data}' is not a correct expected value!")
-            {
-                Source = nameof(VersionVariablesJsonNumberConverter)
-            };
+    public override void Write(Utf8JsonWriter writer, [CanBeNull] string value, JsonSerializerOptions options)
+    {
+        if (value.IsNullOrWhiteSpace())
+        {
+            writer.WriteNullValue();
         }
-
-        public override void Write(Utf8JsonWriter writer, [CanBeNull] string value, JsonSerializerOptions options)
+        else if (int.TryParse(value, out var number))
         {
-            if (value.IsNullOrWhiteSpace())
-            {
-                writer.WriteNullValue();
-            }
-            else if (int.TryParse(value, out var number))
-            {
-                writer.WriteNumberValue(number);
-            }
-            else
+            writer.WriteNumberValue(number);
+        }
+        else
+        {
+            throw new InvalidOperationException($"'{value}' is not a correct expected value!")
             {
-                throw new InvalidOperationException($"'{value}' is not a correct expected value!")
-                {
-                    Source = nameof(VersionVariablesJsonStringConverter)
-                };
-            }
-
+                Source = nameof(VersionVariablesJsonStringConverter)
+            };
         }
 
-        public override bool HandleNull => true;
-
-        private static bool NotAPaddedNumber(string value) => value != null && (value == "0" || !value.StartsWith("0"));
     }
-}
+
+    public override bool HandleNull => true;
+
+    private static bool NotAPaddedNumber(string value) => value != null && (value == "0" || !value.StartsWith("0"));
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/VersionVariablesJsonStringConverter.cs b/src/GitVersion.Core/Model/VersionVariablesJsonStringConverter.cs
index 98a7325424..ecd2be830d 100644
--- a/src/GitVersion.Core/Model/VersionVariablesJsonStringConverter.cs
+++ b/src/GitVersion.Core/Model/VersionVariablesJsonStringConverter.cs
@@ -5,36 +5,35 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace GitVersion.OutputVariables
-{
-    public class VersionVariablesJsonStringConverter : JsonConverter<string>
-    {
-        public override bool CanConvert(Type typeToConvert)
-            => typeToConvert == typeof(string);
+namespace GitVersion.OutputVariables;
 
-        public override string Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            if (reader.TokenType != JsonTokenType.Number && typeToConvert == typeof(string))
-                return reader.GetString() ?? "";
+public class VersionVariablesJsonStringConverter : JsonConverter<string>
+{
+    public override bool CanConvert(Type typeToConvert)
+        => typeToConvert == typeof(string);
 
-            var span = reader.HasValueSequence ? reader.ValueSequence.ToArray() : reader.ValueSpan;
-            if (Utf8Parser.TryParse(span, out long number, out var bytesConsumed) && span.Length == bytesConsumed)
-                return number.ToString();
+    public override string Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType != JsonTokenType.Number && typeToConvert == typeof(string))
+            return reader.GetString() ?? "";
 
-            var data = reader.GetString();
+        var span = reader.HasValueSequence ? reader.ValueSequence.ToArray() : reader.ValueSpan;
+        if (Utf8Parser.TryParse(span, out long number, out var bytesConsumed) && span.Length == bytesConsumed)
+            return number.ToString();
 
-            throw new InvalidOperationException($"'{data}' is not a correct expected value!")
-            {
-                Source = nameof(VersionVariablesJsonStringConverter)
-            };
-        }
+        var data = reader.GetString();
 
-        public override void Write(Utf8JsonWriter writer, [CanBeNull] string value, JsonSerializerOptions options)
+        throw new InvalidOperationException($"'{data}' is not a correct expected value!")
         {
-            value ??= string.Empty;
-            writer.WriteStringValue(value);
-        }
+            Source = nameof(VersionVariablesJsonStringConverter)
+        };
+    }
 
-        public override bool HandleNull => true;
+    public override void Write(Utf8JsonWriter writer, [CanBeNull] string value, JsonSerializerOptions options)
+    {
+        value ??= string.Empty;
+        writer.WriteStringValue(value);
     }
-}
+
+    public override bool HandleNull => true;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/Model/WixInfo.cs b/src/GitVersion.Core/Model/WixInfo.cs
index 3fdb626b79..db5644a61e 100644
--- a/src/GitVersion.Core/Model/WixInfo.cs
+++ b/src/GitVersion.Core/Model/WixInfo.cs
@@ -1,7 +1,6 @@
-namespace GitVersion
+namespace GitVersion;
+
+public class WixInfo
 {
-    public class WixInfo
-    {
-        public bool ShouldUpdate;
-    }
-}
+    public bool ShouldUpdate;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/Abstractions/IBaseVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/Abstractions/IBaseVersionCalculator.cs
index 271607929d..cda753878d 100644
--- a/src/GitVersion.Core/VersionCalculation/Abstractions/IBaseVersionCalculator.cs
+++ b/src/GitVersion.Core/VersionCalculation/Abstractions/IBaseVersionCalculator.cs
@@ -1,7 +1,6 @@
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public interface IBaseVersionCalculator
 {
-    public interface IBaseVersionCalculator
-    {
-        BaseVersion GetBaseVersion();
-    }
-}
+    BaseVersion GetBaseVersion();
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/Abstractions/IIncrementStrategyFinder.cs b/src/GitVersion.Core/VersionCalculation/Abstractions/IIncrementStrategyFinder.cs
index 08569794e1..6dc99b2149 100644
--- a/src/GitVersion.Core/VersionCalculation/Abstractions/IIncrementStrategyFinder.cs
+++ b/src/GitVersion.Core/VersionCalculation/Abstractions/IIncrementStrategyFinder.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public interface IIncrementStrategyFinder
 {
-    public interface IIncrementStrategyFinder
-    {
-        VersionField? DetermineIncrementedField(IGitRepository repository, GitVersionContext context, BaseVersion baseVersion);
-        VersionField? GetIncrementForCommits(GitVersionContext context, IEnumerable<ICommit> commits);
-    }
-}
+    VersionField? DetermineIncrementedField(IGitRepository repository, GitVersionContext context, BaseVersion baseVersion);
+    VersionField? GetIncrementForCommits(GitVersionContext context, IEnumerable<ICommit> commits);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/Abstractions/IMainlineVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/Abstractions/IMainlineVersionCalculator.cs
index ec2486f2ac..ad72051d2b 100644
--- a/src/GitVersion.Core/VersionCalculation/Abstractions/IMainlineVersionCalculator.cs
+++ b/src/GitVersion.Core/VersionCalculation/Abstractions/IMainlineVersionCalculator.cs
@@ -1,8 +1,7 @@
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public interface IMainlineVersionCalculator
 {
-    public interface IMainlineVersionCalculator
-    {
-        SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion);
-        SemanticVersionBuildMetaData CreateVersionBuildMetaData(ICommit? baseVersionSource);
-    }
-}
+    SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion);
+    SemanticVersionBuildMetaData CreateVersionBuildMetaData(ICommit? baseVersionSource);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/Abstractions/INextVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/Abstractions/INextVersionCalculator.cs
index 93c9d1c7d0..ec2d52aa76 100644
--- a/src/GitVersion.Core/VersionCalculation/Abstractions/INextVersionCalculator.cs
+++ b/src/GitVersion.Core/VersionCalculation/Abstractions/INextVersionCalculator.cs
@@ -1,7 +1,6 @@
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public interface INextVersionCalculator
 {
-    public interface INextVersionCalculator
-    {
-        SemanticVersion FindVersion();
-    }
-}
+    SemanticVersion FindVersion();
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/Abstractions/IVariableProvider.cs b/src/GitVersion.Core/VersionCalculation/Abstractions/IVariableProvider.cs
index 7e8984d354..4ab4c8305c 100644
--- a/src/GitVersion.Core/VersionCalculation/Abstractions/IVariableProvider.cs
+++ b/src/GitVersion.Core/VersionCalculation/Abstractions/IVariableProvider.cs
@@ -1,10 +1,9 @@
 using GitVersion.Model.Configuration;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public interface IVariableProvider
 {
-    public interface IVariableProvider
-    {
-        VersionVariables GetVariablesFor(SemanticVersion semanticVersion, EffectiveConfiguration config, bool isCurrentCommitTagged);
-    }
-}
+    VersionVariables GetVariablesFor(SemanticVersion semanticVersion, EffectiveConfiguration config, bool isCurrentCommitTagged);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionFilter.cs b/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionFilter.cs
index 608d987d89..8bda86bd0d 100644
--- a/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionFilter.cs
+++ b/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionFilter.cs
@@ -1,9 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public interface IVersionFilter
 {
-    public interface IVersionFilter
-    {
-        bool Exclude(BaseVersion version, [NotNullWhen(true)] out string? reason);
-    }
-}
+    bool Exclude(BaseVersion version, [NotNullWhen(true)] out string? reason);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionStrategy.cs
index d65b492ca4..b91a87c086 100644
--- a/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionStrategy.cs
@@ -1,15 +1,14 @@
 using System.Collections.Generic;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public interface IVersionStrategy
 {
-    public interface IVersionStrategy
-    {
-        /// <summary>
-        /// Calculates the <see cref="T:GitVersion.VersionCalculation.BaseVersionCalculators.BaseVersion" /> values.
-        /// </summary>
-        /// <returns>
-        /// An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of the base version values found by the strategy.
-        /// </returns>
-        IEnumerable<BaseVersion> GetVersions();
-    }
-}
+    /// <summary>
+    /// Calculates the <see cref="T:GitVersion.VersionCalculation.BaseVersionCalculators.BaseVersion" /> values.
+    /// </summary>
+    /// <returns>
+    /// An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of the base version values found by the strategy.
+    /// </returns>
+    IEnumerable<BaseVersion> GetVersions();
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculator.cs
index 8f4243c77a..1b1ff98cbe 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculator.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculator.cs
@@ -5,149 +5,148 @@
 using GitVersion.Configuration;
 using GitVersion.Logging;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public class BaseVersionCalculator : IBaseVersionCalculator
 {
-    public class BaseVersionCalculator : IBaseVersionCalculator
-    {
-        private readonly ILog log;
-        private readonly IRepositoryStore repositoryStore;
-        private readonly IVersionStrategy[] strategies;
-        private readonly Lazy<GitVersionContext> versionContext;
-        private GitVersionContext context => this.versionContext.Value;
+    private readonly ILog log;
+    private readonly IRepositoryStore repositoryStore;
+    private readonly IVersionStrategy[] strategies;
+    private readonly Lazy<GitVersionContext> versionContext;
+    private GitVersionContext context => this.versionContext.Value;
 
-        public BaseVersionCalculator(ILog log, IRepositoryStore repositoryStore, Lazy<GitVersionContext> versionContext, IEnumerable<IVersionStrategy> strategies)
-        {
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
-            this.strategies = strategies?.ToArray() ?? Array.Empty<IVersionStrategy>();
-            this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
-        }
+    public BaseVersionCalculator(ILog log, IRepositoryStore repositoryStore, Lazy<GitVersionContext> versionContext, IEnumerable<IVersionStrategy> strategies)
+    {
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
+        this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
+        this.strategies = strategies?.ToArray() ?? Array.Empty<IVersionStrategy>();
+        this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
+    }
 
-        public BaseVersion GetBaseVersion()
+    public BaseVersion GetBaseVersion()
+    {
+        using (this.log.IndentLog("Calculating base versions"))
         {
-            using (this.log.IndentLog("Calculating base versions"))
+            var allVersions = new List<BaseVersion>();
+            foreach (var strategy in this.strategies)
             {
-                var allVersions = new List<BaseVersion>();
-                foreach (var strategy in this.strategies)
+                var baseVersions = GetBaseVersions(strategy).ToList();
+                allVersions.AddRange(baseVersions);
+            }
+
+            var versions = allVersions
+                .Select(baseVersion => new Versions
                 {
-                    var baseVersions = GetBaseVersions(strategy).ToList();
-                    allVersions.AddRange(baseVersions);
-                }
-
-                var versions = allVersions
-                    .Select(baseVersion => new Versions
-                    {
-                        IncrementedVersion = this.repositoryStore.MaybeIncrement(baseVersion, context),
-                        Version = baseVersion
-                    })
-                    .ToList();
+                    IncrementedVersion = this.repositoryStore.MaybeIncrement(baseVersion, context),
+                    Version = baseVersion
+                })
+                .ToList();
 
-                FixTheBaseVersionSourceOfMergeMessageStrategyIfReleaseBranchWasMergedAndDeleted(versions);
+            FixTheBaseVersionSourceOfMergeMessageStrategyIfReleaseBranchWasMergedAndDeleted(versions);
 
-                if (context.Configuration?.VersioningMode == VersioningMode.Mainline)
-                {
-                    versions = versions
-                        .Where(b => b.IncrementedVersion?.PreReleaseTag?.HasTag() != true)
-                        .ToList();
-                }
-
-                var maxVersion = versions.Aggregate((v1, v2) => v1.IncrementedVersion! > v2.IncrementedVersion! ? v1 : v2);
-                var matchingVersionsOnceIncremented = versions
-                    .Where(b => b.Version?.BaseVersionSource != null && b.IncrementedVersion == maxVersion.IncrementedVersion)
+            if (context.Configuration?.VersioningMode == VersioningMode.Mainline)
+            {
+                versions = versions
+                    .Where(b => b.IncrementedVersion?.PreReleaseTag?.HasTag() != true)
                     .ToList();
-                BaseVersion baseVersionWithOldestSource;
-                if (matchingVersionsOnceIncremented.Any())
-                {
-                    var oldest = matchingVersionsOnceIncremented.Aggregate((v1, v2) =>
-                        v1.Version!.BaseVersionSource!.When < v2.Version!.BaseVersionSource!.When ? v1 : v2);
-                    baseVersionWithOldestSource = oldest!.Version!;
-                    maxVersion = oldest;
-                    this.log.Info($"Found multiple base versions which will produce the same SemVer ({maxVersion.IncrementedVersion}), taking oldest source for commit counting ({baseVersionWithOldestSource!.Source})");
-                }
-                else
-                {
-                    baseVersionWithOldestSource = versions
-                        .Where(v => v.Version?.BaseVersionSource != null)
-                        .OrderByDescending(v => v.IncrementedVersion)
-                        .ThenByDescending(v => v.Version!.BaseVersionSource!.When)
-                        .First()
-                        .Version!;
-                }
+            }
 
-                if (baseVersionWithOldestSource.BaseVersionSource == null)
-                    throw new Exception("Base version should not be null");
+            var maxVersion = versions.Aggregate((v1, v2) => v1.IncrementedVersion! > v2.IncrementedVersion! ? v1 : v2);
+            var matchingVersionsOnceIncremented = versions
+                .Where(b => b.Version?.BaseVersionSource != null && b.IncrementedVersion == maxVersion.IncrementedVersion)
+                .ToList();
+            BaseVersion baseVersionWithOldestSource;
+            if (matchingVersionsOnceIncremented.Any())
+            {
+                var oldest = matchingVersionsOnceIncremented.Aggregate((v1, v2) =>
+                    v1.Version!.BaseVersionSource!.When < v2.Version!.BaseVersionSource!.When ? v1 : v2);
+                baseVersionWithOldestSource = oldest!.Version!;
+                maxVersion = oldest;
+                this.log.Info($"Found multiple base versions which will produce the same SemVer ({maxVersion.IncrementedVersion}), taking oldest source for commit counting ({baseVersionWithOldestSource!.Source})");
+            }
+            else
+            {
+                baseVersionWithOldestSource = versions
+                    .Where(v => v.Version?.BaseVersionSource != null)
+                    .OrderByDescending(v => v.IncrementedVersion)
+                    .ThenByDescending(v => v.Version!.BaseVersionSource!.When)
+                    .First()
+                    .Version!;
+            }
 
-                var calculatedBase = new BaseVersion(
-                    maxVersion.Version!.Source, maxVersion.Version.ShouldIncrement, maxVersion.Version.SemanticVersion,
-                    baseVersionWithOldestSource.BaseVersionSource, maxVersion.Version.BranchNameOverride);
+            if (baseVersionWithOldestSource.BaseVersionSource == null)
+                throw new Exception("Base version should not be null");
 
-                this.log.Info($"Base version used: {calculatedBase}");
+            var calculatedBase = new BaseVersion(
+                maxVersion.Version!.Source, maxVersion.Version.ShouldIncrement, maxVersion.Version.SemanticVersion,
+                baseVersionWithOldestSource.BaseVersionSource, maxVersion.Version.BranchNameOverride);
 
-                return calculatedBase;
-            }
-        }
-        private IEnumerable<BaseVersion> GetBaseVersions(IVersionStrategy strategy)
-        {
-            foreach (var version in strategy.GetVersions())
-            {
-                if (version == null) continue;
+            this.log.Info($"Base version used: {calculatedBase}");
 
-                this.log.Info(version.ToString());
-                if (strategy is FallbackVersionStrategy || IncludeVersion(version))
-                {
-                    yield return version;
-                }
-            }
+            return calculatedBase;
         }
-        private bool IncludeVersion(BaseVersion version)
+    }
+    private IEnumerable<BaseVersion> GetBaseVersions(IVersionStrategy strategy)
+    {
+        foreach (var version in strategy.GetVersions())
         {
-            if (context.Configuration == null)
-                return false;
+            if (version == null) continue;
 
-            foreach (var filter in context.Configuration.VersionFilters)
+            this.log.Info(version.ToString());
+            if (strategy is FallbackVersionStrategy || IncludeVersion(version))
             {
-                if (filter.Exclude(version, out var reason))
-                {
-                    this.log.Info(reason);
-                    return false;
-                }
+                yield return version;
             }
-            return true;
         }
+    }
+    private bool IncludeVersion(BaseVersion version)
+    {
+        if (context.Configuration == null)
+            return false;
 
-        private void FixTheBaseVersionSourceOfMergeMessageStrategyIfReleaseBranchWasMergedAndDeleted(IEnumerable<Versions> baseVersions)
+        foreach (var filter in context.Configuration.VersionFilters)
         {
-            if (ReleaseBranchExistsInRepo()) return;
-            foreach (var baseVersion in baseVersions)
+            if (filter.Exclude(version, out var reason))
             {
-                if (baseVersion.Version?.Source.Contains(MergeMessageVersionStrategy.MergeMessageStrategyPrefix) == true
-                    && baseVersion.Version.Source.Contains("Merge branch")
-                    && baseVersion.Version.Source.Contains("release"))
-                {
-                    var parents = baseVersion.Version.BaseVersionSource!.Parents.ToList();
-                    baseVersion.Version = new BaseVersion(
-                        baseVersion.Version.Source,
-                        baseVersion.Version.ShouldIncrement,
-                        baseVersion.Version.SemanticVersion,
-                        this.repositoryStore.FindMergeBase(parents[0], parents[1]),
-                        baseVersion.Version.BranchNameOverride);
-                }
+                this.log.Info(reason);
+                return false;
             }
         }
+        return true;
+    }
 
-        private bool ReleaseBranchExistsInRepo()
+    private void FixTheBaseVersionSourceOfMergeMessageStrategyIfReleaseBranchWasMergedAndDeleted(IEnumerable<Versions> baseVersions)
+    {
+        if (ReleaseBranchExistsInRepo()) return;
+        foreach (var baseVersion in baseVersions)
         {
-            var releaseBranchConfig = context.FullConfiguration?.GetReleaseBranchConfig();
-            var releaseBranches = this.repositoryStore.GetReleaseBranches(releaseBranchConfig);
-            return releaseBranches.Any();
+            if (baseVersion.Version?.Source.Contains(MergeMessageVersionStrategy.MergeMessageStrategyPrefix) == true
+                && baseVersion.Version.Source.Contains("Merge branch")
+                && baseVersion.Version.Source.Contains("release"))
+            {
+                var parents = baseVersion.Version.BaseVersionSource!.Parents.ToList();
+                baseVersion.Version = new BaseVersion(
+                    baseVersion.Version.Source,
+                    baseVersion.Version.ShouldIncrement,
+                    baseVersion.Version.SemanticVersion,
+                    this.repositoryStore.FindMergeBase(parents[0], parents[1]),
+                    baseVersion.Version.BranchNameOverride);
+            }
         }
+    }
 
-        private class Versions
-        {
-            public SemanticVersion? IncrementedVersion { get; set; }
-            public BaseVersion? Version { get; set; }
+    private bool ReleaseBranchExistsInRepo()
+    {
+        var releaseBranchConfig = context.FullConfiguration?.GetReleaseBranchConfig();
+        var releaseBranches = this.repositoryStore.GetReleaseBranches(releaseBranchConfig);
+        return releaseBranches.Any();
+    }
 
-            public override string ToString() => $"{Version} | {IncrementedVersion}";
-        }
+    private class Versions
+    {
+        public SemanticVersion? IncrementedVersion { get; set; }
+        public BaseVersion? Version { get; set; }
+
+        public override string ToString() => $"{Version} | {IncrementedVersion}";
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/BaseVersion.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/BaseVersion.cs
index 651a8b2457..165459e96c 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/BaseVersion.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/BaseVersion.cs
@@ -1,30 +1,29 @@
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public class BaseVersion
 {
-    public class BaseVersion
+    public BaseVersion(string source, bool shouldIncrement, SemanticVersion semanticVersion, ICommit? baseVersionSource, string? branchNameOverride)
     {
-        public BaseVersion(string source, bool shouldIncrement, SemanticVersion semanticVersion, ICommit? baseVersionSource, string? branchNameOverride)
-        {
-            Source = source;
-            ShouldIncrement = shouldIncrement;
-            SemanticVersion = semanticVersion;
-            BaseVersionSource = baseVersionSource;
-            BranchNameOverride = branchNameOverride;
-        }
+        Source = source;
+        ShouldIncrement = shouldIncrement;
+        SemanticVersion = semanticVersion;
+        BaseVersionSource = baseVersionSource;
+        BranchNameOverride = branchNameOverride;
+    }
 
-        public string Source { get; }
+    public string Source { get; }
 
-        public bool ShouldIncrement { get; }
+    public bool ShouldIncrement { get; }
 
-        public SemanticVersion SemanticVersion { get; }
+    public SemanticVersion SemanticVersion { get; }
 
-        public ICommit? BaseVersionSource { get; }
+    public ICommit? BaseVersionSource { get; }
 
-        public string? BranchNameOverride { get; }
+    public string? BranchNameOverride { get; }
 
-        public override string ToString()
-        {
-            var externalSource = BaseVersionSource == null ? "External Source" : BaseVersionSource.Sha;
-            return $"{Source}: {SemanticVersion.ToString("f")} with commit count source {externalSource}";
-        }
+    public override string ToString()
+    {
+        var externalSource = BaseVersionSource == null ? "External Source" : BaseVersionSource.Sha;
+        return $"{Source}: {SemanticVersion.ToString("f")} with commit count source {externalSource}";
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/ConfigNextVersionVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/ConfigNextVersionVersionStrategy.cs
index 3b29998c61..2c4491806e 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/ConfigNextVersionVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/ConfigNextVersionVersionStrategy.cs
@@ -2,26 +2,25 @@
 using System.Collections.Generic;
 using GitVersion.Extensions;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+/// <summary>
+/// Version is from NextVersion (the configuration value), unless the current commit is tagged.
+/// BaseVersionSource is null.
+/// Does not increment.
+/// </summary>
+public class ConfigNextVersionVersionStrategy : VersionStrategyBase
 {
-    /// <summary>
-    /// Version is from NextVersion (the configuration value), unless the current commit is tagged.
-    /// BaseVersionSource is null.
-    /// Does not increment.
-    /// </summary>
-    public class ConfigNextVersionVersionStrategy : VersionStrategyBase
+    public ConfigNextVersionVersionStrategy(Lazy<GitVersionContext> versionContext) : base(versionContext)
     {
-        public ConfigNextVersionVersionStrategy(Lazy<GitVersionContext> versionContext) : base(versionContext)
-        {
-        }
+    }
 
-        public override IEnumerable<BaseVersion> GetVersions()
-        {
-            var nextVersion = Context.Configuration?.NextVersion;
-            if (nextVersion.IsNullOrEmpty() || Context.IsCurrentCommitTagged)
-                yield break;
-            var semanticVersion = SemanticVersion.Parse(nextVersion, Context.Configuration?.GitTagPrefix);
-            yield return new BaseVersion("NextVersion in GitVersion configuration file", false, semanticVersion, null, null);
-        }
+    public override IEnumerable<BaseVersion> GetVersions()
+    {
+        var nextVersion = Context.Configuration?.NextVersion;
+        if (nextVersion.IsNullOrEmpty() || Context.IsCurrentCommitTagged)
+            yield break;
+        var semanticVersion = SemanticVersion.Parse(nextVersion, Context.Configuration?.GitTagPrefix);
+        yield return new BaseVersion("NextVersion in GitVersion configuration file", false, semanticVersion, null, null);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/FallbackVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/FallbackVersionStrategy.cs
index b425240a16..c214879451 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/FallbackVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/FallbackVersionStrategy.cs
@@ -2,29 +2,28 @@
 using System.Collections.Generic;
 using GitVersion.Common;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+/// <summary>
+/// Version is 0.1.0.
+/// BaseVersionSource is the "root" commit reachable from the current commit.
+/// Does not increment.
+/// </summary>
+public class FallbackVersionStrategy : VersionStrategyBase
 {
-    /// <summary>
-    /// Version is 0.1.0.
-    /// BaseVersionSource is the "root" commit reachable from the current commit.
-    /// Does not increment.
-    /// </summary>
-    public class FallbackVersionStrategy : VersionStrategyBase
-    {
-        private readonly IRepositoryStore repositoryStore;
+    private readonly IRepositoryStore repositoryStore;
 
-        public FallbackVersionStrategy(IRepositoryStore repositoryStore, Lazy<GitVersionContext> versionContext) : base(versionContext) => this.repositoryStore = repositoryStore;
-        public override IEnumerable<BaseVersion> GetVersions()
+    public FallbackVersionStrategy(IRepositoryStore repositoryStore, Lazy<GitVersionContext> versionContext) : base(versionContext) => this.repositoryStore = repositoryStore;
+    public override IEnumerable<BaseVersion> GetVersions()
+    {
+        var currentBranchTip = Context.CurrentBranch?.Tip;
+        if (currentBranchTip == null)
         {
-            var currentBranchTip = Context.CurrentBranch?.Tip;
-            if (currentBranchTip == null)
-            {
-                throw new GitVersionException("No commits found on the current branch.");
-            }
+            throw new GitVersionException("No commits found on the current branch.");
+        }
 
-            var baseVersionSource = this.repositoryStore.GetBaseVersionSource(currentBranchTip);
+        var baseVersionSource = this.repositoryStore.GetBaseVersionSource(currentBranchTip);
 
-            yield return new BaseVersion("Fallback base version", false, new SemanticVersion(minor: 1), baseVersionSource, null);
-        }
+        yield return new BaseVersion("Fallback base version", false, new SemanticVersion(minor: 1), baseVersionSource, null);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs
index 05e4453cbf..8177dbd8aa 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs
@@ -7,65 +7,64 @@
 using GitVersion.Extensions;
 using GitVersion.Logging;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+/// <summary>
+/// Version is extracted from older commits's merge messages.
+/// BaseVersionSource is the commit where the message was found.
+/// Increments if PreventIncrementForMergedBranchVersion (from the branch config) is false.
+/// </summary>
+public class MergeMessageVersionStrategy : VersionStrategyBase
 {
-    /// <summary>
-    /// Version is extracted from older commits's merge messages.
-    /// BaseVersionSource is the commit where the message was found.
-    /// Increments if PreventIncrementForMergedBranchVersion (from the branch config) is false.
-    /// </summary>
-    public class MergeMessageVersionStrategy : VersionStrategyBase
-    {
-        private readonly ILog log;
+    private readonly ILog log;
 
-        public MergeMessageVersionStrategy(ILog log, Lazy<GitVersionContext> versionContext) : base(versionContext) => this.log = log ?? throw new ArgumentNullException(nameof(log));
+    public MergeMessageVersionStrategy(ILog log, Lazy<GitVersionContext> versionContext) : base(versionContext) => this.log = log ?? throw new ArgumentNullException(nameof(log));
 
-        public override IEnumerable<BaseVersion> GetVersions()
-        {
-            // FIX ME: What to do when CurrentCommit is null?
-            var commitsPriorToThan = Context.CurrentBranch!.Commits!.GetCommitsPriorTo(Context.CurrentCommit!.When);
-            var baseVersions = commitsPriorToThan
-                .SelectMany(c =>
+    public override IEnumerable<BaseVersion> GetVersions()
+    {
+        // FIX ME: What to do when CurrentCommit is null?
+        var commitsPriorToThan = Context.CurrentBranch!.Commits!.GetCommitsPriorTo(Context.CurrentCommit!.When);
+        var baseVersions = commitsPriorToThan
+            .SelectMany(c =>
+            {
+                if (TryParse(c, Context, out var mergeMessage) &&
+                    mergeMessage.Version != null &&
+                    Context.FullConfiguration?.IsReleaseBranch(TrimRemote(mergeMessage.MergedBranch)) == true)
                 {
-                    if (TryParse(c, Context, out var mergeMessage) &&
-                        mergeMessage.Version != null &&
-                        Context.FullConfiguration?.IsReleaseBranch(TrimRemote(mergeMessage.MergedBranch)) == true)
+                    this.log.Info($"Found commit [{Context.CurrentCommit}] matching merge message format: {mergeMessage.FormatName}");
+                    var shouldIncrement = Context.Configuration?.PreventIncrementForMergedBranchVersion != true;
+                    return new[]
                     {
-                        this.log.Info($"Found commit [{Context.CurrentCommit}] matching merge message format: {mergeMessage.FormatName}");
-                        var shouldIncrement = Context.Configuration?.PreventIncrementForMergedBranchVersion != true;
-                        return new[]
-                        {
-                            new BaseVersion($"{MergeMessageStrategyPrefix} '{c.Message.Trim()}'", shouldIncrement, mergeMessage.Version, c, null)
-                        };
-                    }
-                    return Enumerable.Empty<BaseVersion>();
-                })
-                .Take(5)
-                .ToList();
-            return baseVersions;
-        }
+                        new BaseVersion($"{MergeMessageStrategyPrefix} '{c.Message.Trim()}'", shouldIncrement, mergeMessage.Version, c, null)
+                    };
+                }
+                return Enumerable.Empty<BaseVersion>();
+            })
+            .Take(5)
+            .ToList();
+        return baseVersions;
+    }
 
-        public static readonly string MergeMessageStrategyPrefix = "Merge message";
+    public static readonly string MergeMessageStrategyPrefix = "Merge message";
 
-        private static bool TryParse(ICommit mergeCommit, GitVersionContext context, [NotNullWhen(true)] out MergeMessage? mergeMessage)
-        {
-            mergeMessage = Inner(mergeCommit, context);
-            return mergeMessage != null;
-        }
+    private static bool TryParse(ICommit mergeCommit, GitVersionContext context, [NotNullWhen(true)] out MergeMessage? mergeMessage)
+    {
+        mergeMessage = Inner(mergeCommit, context);
+        return mergeMessage != null;
+    }
 
-        private static MergeMessage? Inner(ICommit mergeCommit, GitVersionContext context)
+    private static MergeMessage? Inner(ICommit mergeCommit, GitVersionContext context)
+    {
+        if (mergeCommit.Parents.Count() < 2)
         {
-            if (mergeCommit.Parents.Count() < 2)
-            {
-                return null;
-            }
-
-            var mergeMessage = new MergeMessage(mergeCommit.Message, context.FullConfiguration);
-            return mergeMessage;
+            return null;
         }
 
-        private static string TrimRemote(string branchName) => branchName
-            .RegexReplace("^refs/remotes/", string.Empty, RegexOptions.IgnoreCase)
-            .RegexReplace("^origin/", string.Empty, RegexOptions.IgnoreCase);
+        var mergeMessage = new MergeMessage(mergeCommit.Message, context.FullConfiguration);
+        return mergeMessage;
     }
-}
+
+    private static string TrimRemote(string branchName) => branchName
+        .RegexReplace("^refs/remotes/", string.Empty, RegexOptions.IgnoreCase)
+        .RegexReplace("^origin/", string.Empty, RegexOptions.IgnoreCase);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs
index 2fe72ffcc7..c57a21f9ab 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs
@@ -3,59 +3,58 @@
 using System.Linq;
 using GitVersion.Common;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+/// <summary>
+/// Version is extracted from all tags on the branch which are valid, and not newer than the current commit.
+/// BaseVersionSource is the tag's commit.
+/// Increments if the tag is not the current commit.
+/// </summary>
+public class TaggedCommitVersionStrategy : VersionStrategyBase
 {
-    /// <summary>
-    /// Version is extracted from all tags on the branch which are valid, and not newer than the current commit.
-    /// BaseVersionSource is the tag's commit.
-    /// Increments if the tag is not the current commit.
-    /// </summary>
-    public class TaggedCommitVersionStrategy : VersionStrategyBase
-    {
-        private readonly IRepositoryStore repositoryStore;
+    private readonly IRepositoryStore repositoryStore;
 
-        public TaggedCommitVersionStrategy(IRepositoryStore repositoryStore, Lazy<GitVersionContext> versionContext) : base(versionContext) => this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
+    public TaggedCommitVersionStrategy(IRepositoryStore repositoryStore, Lazy<GitVersionContext> versionContext) : base(versionContext) => this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
 
-        public override IEnumerable<BaseVersion> GetVersions() =>
-            GetTaggedVersions(Context.CurrentBranch, Context.CurrentCommit?.When);
+    public override IEnumerable<BaseVersion> GetVersions() =>
+        GetTaggedVersions(Context.CurrentBranch, Context.CurrentCommit?.When);
 
-        internal IEnumerable<BaseVersion> GetTaggedVersions(IBranch? currentBranch, DateTimeOffset? olderThan)
-        {
-            if (currentBranch is null)
-                return Enumerable.Empty<BaseVersion>();
-            var versionTags = this.repositoryStore.GetValidVersionTags(Context.Configuration?.GitTagPrefix, olderThan);
-            var versionTagsByCommit = versionTags.ToLookup(vt => vt.Item3.Id.Sha);
-            var commitsOnBranch = currentBranch.Commits;
-            var versionTagsOnBranch = commitsOnBranch.SelectMany(commit => versionTagsByCommit[commit.Id.Sha]);
-            var versionTaggedCommits = versionTagsOnBranch.Select(t => new VersionTaggedCommit(t.Item3, t.Item2, t.Item1.Name.Friendly));
-            var taggedVersions = versionTaggedCommits.Select(versionTaggedCommit => CreateBaseVersion(Context, versionTaggedCommit)).ToList();
-            var taggedVersionsOnCurrentCommit = taggedVersions.Where(version => !version.ShouldIncrement).ToList();
-            return taggedVersionsOnCurrentCommit.Any() ? taggedVersionsOnCurrentCommit : taggedVersions;
-        }
+    internal IEnumerable<BaseVersion> GetTaggedVersions(IBranch? currentBranch, DateTimeOffset? olderThan)
+    {
+        if (currentBranch is null)
+            return Enumerable.Empty<BaseVersion>();
+        var versionTags = this.repositoryStore.GetValidVersionTags(Context.Configuration?.GitTagPrefix, olderThan);
+        var versionTagsByCommit = versionTags.ToLookup(vt => vt.Item3.Id.Sha);
+        var commitsOnBranch = currentBranch.Commits;
+        var versionTagsOnBranch = commitsOnBranch.SelectMany(commit => versionTagsByCommit[commit.Id.Sha]);
+        var versionTaggedCommits = versionTagsOnBranch.Select(t => new VersionTaggedCommit(t.Item3, t.Item2, t.Item1.Name.Friendly));
+        var taggedVersions = versionTaggedCommits.Select(versionTaggedCommit => CreateBaseVersion(Context, versionTaggedCommit)).ToList();
+        var taggedVersionsOnCurrentCommit = taggedVersions.Where(version => !version.ShouldIncrement).ToList();
+        return taggedVersionsOnCurrentCommit.Any() ? taggedVersionsOnCurrentCommit : taggedVersions;
+    }
 
-        private BaseVersion CreateBaseVersion(GitVersionContext context, VersionTaggedCommit version)
-        {
-            var shouldUpdateVersion = version.Commit.Sha != context.CurrentCommit?.Sha;
-            var baseVersion = new BaseVersion(FormatSource(version), shouldUpdateVersion, version.SemVer, version.Commit, null);
-            return baseVersion;
-        }
+    private BaseVersion CreateBaseVersion(GitVersionContext context, VersionTaggedCommit version)
+    {
+        var shouldUpdateVersion = version.Commit.Sha != context.CurrentCommit?.Sha;
+        var baseVersion = new BaseVersion(FormatSource(version), shouldUpdateVersion, version.SemVer, version.Commit, null);
+        return baseVersion;
+    }
 
-        protected virtual string FormatSource(VersionTaggedCommit version) => $"Git tag '{version.Tag}'";
+    protected virtual string FormatSource(VersionTaggedCommit version) => $"Git tag '{version.Tag}'";
 
-        protected class VersionTaggedCommit
+    protected class VersionTaggedCommit
+    {
+        public string Tag;
+        public ICommit Commit;
+        public SemanticVersion SemVer;
+
+        public VersionTaggedCommit(ICommit commit, SemanticVersion semVer, string tag)
         {
-            public string Tag;
-            public ICommit Commit;
-            public SemanticVersion SemVer;
-
-            public VersionTaggedCommit(ICommit commit, SemanticVersion semVer, string tag)
-            {
-                this.Tag = tag;
-                this.Commit = commit;
-                this.SemVer = semVer;
-            }
-
-            public override string ToString() => $"{this.Tag} | {this.Commit} | {this.SemVer}";
+            this.Tag = tag;
+            this.Commit = commit;
+            this.SemVer = semVer;
         }
+
+        public override string ToString() => $"{this.Tag} | {this.Commit} | {this.SemVer}";
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs
index cd7cc0b587..1b1eb9cd74 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs
@@ -5,97 +5,96 @@
 using GitVersion.Configuration;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+/// <summary>
+/// Active only when the branch is marked as IsDevelop.
+/// Two different algorithms (results are merged):
+/// <para>
+/// Using <see cref="VersionInBranchNameVersionStrategy"/>:
+/// Version is that of any child branches marked with IsReleaseBranch (except if they have no commits of their own).
+/// BaseVersionSource is the commit where the child branch was created.
+/// Always increments.
+/// </para>
+/// <para>
+/// Using <see cref="TaggedCommitVersionStrategy"/>:
+/// Version is extracted from all tags on the <c>main</c> branch which are valid.
+/// BaseVersionSource is the tag's commit (same as base strategy).
+/// Increments if the tag is not the current commit (same as base strategy).
+/// </para>
+/// </summary>
+public class TrackReleaseBranchesVersionStrategy : VersionStrategyBase
 {
-    /// <summary>
-    /// Active only when the branch is marked as IsDevelop.
-    /// Two different algorithms (results are merged):
-    /// <para>
-    /// Using <see cref="VersionInBranchNameVersionStrategy"/>:
-    /// Version is that of any child branches marked with IsReleaseBranch (except if they have no commits of their own).
-    /// BaseVersionSource is the commit where the child branch was created.
-    /// Always increments.
-    /// </para>
-    /// <para>
-    /// Using <see cref="TaggedCommitVersionStrategy"/>:
-    /// Version is extracted from all tags on the <c>main</c> branch which are valid.
-    /// BaseVersionSource is the tag's commit (same as base strategy).
-    /// Increments if the tag is not the current commit (same as base strategy).
-    /// </para>
-    /// </summary>
-    public class TrackReleaseBranchesVersionStrategy : VersionStrategyBase
-    {
-        private readonly IRepositoryStore repositoryStore;
-        private readonly VersionInBranchNameVersionStrategy releaseVersionStrategy;
-        private readonly TaggedCommitVersionStrategy taggedCommitVersionStrategy;
+    private readonly IRepositoryStore repositoryStore;
+    private readonly VersionInBranchNameVersionStrategy releaseVersionStrategy;
+    private readonly TaggedCommitVersionStrategy taggedCommitVersionStrategy;
 
-        public TrackReleaseBranchesVersionStrategy(IRepositoryStore repositoryStore, Lazy<GitVersionContext> versionContext)
-            : base(versionContext)
-        {
-            this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
+    public TrackReleaseBranchesVersionStrategy(IRepositoryStore repositoryStore, Lazy<GitVersionContext> versionContext)
+        : base(versionContext)
+    {
+        this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
 
-            this.releaseVersionStrategy = new VersionInBranchNameVersionStrategy(repositoryStore, versionContext);
-            this.taggedCommitVersionStrategy = new TaggedCommitVersionStrategy(repositoryStore, versionContext);
-        }
+        this.releaseVersionStrategy = new VersionInBranchNameVersionStrategy(repositoryStore, versionContext);
+        this.taggedCommitVersionStrategy = new TaggedCommitVersionStrategy(repositoryStore, versionContext);
+    }
 
-        public override IEnumerable<BaseVersion> GetVersions()
+    public override IEnumerable<BaseVersion> GetVersions()
+    {
+        if (Context.Configuration?.TracksReleaseBranches == true)
         {
-            if (Context.Configuration?.TracksReleaseBranches == true)
-            {
-                return ReleaseBranchBaseVersions().Union(MainTagsVersions());
-            }
-
-            return Array.Empty<BaseVersion>();
+            return ReleaseBranchBaseVersions().Union(MainTagsVersions());
         }
 
-        private IEnumerable<BaseVersion> MainTagsVersions()
-        {
-            var main = this.repositoryStore.FindBranch(Config.MainBranchKey);
-            return main != null ? this.taggedCommitVersionStrategy.GetTaggedVersions(main, null) : Array.Empty<BaseVersion>();
-        }
+        return Array.Empty<BaseVersion>();
+    }
+
+    private IEnumerable<BaseVersion> MainTagsVersions()
+    {
+        var main = this.repositoryStore.FindBranch(Config.MainBranchKey);
+        return main != null ? this.taggedCommitVersionStrategy.GetTaggedVersions(main, null) : Array.Empty<BaseVersion>();
+    }
 
 
 
-        private IEnumerable<BaseVersion> ReleaseBranchBaseVersions()
+    private IEnumerable<BaseVersion> ReleaseBranchBaseVersions()
+    {
+        var releaseBranchConfig = Context.FullConfiguration?.GetReleaseBranchConfig();
+        if (releaseBranchConfig.Any())
         {
-            var releaseBranchConfig = Context.FullConfiguration?.GetReleaseBranchConfig();
-            if (releaseBranchConfig.Any())
-            {
-                var releaseBranches = this.repositoryStore.GetReleaseBranches(releaseBranchConfig);
+            var releaseBranches = this.repositoryStore.GetReleaseBranches(releaseBranchConfig);
 
-                return releaseBranches
-                    .SelectMany(b => GetReleaseVersion(Context, b))
-                    .Select(baseVersion =>
-                    {
-                        // Need to drop branch overrides and give a bit more context about
-                        // where this version came from
-                        var source1 = "Release branch exists -> " + baseVersion.Source;
-                        return new BaseVersion(source1,
-                            baseVersion.ShouldIncrement,
-                            baseVersion.SemanticVersion,
-                            baseVersion.BaseVersionSource,
-                            null);
-                    })
-                    .ToList();
-            }
-            return Array.Empty<BaseVersion>();
+            return releaseBranches
+                .SelectMany(b => GetReleaseVersion(Context, b))
+                .Select(baseVersion =>
+                {
+                    // Need to drop branch overrides and give a bit more context about
+                    // where this version came from
+                    var source1 = "Release branch exists -> " + baseVersion.Source;
+                    return new BaseVersion(source1,
+                        baseVersion.ShouldIncrement,
+                        baseVersion.SemanticVersion,
+                        baseVersion.BaseVersionSource,
+                        null);
+                })
+                .ToList();
         }
+        return Array.Empty<BaseVersion>();
+    }
 
-        private IEnumerable<BaseVersion> GetReleaseVersion(GitVersionContext context, IBranch releaseBranch)
-        {
-            var tagPrefixRegex = context.Configuration?.GitTagPrefix;
-
-            // Find the commit where the child branch was created.
-            var baseSource = this.repositoryStore.FindMergeBase(releaseBranch, context.CurrentBranch);
-            if (Equals(baseSource, context.CurrentCommit))
-            {
-                // Ignore the branch if it has no commits.
-                return Array.Empty<BaseVersion>();
-            }
+    private IEnumerable<BaseVersion> GetReleaseVersion(GitVersionContext context, IBranch releaseBranch)
+    {
+        var tagPrefixRegex = context.Configuration?.GitTagPrefix;
 
-            return this.releaseVersionStrategy
-                .GetVersions(tagPrefixRegex, releaseBranch)
-                .Select(b => new BaseVersion(b.Source, true, b.SemanticVersion, baseSource, b.BranchNameOverride));
+        // Find the commit where the child branch was created.
+        var baseSource = this.repositoryStore.FindMergeBase(releaseBranch, context.CurrentBranch);
+        if (Equals(baseSource, context.CurrentCommit))
+        {
+            // Ignore the branch if it has no commits.
+            return Array.Empty<BaseVersion>();
         }
+
+        return this.releaseVersionStrategy
+            .GetVersions(tagPrefixRegex, releaseBranch)
+            .Select(b => new BaseVersion(b.Source, true, b.SemanticVersion, baseSource, b.BranchNameOverride));
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs
index 1d2a7a3c0c..cfd5345994 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs
@@ -4,60 +4,59 @@
 using GitVersion.Configuration;
 using GitVersion.Extensions;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+/// <summary>
+/// Version is extracted from the name of the branch.
+/// BaseVersionSource is the commit where the branch was branched from its parent.
+/// Does not increment.
+/// </summary>
+public class VersionInBranchNameVersionStrategy : VersionStrategyBase
 {
-    /// <summary>
-    /// Version is extracted from the name of the branch.
-    /// BaseVersionSource is the commit where the branch was branched from its parent.
-    /// Does not increment.
-    /// </summary>
-    public class VersionInBranchNameVersionStrategy : VersionStrategyBase
-    {
-        private readonly IRepositoryStore repositoryStore;
+    private readonly IRepositoryStore repositoryStore;
+
+    public VersionInBranchNameVersionStrategy(IRepositoryStore repositoryStore, Lazy<GitVersionContext> versionContext) : base(versionContext) => this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
 
-        public VersionInBranchNameVersionStrategy(IRepositoryStore repositoryStore, Lazy<GitVersionContext> versionContext) : base(versionContext) => this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
+    public override IEnumerable<BaseVersion> GetVersions()
+    {
+        var currentBranch = Context.CurrentBranch;
+        var tagPrefixRegex = Context.Configuration?.GitTagPrefix;
+        return GetVersions(tagPrefixRegex, currentBranch);
+    }
 
-        public override IEnumerable<BaseVersion> GetVersions()
+    internal IEnumerable<BaseVersion> GetVersions(string? tagPrefixRegex, IBranch? currentBranch)
+    {
+        if (currentBranch == null ||
+            Context.FullConfiguration?.IsReleaseBranch(NameWithoutOrigin(currentBranch)) != true)
         {
-            var currentBranch = Context.CurrentBranch;
-            var tagPrefixRegex = Context.Configuration?.GitTagPrefix;
-            return GetVersions(tagPrefixRegex, currentBranch);
+            yield break;
         }
 
-        internal IEnumerable<BaseVersion> GetVersions(string? tagPrefixRegex, IBranch? currentBranch)
+        var branchName = currentBranch.Name.Friendly;
+        var versionInBranch = GetVersionInBranch(branchName, tagPrefixRegex);
+        if (versionInBranch != null)
         {
-            if (currentBranch == null ||
-                Context.FullConfiguration?.IsReleaseBranch(NameWithoutOrigin(currentBranch)) != true)
-            {
-                yield break;
-            }
-
-            var branchName = currentBranch.Name.Friendly;
-            var versionInBranch = GetVersionInBranch(branchName, tagPrefixRegex);
-            if (versionInBranch != null)
-            {
-                var commitBranchWasBranchedFrom = this.repositoryStore.FindCommitBranchWasBranchedFrom(currentBranch, Context.FullConfiguration);
-                var branchNameOverride = branchName.RegexReplace("[-/]" + versionInBranch.Item1, string.Empty);
-                yield return new BaseVersion("Version in branch name", false, versionInBranch.Item2, commitBranchWasBranchedFrom.Commit, branchNameOverride);
-            }
+            var commitBranchWasBranchedFrom = this.repositoryStore.FindCommitBranchWasBranchedFrom(currentBranch, Context.FullConfiguration);
+            var branchNameOverride = branchName.RegexReplace("[-/]" + versionInBranch.Item1, string.Empty);
+            yield return new BaseVersion("Version in branch name", false, versionInBranch.Item2, commitBranchWasBranchedFrom.Commit, branchNameOverride);
         }
+    }
 
-        private static Tuple<string, SemanticVersion>? GetVersionInBranch(string branchName, string? tagPrefixRegex)
+    private static Tuple<string, SemanticVersion>? GetVersionInBranch(string branchName, string? tagPrefixRegex)
+    {
+        var branchParts = branchName.Split('/', '-');
+        foreach (var part in branchParts)
         {
-            var branchParts = branchName.Split('/', '-');
-            foreach (var part in branchParts)
+            if (SemanticVersion.TryParse(part, tagPrefixRegex, out var semanticVersion))
             {
-                if (SemanticVersion.TryParse(part, tagPrefixRegex, out var semanticVersion))
-                {
-                    return Tuple.Create(part, semanticVersion);
-                }
+                return Tuple.Create(part, semanticVersion);
             }
-
-            return null;
         }
 
-        private static string NameWithoutOrigin(IBranch branch) => branch.IsRemote && branch.Name.Friendly.StartsWith("origin/")
-                ? branch.Name.Friendly.Substring("origin/".Length)
-                : branch.Name.Friendly;
+        return null;
     }
-}
+
+    private static string NameWithoutOrigin(IBranch branch) => branch.IsRemote && branch.Name.Friendly.StartsWith("origin/")
+        ? branch.Name.Friendly.Substring("origin/".Length)
+        : branch.Name.Friendly;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyBase.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyBase.cs
index c9b452a298..78b081076a 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyBase.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyBase.cs
@@ -1,14 +1,13 @@
 using System;
 using System.Collections.Generic;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public class VersionStrategyBase : IVersionStrategy
 {
-    public class VersionStrategyBase : IVersionStrategy
-    {
-        private readonly Lazy<GitVersionContext> versionContext;
-        protected GitVersionContext Context => this.versionContext.Value;
+    private readonly Lazy<GitVersionContext> versionContext;
+    protected GitVersionContext Context => this.versionContext.Value;
 
-        protected VersionStrategyBase(Lazy<GitVersionContext> versionContext) => this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
-        public virtual IEnumerable<BaseVersion> GetVersions() => throw new NotImplementedException();
-    }
-}
+    protected VersionStrategyBase(Lazy<GitVersionContext> versionContext) => this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
+    public virtual IEnumerable<BaseVersion> GetVersions() => throw new NotImplementedException();
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyModule.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyModule.cs
index 7d7d15bc65..bee87e2b62 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyModule.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyModule.cs
@@ -2,18 +2,17 @@
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public class VersionStrategyModule : GitVersionModule
 {
-    public class VersionStrategyModule : GitVersionModule
+    public override void RegisterTypes(IServiceCollection services)
     {
-        public override void RegisterTypes(IServiceCollection services)
-        {
-            var versionStrategies = FindAllDerivedTypes<IVersionStrategy>(Assembly.GetAssembly(GetType())).Where(x => x != typeof(VersionStrategyBase));
+        var versionStrategies = FindAllDerivedTypes<IVersionStrategy>(Assembly.GetAssembly(GetType())).Where(x => x != typeof(VersionStrategyBase));
 
-            foreach (var versionStrategy in versionStrategies)
-            {
-                services.AddSingleton(typeof(IVersionStrategy), versionStrategy);
-            }
+        foreach (var versionStrategy in versionStrategies)
+        {
+            services.AddSingleton(typeof(IVersionStrategy), versionStrategy);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCache.cs b/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCache.cs
index f2d58e8939..37e14cf7bb 100644
--- a/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCache.cs
+++ b/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCache.cs
@@ -8,104 +8,103 @@
 using GitVersion.OutputVariables;
 using YamlDotNet.Serialization;
 
-namespace GitVersion.VersionCalculation.Cache
+namespace GitVersion.VersionCalculation.Cache;
+
+public class GitVersionCache : IGitVersionCache
 {
-    public class GitVersionCache : IGitVersionCache
+    private readonly IFileSystem fileSystem;
+    private readonly ILog log;
+    private readonly IGitRepositoryInfo repositoryInfo;
+
+    public GitVersionCache(IFileSystem fileSystem, ILog log, IGitRepositoryInfo repositoryInfo)
+    {
+        this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
+        this.repositoryInfo = repositoryInfo ?? throw new ArgumentNullException(nameof(repositoryInfo));
+    }
+
+    public void WriteVariablesToDiskCache(GitVersionCacheKey cacheKey, VersionVariables variablesFromCache)
     {
-        private readonly IFileSystem fileSystem;
-        private readonly ILog log;
-        private readonly IGitRepositoryInfo repositoryInfo;
+        var cacheDir = PrepareCacheDirectory();
+        var cacheFileName = GetCacheFileName(cacheKey, cacheDir);
 
-        public GitVersionCache(IFileSystem fileSystem, ILog log, IGitRepositoryInfo repositoryInfo)
+        variablesFromCache.FileName = cacheFileName;
+
+        Dictionary<string, string> dictionary;
+        using (this.log.IndentLog("Creating dictionary"))
         {
-            this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.repositoryInfo = repositoryInfo ?? throw new ArgumentNullException(nameof(repositoryInfo));
+            dictionary = variablesFromCache.ToDictionary(x => x.Key, x => x.Value);
         }
 
-        public void WriteVariablesToDiskCache(GitVersionCacheKey cacheKey, VersionVariables variablesFromCache)
+        void WriteCacheOperation()
         {
-            var cacheDir = PrepareCacheDirectory();
-            var cacheFileName = GetCacheFileName(cacheKey, cacheDir);
-
-            variablesFromCache.FileName = cacheFileName;
-
-            Dictionary<string, string> dictionary;
-            using (this.log.IndentLog("Creating dictionary"))
+            using var stream = this.fileSystem.OpenWrite(cacheFileName);
+            using var sw = new StreamWriter(stream);
+            using (this.log.IndentLog("Storing version variables to cache file " + cacheFileName))
             {
-                dictionary = variablesFromCache.ToDictionary(x => x.Key, x => x.Value);
+                var serializer = new Serializer();
+                serializer.Serialize(sw, dictionary);
             }
+        }
 
-            void WriteCacheOperation()
-            {
-                using var stream = this.fileSystem.OpenWrite(cacheFileName);
-                using var sw = new StreamWriter(stream);
-                using (this.log.IndentLog("Storing version variables to cache file " + cacheFileName))
-                {
-                    var serializer = new Serializer();
-                    serializer.Serialize(sw, dictionary);
-                }
-            }
+        var retryOperation = new RetryAction<IOException>(maxRetries: 6);
+        retryOperation.Execute(WriteCacheOperation);
+    }
 
-            var retryOperation = new RetryAction<IOException>(maxRetries: 6);
-            retryOperation.Execute(WriteCacheOperation);
-        }
+    public string GetCacheDirectory()
+    {
+        var gitDir = this.repositoryInfo.DotGitDirectory;
+        return Path.Combine(gitDir, "gitversion_cache");
+    }
 
-        public string GetCacheDirectory()
+    public VersionVariables? LoadVersionVariablesFromDiskCache(GitVersionCacheKey key)
+    {
+        using (this.log.IndentLog("Loading version variables from disk cache"))
         {
-            var gitDir = this.repositoryInfo.DotGitDirectory;
-            return Path.Combine(gitDir, "gitversion_cache");
-        }
+            var cacheDir = PrepareCacheDirectory();
 
-        public VersionVariables? LoadVersionVariablesFromDiskCache(GitVersionCacheKey key)
-        {
-            using (this.log.IndentLog("Loading version variables from disk cache"))
+            var cacheFileName = GetCacheFileName(key, cacheDir);
+            if (!this.fileSystem.Exists(cacheFileName))
             {
-                var cacheDir = PrepareCacheDirectory();
+                this.log.Info("Cache file " + cacheFileName + " not found.");
+                return null;
+            }
 
-                var cacheFileName = GetCacheFileName(key, cacheDir);
-                if (!this.fileSystem.Exists(cacheFileName))
+            using (this.log.IndentLog("Deserializing version variables from cache file " + cacheFileName))
+            {
+                try
                 {
-                    this.log.Info("Cache file " + cacheFileName + " not found.");
-                    return null;
+                    var loadedVariables = VersionVariables.FromFile(cacheFileName, this.fileSystem, this.log);
+                    return loadedVariables;
                 }
-
-                using (this.log.IndentLog("Deserializing version variables from cache file " + cacheFileName))
+                catch (Exception ex)
                 {
+                    this.log.Warning("Unable to read cache file " + cacheFileName + ", deleting it.");
+                    this.log.Info(ex.ToString());
                     try
                     {
-                        var loadedVariables = VersionVariables.FromFile(cacheFileName, this.fileSystem, this.log);
-                        return loadedVariables;
+                        this.fileSystem.Delete(cacheFileName);
                     }
-                    catch (Exception ex)
+                    catch (Exception deleteEx)
                     {
-                        this.log.Warning("Unable to read cache file " + cacheFileName + ", deleting it.");
-                        this.log.Info(ex.ToString());
-                        try
-                        {
-                            this.fileSystem.Delete(cacheFileName);
-                        }
-                        catch (Exception deleteEx)
-                        {
-                            this.log.Warning($"Unable to delete corrupted version cache file {cacheFileName}. Got {deleteEx.GetType().FullName} exception.");
-                        }
-
-                        return null;
+                        this.log.Warning($"Unable to delete corrupted version cache file {cacheFileName}. Got {deleteEx.GetType().FullName} exception.");
                     }
+
+                    return null;
                 }
             }
         }
+    }
 
-        private string PrepareCacheDirectory()
-        {
-            var cacheDir = GetCacheDirectory();
-
-            // If the cacheDir already exists, CreateDirectory just won't do anything (it won't fail). @asbjornu
-            this.fileSystem.CreateDirectory(cacheDir);
+    private string PrepareCacheDirectory()
+    {
+        var cacheDir = GetCacheDirectory();
 
-            return cacheDir;
-        }
+        // If the cacheDir already exists, CreateDirectory just won't do anything (it won't fail). @asbjornu
+        this.fileSystem.CreateDirectory(cacheDir);
 
-        private static string GetCacheFileName(GitVersionCacheKey key, string cacheDir) => Path.Combine(cacheDir, string.Concat(key.Value, ".yml"));
+        return cacheDir;
     }
-}
+
+    private static string GetCacheFileName(GitVersionCacheKey key, string cacheDir) => Path.Combine(cacheDir, string.Concat(key.Value, ".yml"));
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCacheKeyFactory.cs b/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCacheKeyFactory.cs
index 9704765413..d824dbcf63 100644
--- a/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCacheKeyFactory.cs
+++ b/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCacheKeyFactory.cs
@@ -11,203 +11,202 @@
 using GitVersion.Model.Configuration;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion.VersionCalculation.Cache
+namespace GitVersion.VersionCalculation.Cache;
+
+public class GitVersionCacheKeyFactory : IGitVersionCacheKeyFactory
 {
-    public class GitVersionCacheKeyFactory : IGitVersionCacheKeyFactory
+    private readonly IFileSystem fileSystem;
+    private readonly ILog log;
+    private readonly IOptions<GitVersionOptions> options;
+    private readonly IConfigFileLocator configFileLocator;
+    private readonly IGitRepository gitRepository;
+    private readonly IGitRepositoryInfo repositoryInfo;
+
+    public GitVersionCacheKeyFactory(IFileSystem fileSystem, ILog log,
+        IOptions<GitVersionOptions> options, IConfigFileLocator configFileLocator,
+        IGitRepository gitRepository, IGitRepositoryInfo repositoryInfo)
     {
-        private readonly IFileSystem fileSystem;
-        private readonly ILog log;
-        private readonly IOptions<GitVersionOptions> options;
-        private readonly IConfigFileLocator configFileLocator;
-        private readonly IGitRepository gitRepository;
-        private readonly IGitRepositoryInfo repositoryInfo;
-
-        public GitVersionCacheKeyFactory(IFileSystem fileSystem, ILog log,
-            IOptions<GitVersionOptions> options, IConfigFileLocator configFileLocator,
-            IGitRepository gitRepository, IGitRepositoryInfo repositoryInfo)
-        {
-            this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.options = options ?? throw new ArgumentNullException(nameof(options));
-            this.configFileLocator = configFileLocator ?? throw new ArgumentNullException(nameof(configFileLocator));
-            this.gitRepository = gitRepository ?? throw new ArgumentNullException(nameof(gitRepository));
-            this.repositoryInfo = repositoryInfo ?? throw new ArgumentNullException(nameof(repositoryInfo));
-        }
+        this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
+        this.options = options ?? throw new ArgumentNullException(nameof(options));
+        this.configFileLocator = configFileLocator ?? throw new ArgumentNullException(nameof(configFileLocator));
+        this.gitRepository = gitRepository ?? throw new ArgumentNullException(nameof(gitRepository));
+        this.repositoryInfo = repositoryInfo ?? throw new ArgumentNullException(nameof(repositoryInfo));
+    }
 
-        public GitVersionCacheKey Create(Config? overrideConfig)
-        {
-            var gitSystemHash = GetGitSystemHash();
-            var configFileHash = GetConfigFileHash();
-            var repositorySnapshotHash = GetRepositorySnapshotHash();
-            var overrideConfigHash = GetOverrideConfigHash(overrideConfig);
+    public GitVersionCacheKey Create(Config? overrideConfig)
+    {
+        var gitSystemHash = GetGitSystemHash();
+        var configFileHash = GetConfigFileHash();
+        var repositorySnapshotHash = GetRepositorySnapshotHash();
+        var overrideConfigHash = GetOverrideConfigHash(overrideConfig);
 
-            var compositeHash = GetHash(gitSystemHash, configFileHash, repositorySnapshotHash, overrideConfigHash);
-            return new GitVersionCacheKey(compositeHash);
-        }
+        var compositeHash = GetHash(gitSystemHash, configFileHash, repositorySnapshotHash, overrideConfigHash);
+        return new GitVersionCacheKey(compositeHash);
+    }
 
-        private string GetGitSystemHash()
-        {
-            var dotGitDirectory = this.repositoryInfo.DotGitDirectory;
+    private string GetGitSystemHash()
+    {
+        var dotGitDirectory = this.repositoryInfo.DotGitDirectory;
 
-            // traverse the directory and get a list of files, use that for GetHash
-            var contents = CalculateDirectoryContents(Path.Combine(dotGitDirectory, "refs"));
+        // traverse the directory and get a list of files, use that for GetHash
+        var contents = CalculateDirectoryContents(Path.Combine(dotGitDirectory, "refs"));
 
-            return GetHash(contents.ToArray());
+        return GetHash(contents.ToArray());
+    }
+
+    // based on https://msdn.microsoft.com/en-us/library/bb513869.aspx
+    private List<string> CalculateDirectoryContents(string root)
+    {
+        var result = new List<string>();
+
+        // Data structure to hold names of subfolders to be
+        // examined for files.
+        var dirs = new Stack<string>();
+
+        if (!Directory.Exists(root))
+        {
+            throw new DirectoryNotFoundException($"Root directory does not exist: {root}");
         }
 
-        // based on https://msdn.microsoft.com/en-us/library/bb513869.aspx
-        private List<string> CalculateDirectoryContents(string root)
+        dirs.Push(root);
+
+        while (dirs.Any())
         {
-            var result = new List<string>();
+            var currentDir = dirs.Pop();
 
-            // Data structure to hold names of subfolders to be
-            // examined for files.
-            var dirs = new Stack<string>();
+            var di = new DirectoryInfo(currentDir);
+            result.Add(di.Name);
 
-            if (!Directory.Exists(root))
+            string[] subDirs;
+            try
             {
-                throw new DirectoryNotFoundException($"Root directory does not exist: {root}");
+                subDirs = Directory.GetDirectories(currentDir);
             }
-
-            dirs.Push(root);
-
-            while (dirs.Any())
+            // An UnauthorizedAccessException exception will be thrown if we do not have
+            // discovery permission on a folder or file. It may or may not be acceptable
+            // to ignore the exception and continue enumerating the remaining files and
+            // folders. It is also possible (but unlikely) that a DirectoryNotFound exception
+            // will be raised. This will happen if currentDir has been deleted by
+            // another application or thread after our call to Directory.Exists. The
+            // choice of which exceptions to catch depends entirely on the specific task
+            // you are intending to perform and also on how much you know with certainty
+            // about the systems on which this code will run.
+            catch (UnauthorizedAccessException e)
             {
-                var currentDir = dirs.Pop();
-
-                var di = new DirectoryInfo(currentDir);
-                result.Add(di.Name);
+                this.log.Error(e.Message);
+                continue;
+            }
+            catch (DirectoryNotFoundException e)
+            {
+                this.log.Error(e.Message);
+                continue;
+            }
 
-                string[] subDirs;
-                try
-                {
-                    subDirs = Directory.GetDirectories(currentDir);
-                }
-                // An UnauthorizedAccessException exception will be thrown if we do not have
-                // discovery permission on a folder or file. It may or may not be acceptable
-                // to ignore the exception and continue enumerating the remaining files and
-                // folders. It is also possible (but unlikely) that a DirectoryNotFound exception
-                // will be raised. This will happen if currentDir has been deleted by
-                // another application or thread after our call to Directory.Exists. The
-                // choice of which exceptions to catch depends entirely on the specific task
-                // you are intending to perform and also on how much you know with certainty
-                // about the systems on which this code will run.
-                catch (UnauthorizedAccessException e)
-                {
-                    this.log.Error(e.Message);
-                    continue;
-                }
-                catch (DirectoryNotFoundException e)
-                {
-                    this.log.Error(e.Message);
-                    continue;
-                }
+            string[] files;
+            try
+            {
+                files = Directory.GetFiles(currentDir);
+            }
+            catch (UnauthorizedAccessException e)
+            {
+                this.log.Error(e.Message);
+                continue;
+            }
+            catch (DirectoryNotFoundException e)
+            {
+                this.log.Error(e.Message);
+                continue;
+            }
 
-                string[] files;
+            foreach (var file in files)
+            {
                 try
                 {
-                    files = Directory.GetFiles(currentDir);
+                    var fi = new FileInfo(file);
+                    result.Add(fi.Name);
+                    result.Add(File.ReadAllText(file));
                 }
-                catch (UnauthorizedAccessException e)
+                catch (IOException e)
                 {
                     this.log.Error(e.Message);
-                    continue;
-                }
-                catch (DirectoryNotFoundException e)
-                {
-                    this.log.Error(e.Message);
-                    continue;
-                }
-
-                foreach (var file in files)
-                {
-                    try
-                    {
-                        var fi = new FileInfo(file);
-                        result.Add(fi.Name);
-                        result.Add(File.ReadAllText(file));
-                    }
-                    catch (IOException e)
-                    {
-                        this.log.Error(e.Message);
-                    }
-                }
-
-                // Push the subdirectories onto the stack for traversal.
-                // This could also be done before handing the files.
-                // push in reverse order
-                for (var i = subDirs.Length - 1; i >= 0; i--)
-                {
-                    dirs.Push(subDirs[i]);
                 }
             }
 
-            return result;
-        }
-
-        private string GetRepositorySnapshotHash()
-        {
-            var head = this.gitRepository.Head;
-            if (head.Tip == null)
+            // Push the subdirectories onto the stack for traversal.
+            // This could also be done before handing the files.
+            // push in reverse order
+            for (var i = subDirs.Length - 1; i >= 0; i--)
             {
-                return head.Name.Canonical;
+                dirs.Push(subDirs[i]);
             }
-            var hash = string.Join(":", head.Name.Canonical, head.Tip.Sha);
-            return GetHash(hash);
         }
 
-        private static string GetOverrideConfigHash(Config? overrideConfig)
-        {
-            if (overrideConfig == null)
-            {
-                return string.Empty;
-            }
-
-            // Doesn't depend on command line representation and
-            // includes possible changes in default values of Config per se.
-            var stringBuilder = new StringBuilder();
-            using (var stream = new StringWriter(stringBuilder))
-            {
-                ConfigSerializer.Write(overrideConfig, stream);
-                stream.Flush();
-            }
-            var configContent = stringBuilder.ToString();
+        return result;
+    }
 
-            return GetHash(configContent);
+    private string GetRepositorySnapshotHash()
+    {
+        var head = this.gitRepository.Head;
+        if (head.Tip == null)
+        {
+            return head.Name.Canonical;
         }
+        var hash = string.Join(":", head.Name.Canonical, head.Tip.Sha);
+        return GetHash(hash);
+    }
 
-        private string GetConfigFileHash()
+    private static string GetOverrideConfigHash(Config? overrideConfig)
+    {
+        if (overrideConfig == null)
         {
-            // will return the same hash even when config file will be moved
-            // from workingDirectory to rootProjectDirectory. It's OK. Config essentially is the same.
-            var configFilePath = this.configFileLocator.SelectConfigFilePath(this.options.Value, this.repositoryInfo);
-            if (!this.fileSystem.Exists(configFilePath))
-            {
-                return string.Empty;
-            }
-
-            var configFileContent = this.fileSystem.ReadAllText(configFilePath);
-            return GetHash(configFileContent);
+            return string.Empty;
         }
 
-        private static string GetHash(params string[] textsToHash)
+        // Doesn't depend on command line representation and
+        // includes possible changes in default values of Config per se.
+        var stringBuilder = new StringBuilder();
+        using (var stream = new StringWriter(stringBuilder))
         {
-            var textToHash = string.Join(":", textsToHash);
-            return GetHash(textToHash);
+            ConfigSerializer.Write(overrideConfig, stream);
+            stream.Flush();
         }
+        var configContent = stringBuilder.ToString();
 
-        private static string GetHash(string textToHash)
+        return GetHash(configContent);
+    }
+
+    private string GetConfigFileHash()
+    {
+        // will return the same hash even when config file will be moved
+        // from workingDirectory to rootProjectDirectory. It's OK. Config essentially is the same.
+        var configFilePath = this.configFileLocator.SelectConfigFilePath(this.options.Value, this.repositoryInfo);
+        if (!this.fileSystem.Exists(configFilePath))
         {
-            if (textToHash.IsNullOrEmpty())
-            {
-                return string.Empty;
-            }
+            return string.Empty;
+        }
+
+        var configFileContent = this.fileSystem.ReadAllText(configFilePath);
+        return GetHash(configFileContent);
+    }
 
-            using var sha1 = SHA1.Create();
-            var bytes = Encoding.UTF8.GetBytes(textToHash);
-            var hashedBytes = sha1.ComputeHash(bytes);
-            var hashedString = BitConverter.ToString(hashedBytes);
-            return hashedString.Replace("-", "");
+    private static string GetHash(params string[] textsToHash)
+    {
+        var textToHash = string.Join(":", textsToHash);
+        return GetHash(textToHash);
+    }
+
+    private static string GetHash(string textToHash)
+    {
+        if (textToHash.IsNullOrEmpty())
+        {
+            return string.Empty;
         }
+
+        using var sha1 = SHA1.Create();
+        var bytes = Encoding.UTF8.GetBytes(textToHash);
+        var hashedBytes = sha1.ComputeHash(bytes);
+        var hashedString = BitConverter.ToString(hashedBytes);
+        return hashedString.Replace("-", "");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCache.cs b/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCache.cs
index 8905dc412b..249f79d59e 100644
--- a/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCache.cs
+++ b/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCache.cs
@@ -1,12 +1,11 @@
 using GitVersion.Cache;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.VersionCalculation.Cache
+namespace GitVersion.VersionCalculation.Cache;
+
+public interface IGitVersionCache
 {
-    public interface IGitVersionCache
-    {
-        void WriteVariablesToDiskCache(GitVersionCacheKey cacheKey, VersionVariables variablesFromCache);
-        string GetCacheDirectory();
-        VersionVariables? LoadVersionVariablesFromDiskCache(GitVersionCacheKey key);
-    }
-}
+    void WriteVariablesToDiskCache(GitVersionCacheKey cacheKey, VersionVariables variablesFromCache);
+    string GetCacheDirectory();
+    VersionVariables? LoadVersionVariablesFromDiskCache(GitVersionCacheKey key);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCacheKeyFactory.cs b/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCacheKeyFactory.cs
index bfaffef02a..1e584279ed 100644
--- a/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCacheKeyFactory.cs
+++ b/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCacheKeyFactory.cs
@@ -1,10 +1,9 @@
 using GitVersion.Cache;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion.VersionCalculation.Cache
+namespace GitVersion.VersionCalculation.Cache;
+
+public interface IGitVersionCacheKeyFactory
 {
-    public interface IGitVersionCacheKeyFactory
-    {
-        GitVersionCacheKey Create(Config? overrideConfig);
-    }
-}
+    GitVersionCacheKey Create(Config? overrideConfig);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/CommitMessageIncrementMode.cs b/src/GitVersion.Core/VersionCalculation/CommitMessageIncrementMode.cs
index 0ededfe749..3e34cbfb8d 100644
--- a/src/GitVersion.Core/VersionCalculation/CommitMessageIncrementMode.cs
+++ b/src/GitVersion.Core/VersionCalculation/CommitMessageIncrementMode.cs
@@ -1,9 +1,8 @@
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public enum CommitMessageIncrementMode
 {
-    public enum CommitMessageIncrementMode
-    {
-        Enabled,
-        Disabled,
-        MergeMessageOnly
-    }
-}
+    Enabled,
+    Disabled,
+    MergeMessageOnly
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/IncrementStrategy.cs b/src/GitVersion.Core/VersionCalculation/IncrementStrategy.cs
index faca03807c..5f43930c34 100644
--- a/src/GitVersion.Core/VersionCalculation/IncrementStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/IncrementStrategy.cs
@@ -1,30 +1,29 @@
 using System;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion
+namespace GitVersion;
+
+public enum IncrementStrategy
 {
-    public enum IncrementStrategy
-    {
-        None,
-        Major,
-        Minor,
-        Patch,
-        /// <summary>
-        /// Uses the <see cref="BranchConfig.Increment"/>, <see cref="BranchConfig.PreventIncrementOfMergedBranchVersion"/> and <see cref="BranchConfig.TracksReleaseBranches"/>
-        /// of the "parent" branch (i.e. the branch where the current branch was branched from).
-        /// </summary>
-        Inherit
-    }
+    None,
+    Major,
+    Minor,
+    Patch,
+    /// <summary>
+    /// Uses the <see cref="BranchConfig.Increment"/>, <see cref="BranchConfig.PreventIncrementOfMergedBranchVersion"/> and <see cref="BranchConfig.TracksReleaseBranches"/>
+    /// of the "parent" branch (i.e. the branch where the current branch was branched from).
+    /// </summary>
+    Inherit
+}
 
-    public static class IncrementStrategyExtensions
+public static class IncrementStrategyExtensions
+{
+    public static VersionField ToVersionField(this IncrementStrategy strategy) => strategy switch
     {
-        public static VersionField ToVersionField(this IncrementStrategy strategy) => strategy switch
-        {
-            IncrementStrategy.None => VersionField.None,
-            IncrementStrategy.Major => VersionField.Major,
-            IncrementStrategy.Minor => VersionField.Minor,
-            IncrementStrategy.Patch => VersionField.Patch,
-            _ => throw new ArgumentOutOfRangeException(nameof(strategy), strategy, null)
-        };
-    }
-}
+        IncrementStrategy.None => VersionField.None,
+        IncrementStrategy.Major => VersionField.Major,
+        IncrementStrategy.Minor => VersionField.Minor,
+        IncrementStrategy.Patch => VersionField.Patch,
+        _ => throw new ArgumentOutOfRangeException(nameof(strategy), strategy, null)
+    };
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
index 5283db5796..f89ac2805e 100644
--- a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
+++ b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
@@ -5,160 +5,159 @@
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public class IncrementStrategyFinder : IIncrementStrategyFinder
 {
-    public class IncrementStrategyFinder : IIncrementStrategyFinder
+    public const string DefaultMajorPattern = @"\+semver:\s?(breaking|major)";
+    public const string DefaultMinorPattern = @"\+semver:\s?(feature|minor)";
+    public const string DefaultPatchPattern = @"\+semver:\s?(fix|patch)";
+    public const string DefaultNoBumpPattern = @"\+semver:\s?(none|skip)";
+
+    private static readonly ConcurrentDictionary<string, Regex> CompiledRegexCache = new();
+    private readonly Dictionary<string, VersionField?> commitIncrementCache = new();
+    private readonly Dictionary<string, Dictionary<string, int>> headCommitsMapCache = new();
+    private readonly Dictionary<string, ICommit[]> headCommitsCache = new();
+
+    private static readonly Regex DefaultMajorPatternRegex = new(DefaultMajorPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+    private static readonly Regex DefaultMinorPatternRegex = new(DefaultMinorPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+    private static readonly Regex DefaultPatchPatternRegex = new(DefaultPatchPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+    private static readonly Regex DefaultNoBumpPatternRegex = new(DefaultNoBumpPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+    public VersionField? DetermineIncrementedField(IGitRepository repository, GitVersionContext context, BaseVersion baseVersion)
     {
-        public const string DefaultMajorPattern = @"\+semver:\s?(breaking|major)";
-        public const string DefaultMinorPattern = @"\+semver:\s?(feature|minor)";
-        public const string DefaultPatchPattern = @"\+semver:\s?(fix|patch)";
-        public const string DefaultNoBumpPattern = @"\+semver:\s?(none|skip)";
-
-        private static readonly ConcurrentDictionary<string, Regex> CompiledRegexCache = new();
-        private readonly Dictionary<string, VersionField?> commitIncrementCache = new();
-        private readonly Dictionary<string, Dictionary<string, int>> headCommitsMapCache = new();
-        private readonly Dictionary<string, ICommit[]> headCommitsCache = new();
-
-        private static readonly Regex DefaultMajorPatternRegex = new(DefaultMajorPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
-        private static readonly Regex DefaultMinorPatternRegex = new(DefaultMinorPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
-        private static readonly Regex DefaultPatchPatternRegex = new(DefaultPatchPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
-        private static readonly Regex DefaultNoBumpPatternRegex = new(DefaultNoBumpPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
-        public VersionField? DetermineIncrementedField(IGitRepository repository, GitVersionContext context, BaseVersion baseVersion)
+        var commitMessageIncrement = FindCommitMessageIncrement(repository, context, baseVersion.BaseVersionSource);
+
+        var defaultIncrement = context.Configuration?.Increment.ToVersionField();
+
+        // use the default branch config increment strategy if there are no commit message overrides
+        if (commitMessageIncrement == null)
         {
-            var commitMessageIncrement = FindCommitMessageIncrement(repository, context, baseVersion.BaseVersionSource);
-
-            var defaultIncrement = context.Configuration?.Increment.ToVersionField();
-
-            // use the default branch config increment strategy if there are no commit message overrides
-            if (commitMessageIncrement == null)
-            {
-                return baseVersion.ShouldIncrement ? defaultIncrement : null;
-            }
-
-            // cap the commit message severity to minor for alpha versions
-            if (baseVersion.SemanticVersion < new SemanticVersion(1) && commitMessageIncrement > VersionField.Minor)
-            {
-                commitMessageIncrement = VersionField.Minor;
-            }
-
-            // don't increment for less than the branch config increment, if the absence of commit messages would have
-            // still resulted in an increment of configuration.Increment
-            if (baseVersion.ShouldIncrement && commitMessageIncrement < defaultIncrement)
-            {
-                return defaultIncrement;
-            }
-
-            return commitMessageIncrement;
+            return baseVersion.ShouldIncrement ? defaultIncrement : null;
         }
 
-        public VersionField? GetIncrementForCommits(GitVersionContext context, IEnumerable<ICommit> commits)
+        // cap the commit message severity to minor for alpha versions
+        if (baseVersion.SemanticVersion < new SemanticVersion(1) && commitMessageIncrement > VersionField.Minor)
         {
-            var majorRegex = TryGetRegexOrDefault(context.Configuration?.MajorVersionBumpMessage, DefaultMajorPatternRegex);
-            var minorRegex = TryGetRegexOrDefault(context.Configuration?.MinorVersionBumpMessage, DefaultMinorPatternRegex);
-            var patchRegex = TryGetRegexOrDefault(context.Configuration?.PatchVersionBumpMessage, DefaultPatchPatternRegex);
-            var none = TryGetRegexOrDefault(context.Configuration?.NoBumpMessage, DefaultNoBumpPatternRegex);
-
-            var increments = commits
-                .Select(c => GetIncrementFromCommit(c, majorRegex, minorRegex, patchRegex, none))
-                .Where(v => v != null)
-                .Select(v => v!.Value)
-                .ToList();
-
-            if (increments.Any())
-            {
-                return increments.Max();
-            }
-
-            return null;
+            commitMessageIncrement = VersionField.Minor;
         }
 
-        private VersionField? FindCommitMessageIncrement(IGitRepository repository, GitVersionContext context, ICommit? baseCommit)
+        // don't increment for less than the branch config increment, if the absence of commit messages would have
+        // still resulted in an increment of configuration.Increment
+        if (baseVersion.ShouldIncrement && commitMessageIncrement < defaultIncrement)
         {
-            if (baseCommit == null) return null;
+            return defaultIncrement;
+        }
 
-            if (context.Configuration?.CommitMessageIncrementing == CommitMessageIncrementMode.Disabled)
-            {
-                return null;
-            }
+        return commitMessageIncrement;
+    }
 
-            var commits = GetIntermediateCommits(repository, baseCommit, context.CurrentCommit);
+    public VersionField? GetIncrementForCommits(GitVersionContext context, IEnumerable<ICommit> commits)
+    {
+        var majorRegex = TryGetRegexOrDefault(context.Configuration?.MajorVersionBumpMessage, DefaultMajorPatternRegex);
+        var minorRegex = TryGetRegexOrDefault(context.Configuration?.MinorVersionBumpMessage, DefaultMinorPatternRegex);
+        var patchRegex = TryGetRegexOrDefault(context.Configuration?.PatchVersionBumpMessage, DefaultPatchPatternRegex);
+        var none = TryGetRegexOrDefault(context.Configuration?.NoBumpMessage, DefaultNoBumpPatternRegex);
+
+        var increments = commits
+            .Select(c => GetIncrementFromCommit(c, majorRegex, minorRegex, patchRegex, none))
+            .Where(v => v != null)
+            .Select(v => v!.Value)
+            .ToList();
+
+        if (increments.Any())
+        {
+            return increments.Max();
+        }
 
-            if (context.Configuration?.CommitMessageIncrementing == CommitMessageIncrementMode.MergeMessageOnly)
-            {
-                commits = commits.Where(c => c.Parents.Count() > 1);
-            }
+        return null;
+    }
 
-            return GetIncrementForCommits(context, commits);
-        }
+    private VersionField? FindCommitMessageIncrement(IGitRepository repository, GitVersionContext context, ICommit? baseCommit)
+    {
+        if (baseCommit == null) return null;
 
-        private static Regex TryGetRegexOrDefault(string? messageRegex, Regex defaultRegex)
+        if (context.Configuration?.CommitMessageIncrementing == CommitMessageIncrementMode.Disabled)
         {
-            if (messageRegex == null)
-            {
-                return defaultRegex;
-            }
-
-            return CompiledRegexCache.GetOrAdd(messageRegex, pattern => new Regex(pattern, RegexOptions.Compiled | RegexOptions.IgnoreCase));
+            return null;
         }
 
-        /// <summary>
-        /// Get the sequence of commits in a <paramref name="repo"/> between a <paramref name="baseCommit"/> (exclusive)
-        /// and a particular <paramref name="headCommit"/> (inclusive)
-        /// </summary>
-        private IEnumerable<ICommit> GetIntermediateCommits(IGitRepository repo, ICommit baseCommit, ICommit? headCommit)
+        var commits = GetIntermediateCommits(repository, baseCommit, context.CurrentCommit);
+
+        if (context.Configuration?.CommitMessageIncrementing == CommitMessageIncrementMode.MergeMessageOnly)
         {
-            var map = GetHeadCommitsMap(repo, headCommit);
-            if (!map.TryGetValue(baseCommit.Sha, out var baseIndex)) return Enumerable.Empty<ICommit>();
-            var commitAfterBaseIndex = baseIndex + 1;
-            var headCommits = GetHeadCommits(repo, headCommit);
-            return new ArraySegment<ICommit>(headCommits, commitAfterBaseIndex, headCommits.Length - commitAfterBaseIndex);
+            commits = commits.Where(c => c.Parents.Count() > 1);
         }
 
-        /// <summary>
-        /// Get a mapping of commit shas to their zero-based position in the sequence of commits from the beginning of a
-        /// <paramref name="repo"/> to a particular <paramref name="headCommit"/>
-        /// </summary>
-        private Dictionary<string, int> GetHeadCommitsMap(IGitRepository repo, ICommit? headCommit) =>
-            this.headCommitsMapCache.GetOrAdd(headCommit?.Sha ?? "NULL", () =>
-                GetHeadCommits(repo, headCommit)
-                    .Select((commit, index) => (Sha: commit.Sha, Index: index))
-                    .ToDictionary(t => t.Sha, t => t.Index));
-
-        /// <summary>
-        /// Get the sequence of commits from the beginning of a <paramref name="repo"/> to a particular
-        /// <paramref name="headCommit"/> (inclusive)
-        /// </summary>
-        private ICommit[] GetHeadCommits(IGitRepository repo, ICommit? headCommit) =>
-            this.headCommitsCache.GetOrAdd(headCommit?.Sha ?? "NULL", () =>
-                GetCommitsReacheableFromHead(repo, headCommit).ToArray());
-
-        private VersionField? GetIncrementFromCommit(ICommit commit, Regex majorRegex, Regex minorRegex, Regex patchRegex, Regex none) =>
-            this.commitIncrementCache.GetOrAdd(commit.Sha, () =>
-                GetIncrementFromMessage(commit.Message, majorRegex, minorRegex, patchRegex, none));
-
-        private static VersionField? GetIncrementFromMessage(string message, Regex majorRegex, Regex minorRegex, Regex patchRegex, Regex none)
+        return GetIncrementForCommits(context, commits);
+    }
+
+    private static Regex TryGetRegexOrDefault(string? messageRegex, Regex defaultRegex)
+    {
+        if (messageRegex == null)
         {
-            if (majorRegex.IsMatch(message)) return VersionField.Major;
-            if (minorRegex.IsMatch(message)) return VersionField.Minor;
-            if (patchRegex.IsMatch(message)) return VersionField.Patch;
-            if (none.IsMatch(message)) return VersionField.None;
-            return null;
+            return defaultRegex;
         }
 
-        /// <summary>
-        /// Query a <paramref name="repo"/> for the sequence of commits from the beginning to a particular
-        /// <paramref name="headCommit"/> (inclusive)
-        /// </summary>
-        private static IEnumerable<ICommit> GetCommitsReacheableFromHead(IGitRepository repo, ICommit? headCommit)
+        return CompiledRegexCache.GetOrAdd(messageRegex, pattern => new Regex(pattern, RegexOptions.Compiled | RegexOptions.IgnoreCase));
+    }
+
+    /// <summary>
+    /// Get the sequence of commits in a <paramref name="repo"/> between a <paramref name="baseCommit"/> (exclusive)
+    /// and a particular <paramref name="headCommit"/> (inclusive)
+    /// </summary>
+    private IEnumerable<ICommit> GetIntermediateCommits(IGitRepository repo, ICommit baseCommit, ICommit? headCommit)
+    {
+        var map = GetHeadCommitsMap(repo, headCommit);
+        if (!map.TryGetValue(baseCommit.Sha, out var baseIndex)) return Enumerable.Empty<ICommit>();
+        var commitAfterBaseIndex = baseIndex + 1;
+        var headCommits = GetHeadCommits(repo, headCommit);
+        return new ArraySegment<ICommit>(headCommits, commitAfterBaseIndex, headCommits.Length - commitAfterBaseIndex);
+    }
+
+    /// <summary>
+    /// Get a mapping of commit shas to their zero-based position in the sequence of commits from the beginning of a
+    /// <paramref name="repo"/> to a particular <paramref name="headCommit"/>
+    /// </summary>
+    private Dictionary<string, int> GetHeadCommitsMap(IGitRepository repo, ICommit? headCommit) =>
+        this.headCommitsMapCache.GetOrAdd(headCommit?.Sha ?? "NULL", () =>
+            GetHeadCommits(repo, headCommit)
+                .Select((commit, index) => (Sha: commit.Sha, Index: index))
+                .ToDictionary(t => t.Sha, t => t.Index));
+
+    /// <summary>
+    /// Get the sequence of commits from the beginning of a <paramref name="repo"/> to a particular
+    /// <paramref name="headCommit"/> (inclusive)
+    /// </summary>
+    private ICommit[] GetHeadCommits(IGitRepository repo, ICommit? headCommit) =>
+        this.headCommitsCache.GetOrAdd(headCommit?.Sha ?? "NULL", () =>
+            GetCommitsReacheableFromHead(repo, headCommit).ToArray());
+
+    private VersionField? GetIncrementFromCommit(ICommit commit, Regex majorRegex, Regex minorRegex, Regex patchRegex, Regex none) =>
+        this.commitIncrementCache.GetOrAdd(commit.Sha, () =>
+            GetIncrementFromMessage(commit.Message, majorRegex, minorRegex, patchRegex, none));
+
+    private static VersionField? GetIncrementFromMessage(string message, Regex majorRegex, Regex minorRegex, Regex patchRegex, Regex none)
+    {
+        if (majorRegex.IsMatch(message)) return VersionField.Major;
+        if (minorRegex.IsMatch(message)) return VersionField.Minor;
+        if (patchRegex.IsMatch(message)) return VersionField.Patch;
+        if (none.IsMatch(message)) return VersionField.None;
+        return null;
+    }
+
+    /// <summary>
+    /// Query a <paramref name="repo"/> for the sequence of commits from the beginning to a particular
+    /// <paramref name="headCommit"/> (inclusive)
+    /// </summary>
+    private static IEnumerable<ICommit> GetCommitsReacheableFromHead(IGitRepository repo, ICommit? headCommit)
+    {
+        var filter = new CommitFilter
         {
-            var filter = new CommitFilter
-            {
-                IncludeReachableFrom = headCommit,
-                SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Reverse
-            };
+            IncludeReachableFrom = headCommit,
+            SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Reverse
+        };
 
-            return repo.Commits.QueryBy(filter);
-        }
+        return repo.Commits.QueryBy(filter);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs
index 8d4fe803ba..d459916e0b 100644
--- a/src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs
+++ b/src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs
@@ -7,286 +7,285 @@
 using GitVersion.Extensions;
 using GitVersion.Logging;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+internal class MainlineVersionCalculator : IMainlineVersionCalculator
 {
-    internal class MainlineVersionCalculator : IMainlineVersionCalculator
+    private readonly ILog log;
+    private readonly IRepositoryStore repositoryStore;
+    private readonly Lazy<GitVersionContext> versionContext;
+    private readonly IIncrementStrategyFinder incrementStrategyFinder;
+    private GitVersionContext context => this.versionContext.Value;
+
+    public MainlineVersionCalculator(ILog log, IRepositoryStore repositoryStore, Lazy<GitVersionContext> versionContext, IIncrementStrategyFinder incrementStrategyFinder)
     {
-        private readonly ILog log;
-        private readonly IRepositoryStore repositoryStore;
-        private readonly Lazy<GitVersionContext> versionContext;
-        private readonly IIncrementStrategyFinder incrementStrategyFinder;
-        private GitVersionContext context => this.versionContext.Value;
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
+        this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
+        this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
+        this.incrementStrategyFinder = incrementStrategyFinder ?? throw new ArgumentNullException(nameof(incrementStrategyFinder));
+    }
 
-        public MainlineVersionCalculator(ILog log, IRepositoryStore repositoryStore, Lazy<GitVersionContext> versionContext, IIncrementStrategyFinder incrementStrategyFinder)
+    public SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion)
+    {
+        if (baseVersion.SemanticVersion.PreReleaseTag?.HasTag() == true)
         {
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
-            this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
-            this.incrementStrategyFinder = incrementStrategyFinder ?? throw new ArgumentNullException(nameof(incrementStrategyFinder));
+            throw new NotSupportedException("Mainline development mode doesn't yet support pre-release tags on main");
         }
 
-        public SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion)
+        using (this.log.IndentLog("Using mainline development mode to calculate current version"))
         {
-            if (baseVersion.SemanticVersion.PreReleaseTag?.HasTag() == true)
-            {
-                throw new NotSupportedException("Mainline development mode doesn't yet support pre-release tags on main");
-            }
+            var mainlineVersion = baseVersion.SemanticVersion;
 
-            using (this.log.IndentLog("Using mainline development mode to calculate current version"))
-            {
-                var mainlineVersion = baseVersion.SemanticVersion;
-
-                // Forward merge / PR
-                //          * feature/foo
-                //         / |
-                // main *  *
-                //
+            // Forward merge / PR
+            //          * feature/foo
+            //         / |
+            // main *  *
+            //
 
-                var mergeBase = baseVersion.BaseVersionSource;
-                var mainline = GetMainline(baseVersion.BaseVersionSource);
-                var mainlineTip = mainline.Tip;
+            var mergeBase = baseVersion.BaseVersionSource;
+            var mainline = GetMainline(baseVersion.BaseVersionSource);
+            var mainlineTip = mainline.Tip;
 
-                // when the current branch is not mainline, find the effective mainline tip for versioning the branch
-                if (!context.CurrentBranch!.Equals(mainline))
-                {
-                    mergeBase = FindMergeBaseBeforeForwardMerge(baseVersion.BaseVersionSource, mainline, out mainlineTip);
-                    this.log.Info($"Current branch ({context.CurrentBranch}) was branch from {mergeBase}");
-                }
+            // when the current branch is not mainline, find the effective mainline tip for versioning the branch
+            if (!context.CurrentBranch!.Equals(mainline))
+            {
+                mergeBase = FindMergeBaseBeforeForwardMerge(baseVersion.BaseVersionSource, mainline, out mainlineTip);
+                this.log.Info($"Current branch ({context.CurrentBranch}) was branch from {mergeBase}");
+            }
 
-                var mainlineCommitLog = this.repositoryStore.GetMainlineCommitLog(baseVersion.BaseVersionSource, mainlineTip).ToList();
-                var directCommits = new List<ICommit>(mainlineCommitLog.Count);
+            var mainlineCommitLog = this.repositoryStore.GetMainlineCommitLog(baseVersion.BaseVersionSource, mainlineTip).ToList();
+            var directCommits = new List<ICommit>(mainlineCommitLog.Count);
 
-                var nextVersion = context.Configuration?.NextVersion;
-                if (nextVersion.IsNullOrEmpty())
+            var nextVersion = context.Configuration?.NextVersion;
+            if (nextVersion.IsNullOrEmpty())
+            {
+                // Scans commit log in reverse, aggregating merge commits
+                foreach (var commit in mainlineCommitLog)
                 {
-                    // Scans commit log in reverse, aggregating merge commits
-                    foreach (var commit in mainlineCommitLog)
+                    directCommits.Add(commit);
+                    if (commit.Parents.Count() > 1)
                     {
-                        directCommits.Add(commit);
-                        if (commit.Parents.Count() > 1)
-                        {
-                            mainlineVersion = AggregateMergeCommitIncrement(commit, directCommits, mainlineVersion, mainline);
-                        }
+                        mainlineVersion = AggregateMergeCommitIncrement(commit, directCommits, mainlineVersion, mainline);
                     }
-
-                    // This will increment for any direct commits on mainline
-                    mainlineVersion = IncrementForEachCommit(directCommits, mainlineVersion, mainline);
                 }
 
-                mainlineVersion.BuildMetaData = CreateVersionBuildMetaData(mergeBase);
+                // This will increment for any direct commits on mainline
+                mainlineVersion = IncrementForEachCommit(directCommits, mainlineVersion, mainline);
+            }
 
-                // branches other than main always get a bump for the act of branching
-                if (!context.CurrentBranch.Equals(mainline) && nextVersion.IsNullOrEmpty())
-                {
-                    var branchIncrement = FindMessageIncrement(null, context.CurrentCommit, mergeBase, mainlineCommitLog);
-                    this.log.Info($"Performing {branchIncrement} increment for current branch ");
+            mainlineVersion.BuildMetaData = CreateVersionBuildMetaData(mergeBase);
 
-                    mainlineVersion = mainlineVersion.IncrementVersion(branchIncrement);
-                }
+            // branches other than main always get a bump for the act of branching
+            if (!context.CurrentBranch.Equals(mainline) && nextVersion.IsNullOrEmpty())
+            {
+                var branchIncrement = FindMessageIncrement(null, context.CurrentCommit, mergeBase, mainlineCommitLog);
+                this.log.Info($"Performing {branchIncrement} increment for current branch ");
 
-                return mainlineVersion;
+                mainlineVersion = mainlineVersion.IncrementVersion(branchIncrement);
             }
-        }
-
-        public SemanticVersionBuildMetaData CreateVersionBuildMetaData(ICommit? baseVersionSource)
-        {
-            var commitLog = this.repositoryStore.GetCommitLog(baseVersionSource, context.CurrentCommit);
-            var commitsSinceTag = commitLog.Count();
-            this.log.Info($"{commitsSinceTag} commits found between {baseVersionSource} and {context.CurrentCommit}");
-
-            var shortSha = context.CurrentCommit?.Id.ToString(7);
-            return new SemanticVersionBuildMetaData(
-                baseVersionSource?.Sha,
-                commitsSinceTag,
-                context.CurrentBranch?.Name.Friendly,
-                context.CurrentCommit?.Sha,
-                shortSha,
-                context.CurrentCommit?.When,
-                context.NumberOfUncommittedChanges);
-        }
 
-
-        private SemanticVersion AggregateMergeCommitIncrement(ICommit commit, List<ICommit> directCommits, SemanticVersion mainlineVersion, IBranch mainline)
-        {
-            // Merge commit, process all merged commits as a batch
-            var mergeCommit = commit;
-            var mergedHead = GetMergedHead(mergeCommit);
-            var findMergeBase = this.repositoryStore.FindMergeBase(mergeCommit.Parents.First(), mergedHead);
-            var findMessageIncrement = FindMessageIncrement(mergeCommit, mergedHead, findMergeBase, directCommits);
-
-            // If this collection is not empty there has been some direct commits against main
-            // Treat each commit as it's own 'release', we need to do this before we increment the branch
-            mainlineVersion = IncrementForEachCommit(directCommits, mainlineVersion, mainline);
-            directCommits.Clear();
-
-            // Finally increment for the branch
-            mainlineVersion = mainlineVersion.IncrementVersion(findMessageIncrement);
-            this.log.Info($"Merge commit {mergeCommit} incremented base versions {findMessageIncrement}, now {mainlineVersion}");
             return mainlineVersion;
         }
+    }
 
-        private IBranch GetMainline(ICommit? baseVersionSource)
-        {
-            var mainlineBranchConfigs = context.FullConfiguration?.Branches.Where(b => b.Value?.IsMainline == true).ToList();
-            var mainlineBranches = this.repositoryStore.GetMainlineBranches(context.CurrentCommit!, mainlineBranchConfigs);
-
-            var allMainlines = mainlineBranches.Values.SelectMany(branches => branches.Select(b => b.Name.Friendly));
-            this.log.Info("Found possible mainline branches: " + string.Join(", ", allMainlines));
+    public SemanticVersionBuildMetaData CreateVersionBuildMetaData(ICommit? baseVersionSource)
+    {
+        var commitLog = this.repositoryStore.GetCommitLog(baseVersionSource, context.CurrentCommit);
+        var commitsSinceTag = commitLog.Count();
+        this.log.Info($"{commitsSinceTag} commits found between {baseVersionSource} and {context.CurrentCommit}");
+
+        var shortSha = context.CurrentCommit?.Id.ToString(7);
+        return new SemanticVersionBuildMetaData(
+            baseVersionSource?.Sha,
+            commitsSinceTag,
+            context.CurrentBranch?.Name.Friendly,
+            context.CurrentCommit?.Sha,
+            shortSha,
+            context.CurrentCommit?.When,
+            context.NumberOfUncommittedChanges);
+    }
 
-            // Find closest mainline branch
-            var firstMatchingCommit = context.CurrentBranch?.Commits.First(c => mainlineBranches.ContainsKey(c.Sha));
-            var possibleMainlineBranches = mainlineBranches[firstMatchingCommit!.Sha];
 
-            if (possibleMainlineBranches.Count == 1)
-            {
-                var mainlineBranch = possibleMainlineBranches[0];
-                this.log.Info($"Mainline for current branch is {mainlineBranch}");
-                return mainlineBranch;
-            }
+    private SemanticVersion AggregateMergeCommitIncrement(ICommit commit, List<ICommit> directCommits, SemanticVersion mainlineVersion, IBranch mainline)
+    {
+        // Merge commit, process all merged commits as a batch
+        var mergeCommit = commit;
+        var mergedHead = GetMergedHead(mergeCommit);
+        var findMergeBase = this.repositoryStore.FindMergeBase(mergeCommit.Parents.First(), mergedHead);
+        var findMessageIncrement = FindMessageIncrement(mergeCommit, mergedHead, findMergeBase, directCommits);
+
+        // If this collection is not empty there has been some direct commits against main
+        // Treat each commit as it's own 'release', we need to do this before we increment the branch
+        mainlineVersion = IncrementForEachCommit(directCommits, mainlineVersion, mainline);
+        directCommits.Clear();
+
+        // Finally increment for the branch
+        mainlineVersion = mainlineVersion.IncrementVersion(findMessageIncrement);
+        this.log.Info($"Merge commit {mergeCommit} incremented base versions {findMessageIncrement}, now {mainlineVersion}");
+        return mainlineVersion;
+    }
 
-            // prefer current branch, if it is a mainline branch
-            if (possibleMainlineBranches.Any(context.CurrentBranch!.Equals))
-            {
-                this.log.Info($"Choosing {context.CurrentBranch} as mainline because it is the current branch");
-                return context.CurrentBranch;
-            }
+    private IBranch GetMainline(ICommit? baseVersionSource)
+    {
+        var mainlineBranchConfigs = context.FullConfiguration?.Branches.Where(b => b.Value?.IsMainline == true).ToList();
+        var mainlineBranches = this.repositoryStore.GetMainlineBranches(context.CurrentCommit!, mainlineBranchConfigs);
 
-            // prefer a branch on which the merge base was a direct commit, if there is such a branch
-            var firstMatchingCommitBranch = possibleMainlineBranches.FirstOrDefault(b => this.repositoryStore.IsCommitOnBranch(baseVersionSource, b, firstMatchingCommit));
-            if (firstMatchingCommitBranch != null)
-            {
-                var message = string.Format(
-                    "Choosing {0} as mainline because {1}'s merge base was a direct commit to {0}",
-                    firstMatchingCommitBranch,
-                    context.CurrentBranch);
-                this.log.Info(message);
+        var allMainlines = mainlineBranches.Values.SelectMany(branches => branches.Select(b => b.Name.Friendly));
+        this.log.Info("Found possible mainline branches: " + string.Join(", ", allMainlines));
 
-                return firstMatchingCommitBranch;
-            }
+        // Find closest mainline branch
+        var firstMatchingCommit = context.CurrentBranch?.Commits.First(c => mainlineBranches.ContainsKey(c.Sha));
+        var possibleMainlineBranches = mainlineBranches[firstMatchingCommit!.Sha];
 
-            var chosenMainline = possibleMainlineBranches[0];
-            this.log.Info($"Multiple mainlines ({string.Join(", ", possibleMainlineBranches.Select(b => b))}) have the same merge base for the current branch, choosing {chosenMainline} because we found that branch first...");
-            return chosenMainline;
+        if (possibleMainlineBranches.Count == 1)
+        {
+            var mainlineBranch = possibleMainlineBranches[0];
+            this.log.Info($"Mainline for current branch is {mainlineBranch}");
+            return mainlineBranch;
         }
 
+        // prefer current branch, if it is a mainline branch
+        if (possibleMainlineBranches.Any(context.CurrentBranch!.Equals))
+        {
+            this.log.Info($"Choosing {context.CurrentBranch} as mainline because it is the current branch");
+            return context.CurrentBranch;
+        }
 
-        /// <summary>
-        /// Gets the commit on mainline at which <paramref name="mergeBase"/> was fully integrated.
-        /// </summary>
-        /// <param name="mainlineCommitLog">The collection of commits made directly to mainline, in reverse order.</param>
-        /// <param name="mergeBase">The best possible merge base between <paramref name="mainlineTip"/> and the current commit.</param>
-        /// <param name="mainlineTip">The tip of the mainline branch.</param>
-        /// <returns>The commit on mainline at which <paramref name="mergeBase"/> was merged, if such a commit exists; otherwise, <paramref name="mainlineTip"/>.</returns>
-        /// <remarks>
-        /// This method gets the most recent commit on mainline that should be considered for versioning the current branch.
-        /// </remarks>
-        private ICommit? GetEffectiveMainlineTip(IEnumerable<ICommit> mainlineCommitLog, ICommit mergeBase, ICommit? mainlineTip)
+        // prefer a branch on which the merge base was a direct commit, if there is such a branch
+        var firstMatchingCommitBranch = possibleMainlineBranches.FirstOrDefault(b => this.repositoryStore.IsCommitOnBranch(baseVersionSource, b, firstMatchingCommit));
+        if (firstMatchingCommitBranch != null)
         {
-            // find the commit that merged mergeBase into mainline
-            foreach (var commit in mainlineCommitLog)
-            {
-                if (Equals(commit, mergeBase) || commit.Parents.Contains(mergeBase))
-                {
-                    this.log.Info($"Found branch merge point; choosing {commit} as effective mainline tip");
-                    return commit;
-                }
-            }
+            var message = string.Format(
+                "Choosing {0} as mainline because {1}'s merge base was a direct commit to {0}",
+                firstMatchingCommitBranch,
+                context.CurrentBranch);
+            this.log.Info(message);
 
-            return mainlineTip;
+            return firstMatchingCommitBranch;
         }
 
-        /// <summary>
-        /// Gets the best possible merge base between the current commit and <paramref name="mainline"/> that is not the child of a forward merge.
-        /// </summary>
-        /// <param name="baseVersionSource">The commit that establishes the contextual base version.</param>
-        /// <param name="mainline">The mainline branch.</param>
-        /// <param name="mainlineTip">The commit on mainline at which the returned merge base was fully integrated.</param>
-        /// <returns>The best possible merge base between the current commit and <paramref name="mainline"/> that is not the child of a forward merge.</returns>
-        private ICommit FindMergeBaseBeforeForwardMerge(ICommit? baseVersionSource, IBranch mainline, [NotNullWhen(true)] out ICommit? mainlineTip)
-        {
-            var mergeBase = this.repositoryStore.FindMergeBase(context.CurrentCommit!, mainline.Tip!);
-            var mainlineCommitLog = this.repositoryStore.GetMainlineCommitLog(baseVersionSource, mainline.Tip).ToList();
+        var chosenMainline = possibleMainlineBranches[0];
+        this.log.Info($"Multiple mainlines ({string.Join(", ", possibleMainlineBranches.Select(b => b))}) have the same merge base for the current branch, choosing {chosenMainline} because we found that branch first...");
+        return chosenMainline;
+    }
 
-            // find the mainline commit effective for versioning the current branch
-            mainlineTip = GetEffectiveMainlineTip(mainlineCommitLog, mergeBase, mainline.Tip);
 
-            // detect forward merge and rewind mainlineTip to before it
-            if (Equals(mergeBase, context.CurrentCommit) && !mainlineCommitLog.Contains(mergeBase))
+    /// <summary>
+    /// Gets the commit on mainline at which <paramref name="mergeBase"/> was fully integrated.
+    /// </summary>
+    /// <param name="mainlineCommitLog">The collection of commits made directly to mainline, in reverse order.</param>
+    /// <param name="mergeBase">The best possible merge base between <paramref name="mainlineTip"/> and the current commit.</param>
+    /// <param name="mainlineTip">The tip of the mainline branch.</param>
+    /// <returns>The commit on mainline at which <paramref name="mergeBase"/> was merged, if such a commit exists; otherwise, <paramref name="mainlineTip"/>.</returns>
+    /// <remarks>
+    /// This method gets the most recent commit on mainline that should be considered for versioning the current branch.
+    /// </remarks>
+    private ICommit? GetEffectiveMainlineTip(IEnumerable<ICommit> mainlineCommitLog, ICommit mergeBase, ICommit? mainlineTip)
+    {
+        // find the commit that merged mergeBase into mainline
+        foreach (var commit in mainlineCommitLog)
+        {
+            if (Equals(commit, mergeBase) || commit.Parents.Contains(mergeBase))
             {
-                var mainlineTipPrevious = mainlineTip?.Parents.FirstOrDefault();
-                if (mainlineTipPrevious != null)
-                {
-                    var message = $"Detected forward merge at {mainlineTip}; rewinding mainline to previous commit {mainlineTipPrevious}";
+                this.log.Info($"Found branch merge point; choosing {commit} as effective mainline tip");
+                return commit;
+            }
+        }
 
-                    this.log.Info(message);
+        return mainlineTip;
+    }
 
-                    // re-do mergeBase detection before the forward merge
-                    mergeBase = this.repositoryStore.FindMergeBase(context.CurrentCommit, mainlineTipPrevious);
-                    mainlineTip = GetEffectiveMainlineTip(mainlineCommitLog, mergeBase, mainlineTipPrevious);
-                }
-            }
+    /// <summary>
+    /// Gets the best possible merge base between the current commit and <paramref name="mainline"/> that is not the child of a forward merge.
+    /// </summary>
+    /// <param name="baseVersionSource">The commit that establishes the contextual base version.</param>
+    /// <param name="mainline">The mainline branch.</param>
+    /// <param name="mainlineTip">The commit on mainline at which the returned merge base was fully integrated.</param>
+    /// <returns>The best possible merge base between the current commit and <paramref name="mainline"/> that is not the child of a forward merge.</returns>
+    private ICommit FindMergeBaseBeforeForwardMerge(ICommit? baseVersionSource, IBranch mainline, [NotNullWhen(true)] out ICommit? mainlineTip)
+    {
+        var mergeBase = this.repositoryStore.FindMergeBase(context.CurrentCommit!, mainline.Tip!);
+        var mainlineCommitLog = this.repositoryStore.GetMainlineCommitLog(baseVersionSource, mainline.Tip).ToList();
 
-            return mergeBase;
-        }
+        // find the mainline commit effective for versioning the current branch
+        mainlineTip = GetEffectiveMainlineTip(mainlineCommitLog, mergeBase, mainline.Tip);
 
-        private SemanticVersion IncrementForEachCommit(IEnumerable<ICommit> directCommits, SemanticVersion mainlineVersion, IBranch mainline)
+        // detect forward merge and rewind mainlineTip to before it
+        if (Equals(mergeBase, context.CurrentCommit) && !mainlineCommitLog.Contains(mergeBase))
         {
-            foreach (var directCommit in directCommits)
+            var mainlineTipPrevious = mainlineTip?.Parents.FirstOrDefault();
+            if (mainlineTipPrevious != null)
             {
-                var directCommitIncrement = this.incrementStrategyFinder.GetIncrementForCommits(context, new[] { directCommit })
-                                            ?? FindDefaultIncrementForBranch(context, mainline.Name.Friendly);
-                mainlineVersion = mainlineVersion.IncrementVersion(directCommitIncrement);
-                this.log.Info($"Direct commit on main {directCommit} incremented base versions {directCommitIncrement}, now {mainlineVersion}");
-            }
+                var message = $"Detected forward merge at {mainlineTip}; rewinding mainline to previous commit {mainlineTipPrevious}";
 
-            return mainlineVersion;
+                this.log.Info(message);
+
+                // re-do mergeBase detection before the forward merge
+                mergeBase = this.repositoryStore.FindMergeBase(context.CurrentCommit, mainlineTipPrevious);
+                mainlineTip = GetEffectiveMainlineTip(mainlineCommitLog, mergeBase, mainlineTipPrevious);
+            }
         }
 
-        private VersionField FindMessageIncrement(ICommit? mergeCommit, ICommit? mergedHead, ICommit? findMergeBase, List<ICommit> commitLog)
+        return mergeBase;
+    }
+
+    private SemanticVersion IncrementForEachCommit(IEnumerable<ICommit> directCommits, SemanticVersion mainlineVersion, IBranch mainline)
+    {
+        foreach (var directCommit in directCommits)
         {
-            var commits = this.repositoryStore.GetMergeBaseCommits(mergeCommit, mergedHead, findMergeBase);
-            commitLog.RemoveAll(c => commits.Any(c1 => c1.Sha == c.Sha));
-            return this.incrementStrategyFinder.GetIncrementForCommits(context, commits)
-                   ?? TryFindIncrementFromMergeMessage(mergeCommit);
+            var directCommitIncrement = this.incrementStrategyFinder.GetIncrementForCommits(context, new[] { directCommit })
+                                        ?? FindDefaultIncrementForBranch(context, mainline.Name.Friendly);
+            mainlineVersion = mainlineVersion.IncrementVersion(directCommitIncrement);
+            this.log.Info($"Direct commit on main {directCommit} incremented base versions {directCommitIncrement}, now {mainlineVersion}");
         }
 
-        private VersionField TryFindIncrementFromMergeMessage(ICommit? mergeCommit)
+        return mainlineVersion;
+    }
+
+    private VersionField FindMessageIncrement(ICommit? mergeCommit, ICommit? mergedHead, ICommit? findMergeBase, List<ICommit> commitLog)
+    {
+        var commits = this.repositoryStore.GetMergeBaseCommits(mergeCommit, mergedHead, findMergeBase);
+        commitLog.RemoveAll(c => commits.Any(c1 => c1.Sha == c.Sha));
+        return this.incrementStrategyFinder.GetIncrementForCommits(context, commits)
+               ?? TryFindIncrementFromMergeMessage(mergeCommit);
+    }
+
+    private VersionField TryFindIncrementFromMergeMessage(ICommit? mergeCommit)
+    {
+        if (mergeCommit != null)
         {
-            if (mergeCommit != null)
+            var mergeMessage = new MergeMessage(mergeCommit.Message, context.FullConfiguration);
+            if (mergeMessage.MergedBranch != null)
             {
-                var mergeMessage = new MergeMessage(mergeCommit.Message, context.FullConfiguration);
-                if (mergeMessage.MergedBranch != null)
+                var config = context.FullConfiguration?.GetConfigForBranch(mergeMessage.MergedBranch);
+                if (config?.Increment != null && config.Increment != IncrementStrategy.Inherit)
                 {
-                    var config = context.FullConfiguration?.GetConfigForBranch(mergeMessage.MergedBranch);
-                    if (config?.Increment != null && config.Increment != IncrementStrategy.Inherit)
-                    {
-                        return config.Increment.Value.ToVersionField();
-                    }
+                    return config.Increment.Value.ToVersionField();
                 }
             }
-
-            // Fallback to config increment value
-            return FindDefaultIncrementForBranch(context);
         }
 
-        private static VersionField FindDefaultIncrementForBranch(GitVersionContext context, string? branch = null)
-        {
-            var config = context.FullConfiguration?.GetConfigForBranch(branch ?? context.CurrentBranch?.Name.WithoutRemote);
-            if (config?.Increment != null && config.Increment != IncrementStrategy.Inherit)
-            {
-                return config.Increment.Value.ToVersionField();
-            }
-
-            // Fallback to patch
-            return VersionField.Patch;
-        }
+        // Fallback to config increment value
+        return FindDefaultIncrementForBranch(context);
+    }
 
-        private static ICommit GetMergedHead(ICommit mergeCommit)
+    private static VersionField FindDefaultIncrementForBranch(GitVersionContext context, string? branch = null)
+    {
+        var config = context.FullConfiguration?.GetConfigForBranch(branch ?? context.CurrentBranch?.Name.WithoutRemote);
+        if (config?.Increment != null && config.Increment != IncrementStrategy.Inherit)
         {
-            var parents = mergeCommit.Parents.Skip(1).ToList();
-            if (parents.Count > 1)
-                throw new NotSupportedException("Mainline development does not support more than one merge source in a single commit yet");
-            return parents.Single();
+            return config.Increment.Value.ToVersionField();
         }
+
+        // Fallback to patch
+        return VersionField.Patch;
+    }
+
+    private static ICommit GetMergedHead(ICommit mergeCommit)
+    {
+        var parents = mergeCommit.Parents.Skip(1).ToList();
+        if (parents.Count > 1)
+            throw new NotSupportedException("Mainline development does not support more than one merge source in a single commit yet");
+        return parents.Single();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/MinDateVersionFilter.cs b/src/GitVersion.Core/VersionCalculation/MinDateVersionFilter.cs
index 4cfaba156b..2ad846f2e7 100644
--- a/src/GitVersion.Core/VersionCalculation/MinDateVersionFilter.cs
+++ b/src/GitVersion.Core/VersionCalculation/MinDateVersionFilter.cs
@@ -1,28 +1,27 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 
-namespace GitVersion.VersionCalculation
-{
-    public class MinDateVersionFilter : IVersionFilter
-    {
-        private readonly DateTimeOffset minimum;
+namespace GitVersion.VersionCalculation;
 
-        public MinDateVersionFilter(DateTimeOffset minimum) => this.minimum = minimum;
+public class MinDateVersionFilter : IVersionFilter
+{
+    private readonly DateTimeOffset minimum;
 
-        public bool Exclude(BaseVersion version, [NotNullWhen(true)] out string? reason)
-        {
-            if (version == null) throw new ArgumentNullException(nameof(version));
+    public MinDateVersionFilter(DateTimeOffset minimum) => this.minimum = minimum;
 
-            reason = null;
+    public bool Exclude(BaseVersion version, [NotNullWhen(true)] out string? reason)
+    {
+        if (version == null) throw new ArgumentNullException(nameof(version));
 
-            if (version.BaseVersionSource != null &&
-                version.BaseVersionSource.When < this.minimum)
-            {
-                reason = "Source was ignored due to commit date being outside of configured range";
-                return true;
-            }
+        reason = null;
 
-            return false;
+        if (version.BaseVersionSource != null &&
+            version.BaseVersionSource.When < this.minimum)
+        {
+            reason = "Source was ignored due to commit date being outside of configured range";
+            return true;
         }
+
+        return false;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs
index 747138a8ca..fd0ccbec73 100644
--- a/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs
+++ b/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs
@@ -5,154 +5,153 @@
 using GitVersion.Extensions;
 using GitVersion.Logging;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public class NextVersionCalculator : INextVersionCalculator
 {
-    public class NextVersionCalculator : INextVersionCalculator
+    private readonly ILog log;
+    private readonly IBaseVersionCalculator baseVersionCalculator;
+    private readonly IMainlineVersionCalculator mainlineVersionCalculator;
+    private readonly IRepositoryStore repositoryStore;
+    private readonly Lazy<GitVersionContext> versionContext;
+    private GitVersionContext context => this.versionContext.Value;
+
+    public NextVersionCalculator(ILog log, IBaseVersionCalculator baseVersionCalculator,
+        IMainlineVersionCalculator mainlineVersionCalculator, IRepositoryStore repositoryStore,
+        Lazy<GitVersionContext> versionContext)
+    {
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
+        this.baseVersionCalculator = baseVersionCalculator ?? throw new ArgumentNullException(nameof(baseVersionCalculator));
+        this.mainlineVersionCalculator = mainlineVersionCalculator ?? throw new ArgumentNullException(nameof(mainlineVersionCalculator));
+        this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
+        this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
+    }
+
+    public SemanticVersion FindVersion()
     {
-        private readonly ILog log;
-        private readonly IBaseVersionCalculator baseVersionCalculator;
-        private readonly IMainlineVersionCalculator mainlineVersionCalculator;
-        private readonly IRepositoryStore repositoryStore;
-        private readonly Lazy<GitVersionContext> versionContext;
-        private GitVersionContext context => this.versionContext.Value;
-
-        public NextVersionCalculator(ILog log, IBaseVersionCalculator baseVersionCalculator,
-            IMainlineVersionCalculator mainlineVersionCalculator, IRepositoryStore repositoryStore,
-            Lazy<GitVersionContext> versionContext)
+        this.log.Info($"Running against branch: {context.CurrentBranch} ({context.CurrentCommit?.ToString() ?? "-"})");
+        if (context.IsCurrentCommitTagged)
         {
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.baseVersionCalculator = baseVersionCalculator ?? throw new ArgumentNullException(nameof(baseVersionCalculator));
-            this.mainlineVersionCalculator = mainlineVersionCalculator ?? throw new ArgumentNullException(nameof(mainlineVersionCalculator));
-            this.repositoryStore = repositoryStore ?? throw new ArgumentNullException(nameof(repositoryStore));
-            this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
+            this.log.Info($"Current commit is tagged with version {context.CurrentCommitTaggedVersion}, " +
+                          "version calculation is for metadata only.");
         }
-
-        public SemanticVersion FindVersion()
+        else
         {
-            this.log.Info($"Running against branch: {context.CurrentBranch} ({context.CurrentCommit?.ToString() ?? "-"})");
-            if (context.IsCurrentCommitTagged)
-            {
-                this.log.Info($"Current commit is tagged with version {context.CurrentCommitTaggedVersion}, " +
-                         "version calculation is for metadata only.");
-            }
-            else
-            {
-                EnsureHeadIsNotDetached(context);
-            }
+            EnsureHeadIsNotDetached(context);
+        }
 
-            SemanticVersion? taggedSemanticVersion = null;
+        SemanticVersion? taggedSemanticVersion = null;
 
-            if (context.IsCurrentCommitTagged)
+        if (context.IsCurrentCommitTagged)
+        {
+            // Will always be 0, don't bother with the +0 on tags
+            var semanticVersionBuildMetaData = this.mainlineVersionCalculator.CreateVersionBuildMetaData(context.CurrentCommit);
+            semanticVersionBuildMetaData.CommitsSinceTag = null;
+
+            var semanticVersion = new SemanticVersion(context.CurrentCommitTaggedVersion)
             {
-                // Will always be 0, don't bother with the +0 on tags
-                var semanticVersionBuildMetaData = this.mainlineVersionCalculator.CreateVersionBuildMetaData(context.CurrentCommit);
-                semanticVersionBuildMetaData.CommitsSinceTag = null;
-
-                var semanticVersion = new SemanticVersion(context.CurrentCommitTaggedVersion)
-                {
-                    BuildMetaData = semanticVersionBuildMetaData
-                };
-                taggedSemanticVersion = semanticVersion;
-            }
+                BuildMetaData = semanticVersionBuildMetaData
+            };
+            taggedSemanticVersion = semanticVersion;
+        }
 
-            var baseVersion = this.baseVersionCalculator.GetBaseVersion();
-            baseVersion.SemanticVersion.BuildMetaData = this.mainlineVersionCalculator.CreateVersionBuildMetaData(baseVersion.BaseVersionSource);
-            SemanticVersion semver;
-            if (context.Configuration?.VersioningMode == VersioningMode.Mainline)
+        var baseVersion = this.baseVersionCalculator.GetBaseVersion();
+        baseVersion.SemanticVersion.BuildMetaData = this.mainlineVersionCalculator.CreateVersionBuildMetaData(baseVersion.BaseVersionSource);
+        SemanticVersion semver;
+        if (context.Configuration?.VersioningMode == VersioningMode.Mainline)
+        {
+            semver = this.mainlineVersionCalculator.FindMainlineModeVersion(baseVersion);
+        }
+        else
+        {
+            if (taggedSemanticVersion?.BuildMetaData == null || (taggedSemanticVersion.BuildMetaData.Sha != baseVersion.SemanticVersion.BuildMetaData.Sha))
             {
-                semver = this.mainlineVersionCalculator.FindMainlineModeVersion(baseVersion);
+                semver = PerformIncrement(baseVersion);
+                semver.BuildMetaData = this.mainlineVersionCalculator.CreateVersionBuildMetaData(baseVersion.BaseVersionSource);
             }
             else
             {
-                if (taggedSemanticVersion?.BuildMetaData == null || (taggedSemanticVersion.BuildMetaData.Sha != baseVersion.SemanticVersion.BuildMetaData.Sha))
-                {
-                    semver = PerformIncrement(baseVersion);
-                    semver.BuildMetaData = this.mainlineVersionCalculator.CreateVersionBuildMetaData(baseVersion.BaseVersionSource);
-                }
-                else
-                {
-                    semver = baseVersion.SemanticVersion;
-                }
+                semver = baseVersion.SemanticVersion;
             }
+        }
 
-            var hasPreReleaseTag = semver.PreReleaseTag?.HasTag() == true;
-            var tag = context.Configuration?.Tag;
-            var branchConfigHasPreReleaseTagConfigured = !tag.IsNullOrEmpty();
+        var hasPreReleaseTag = semver.PreReleaseTag?.HasTag() == true;
+        var tag = context.Configuration?.Tag;
+        var branchConfigHasPreReleaseTagConfigured = !tag.IsNullOrEmpty();
 #pragma warning disable CS8602 // Dereference of a possibly null reference. // context.Configuration.Tag not null when branchConfigHasPreReleaseTagConfigured is true
-            var preReleaseTagDoesNotMatchConfiguration = hasPreReleaseTag && branchConfigHasPreReleaseTagConfigured && semver.PreReleaseTag?.Name != tag;
+        var preReleaseTagDoesNotMatchConfiguration = hasPreReleaseTag && branchConfigHasPreReleaseTagConfigured && semver.PreReleaseTag?.Name != tag;
 #pragma warning restore CS8602 // Dereference of a possibly null reference.
-            if (semver.PreReleaseTag?.HasTag() != true && branchConfigHasPreReleaseTagConfigured || preReleaseTagDoesNotMatchConfiguration)
+        if (semver.PreReleaseTag?.HasTag() != true && branchConfigHasPreReleaseTagConfigured || preReleaseTagDoesNotMatchConfiguration)
+        {
+            UpdatePreReleaseTag(semver, baseVersion?.BranchNameOverride);
+        }
+
+        if (taggedSemanticVersion != null)
+        {
+            // replace calculated version with tagged version only if tagged version greater or equal to calculated version
+            if (semver.CompareTo(taggedSemanticVersion, false) > 0)
             {
-                UpdatePreReleaseTag(semver, baseVersion?.BranchNameOverride);
+                taggedSemanticVersion = null;
             }
-
-            if (taggedSemanticVersion != null)
+            else if (taggedSemanticVersion.BuildMetaData != null)
             {
-                // replace calculated version with tagged version only if tagged version greater or equal to calculated version
-                if (semver.CompareTo(taggedSemanticVersion, false) > 0)
-                {
-                    taggedSemanticVersion = null;
-                }
-                else if (taggedSemanticVersion.BuildMetaData != null)
-                {
-                    // set the commit count on the tagged ver
-                    taggedSemanticVersion.BuildMetaData.CommitsSinceVersionSource = semver.BuildMetaData?.CommitsSinceVersionSource;
-                }
+                // set the commit count on the tagged ver
+                taggedSemanticVersion.BuildMetaData.CommitsSinceVersionSource = semver.BuildMetaData?.CommitsSinceVersionSource;
             }
-
-            return taggedSemanticVersion ?? semver;
         }
 
-        private SemanticVersion PerformIncrement(BaseVersion baseVersion)
+        return taggedSemanticVersion ?? semver;
+    }
+
+    private SemanticVersion PerformIncrement(BaseVersion baseVersion)
+    {
+        var semver = baseVersion.SemanticVersion;
+        var increment = this.repositoryStore.DetermineIncrementedField(baseVersion, context);
+        if (increment != null)
         {
-            var semver = baseVersion.SemanticVersion;
-            var increment = this.repositoryStore.DetermineIncrementedField(baseVersion, context);
-            if (increment != null)
-            {
-                semver = semver.IncrementVersion(increment.Value);
-            }
-            else this.log.Info("Skipping version increment");
-            return semver;
+            semver = semver.IncrementVersion(increment.Value);
         }
+        else this.log.Info("Skipping version increment");
+        return semver;
+    }
 
-        private void UpdatePreReleaseTag(SemanticVersion semanticVersion, string? branchNameOverride)
-        {
-            var tagToUse = context.Configuration?.GetBranchSpecificTag(this.log, context.CurrentBranch?.Name.Friendly, branchNameOverride);
+    private void UpdatePreReleaseTag(SemanticVersion semanticVersion, string? branchNameOverride)
+    {
+        var tagToUse = context.Configuration?.GetBranchSpecificTag(this.log, context.CurrentBranch?.Name.Friendly, branchNameOverride);
 
-            int? number = null;
+        int? number = null;
 
-            var lastTag = this.repositoryStore
-                .GetVersionTagsOnBranch(context.CurrentBranch!, context.Configuration?.GitTagPrefix)
-                .FirstOrDefault(v => v.PreReleaseTag?.Name?.IsEquivalentTo(tagToUse) == true);
+        var lastTag = this.repositoryStore
+            .GetVersionTagsOnBranch(context.CurrentBranch!, context.Configuration?.GitTagPrefix)
+            .FirstOrDefault(v => v.PreReleaseTag?.Name?.IsEquivalentTo(tagToUse) == true);
 
-            if (lastTag != null &&
-                MajorMinorPatchEqual(lastTag, semanticVersion) &&
-                lastTag.PreReleaseTag?.HasTag() == true)
-            {
-                number = lastTag.PreReleaseTag.Number + 1;
-            }
+        if (lastTag != null &&
+            MajorMinorPatchEqual(lastTag, semanticVersion) &&
+            lastTag.PreReleaseTag?.HasTag() == true)
+        {
+            number = lastTag.PreReleaseTag.Number + 1;
+        }
 
-            number ??= 1;
+        number ??= 1;
 
-            semanticVersion.PreReleaseTag = new SemanticVersionPreReleaseTag(tagToUse, number);
-        }
+        semanticVersion.PreReleaseTag = new SemanticVersionPreReleaseTag(tagToUse, number);
+    }
 
-        private static void EnsureHeadIsNotDetached(GitVersionContext context)
+    private static void EnsureHeadIsNotDetached(GitVersionContext context)
+    {
+        if (context.CurrentBranch?.IsDetachedHead != true)
         {
-            if (context.CurrentBranch?.IsDetachedHead != true)
-            {
-                return;
-            }
-
-            var message = string.Format(
-                "It looks like the branch being examined is a detached Head pointing to commit '{0}'. " +
-                "Without a proper branch name GitVersion cannot determine the build version.",
-                context.CurrentCommit?.Id.ToString(7));
-            throw new WarningException(message);
+            return;
         }
 
-        private static bool MajorMinorPatchEqual(SemanticVersion lastTag, SemanticVersion baseVersion) => lastTag.Major == baseVersion.Major &&
-                   lastTag.Minor == baseVersion.Minor &&
-                   lastTag.Patch == baseVersion.Patch;
+        var message = string.Format(
+            "It looks like the branch being examined is a detached Head pointing to commit '{0}'. " +
+            "Without a proper branch name GitVersion cannot determine the build version.",
+            context.CurrentCommit?.Id.ToString(7));
+        throw new WarningException(message);
     }
-}
+
+    private static bool MajorMinorPatchEqual(SemanticVersion lastTag, SemanticVersion baseVersion) => lastTag.Major == baseVersion.Major &&
+                                                                                                      lastTag.Minor == baseVersion.Minor &&
+                                                                                                      lastTag.Patch == baseVersion.Patch;
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
index 617a5fc67a..7b4c65f574 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
@@ -3,318 +3,317 @@
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class SemanticVersion : IFormattable, IComparable<SemanticVersion>, IEquatable<SemanticVersion?>
 {
-    public class SemanticVersion : IFormattable, IComparable<SemanticVersion>, IEquatable<SemanticVersion?>
-    {
-        private static readonly SemanticVersion Empty = new();
+    private static readonly SemanticVersion Empty = new();
 
-        private static readonly Regex ParseSemVer = new(
-            @"^(?<SemVer>(?<Major>\d+)(\.(?<Minor>\d+))?(\.(?<Patch>\d+))?)(\.(?<FourthPart>\d+))?(-(?<Tag>[^\+]*))?(\+(?<BuildMetaData>.*))?$",
-            RegexOptions.Compiled);
+    private static readonly Regex ParseSemVer = new(
+        @"^(?<SemVer>(?<Major>\d+)(\.(?<Minor>\d+))?(\.(?<Patch>\d+))?)(\.(?<FourthPart>\d+))?(-(?<Tag>[^\+]*))?(\+(?<BuildMetaData>.*))?$",
+        RegexOptions.Compiled);
 
-        public int Major;
-        public int Minor;
-        public int Patch;
-        public SemanticVersionPreReleaseTag? PreReleaseTag;
-        public SemanticVersionBuildMetaData? BuildMetaData;
+    public int Major;
+    public int Minor;
+    public int Patch;
+    public SemanticVersionPreReleaseTag? PreReleaseTag;
+    public SemanticVersionBuildMetaData? BuildMetaData;
 
-        public SemanticVersion(int major = 0, int minor = 0, int patch = 0)
-        {
-            this.Major = major;
-            this.Minor = minor;
-            this.Patch = patch;
-            this.PreReleaseTag = new SemanticVersionPreReleaseTag();
-            this.BuildMetaData = new SemanticVersionBuildMetaData();
-        }
+    public SemanticVersion(int major = 0, int minor = 0, int patch = 0)
+    {
+        this.Major = major;
+        this.Minor = minor;
+        this.Patch = patch;
+        this.PreReleaseTag = new SemanticVersionPreReleaseTag();
+        this.BuildMetaData = new SemanticVersionBuildMetaData();
+    }
 
-        public SemanticVersion(SemanticVersion? semanticVersion)
-        {
-            this.Major = semanticVersion?.Major ?? 0;
-            this.Minor = semanticVersion?.Minor ?? 0;
-            this.Patch = semanticVersion?.Patch ?? 0;
+    public SemanticVersion(SemanticVersion? semanticVersion)
+    {
+        this.Major = semanticVersion?.Major ?? 0;
+        this.Minor = semanticVersion?.Minor ?? 0;
+        this.Patch = semanticVersion?.Patch ?? 0;
 
-            this.PreReleaseTag = new SemanticVersionPreReleaseTag(semanticVersion?.PreReleaseTag);
-            this.BuildMetaData = new SemanticVersionBuildMetaData(semanticVersion?.BuildMetaData);
-        }
+        this.PreReleaseTag = new SemanticVersionPreReleaseTag(semanticVersion?.PreReleaseTag);
+        this.BuildMetaData = new SemanticVersionBuildMetaData(semanticVersion?.BuildMetaData);
+    }
 
-        public bool Equals(SemanticVersion? obj)
+    public bool Equals(SemanticVersion? obj)
+    {
+        if (obj == null)
         {
-            if (obj == null)
-            {
-                return false;
-            }
-            return this.Major == obj.Major &&
-                   this.Minor == obj.Minor &&
-                   this.Patch == obj.Patch &&
-                   this.PreReleaseTag == obj.PreReleaseTag &&
-                   this.BuildMetaData == obj.BuildMetaData;
+            return false;
         }
+        return this.Major == obj.Major &&
+               this.Minor == obj.Minor &&
+               this.Patch == obj.Patch &&
+               this.PreReleaseTag == obj.PreReleaseTag &&
+               this.BuildMetaData == obj.BuildMetaData;
+    }
 
-        public bool IsEmpty() => Equals(Empty);
+    public bool IsEmpty() => Equals(Empty);
 
-        public override bool Equals(object? obj)
+    public override bool Equals(object? obj)
+    {
+        if (obj is null)
         {
-            if (obj is null)
-            {
-                return false;
-            }
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-            if (obj.GetType() != GetType())
-            {
-                return false;
-            }
-            return Equals((SemanticVersion)obj);
+            return false;
         }
-
-        public override int GetHashCode()
+        if (ReferenceEquals(this, obj))
         {
-            unchecked
-            {
-                var hashCode = this.Major;
-                hashCode = (hashCode * 397) ^ this.Minor;
-                hashCode = (hashCode * 397) ^ this.Patch;
-                hashCode = (hashCode * 397) ^ (this.PreReleaseTag != null ? this.PreReleaseTag.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (this.BuildMetaData != null ? this.BuildMetaData.GetHashCode() : 0);
-                return hashCode;
-            }
+            return true;
         }
-
-        public static bool operator ==(SemanticVersion? v1, SemanticVersion? v2)
+        if (obj.GetType() != GetType())
         {
-            if (v1 is null)
-            {
-                return v2 is null;
-            }
-            return v1.Equals(v2);
+            return false;
         }
+        return Equals((SemanticVersion)obj);
+    }
 
-        public static bool operator !=(SemanticVersion? v1, SemanticVersion? v2) => !(v1 == v2);
-
-        public static bool operator >(SemanticVersion v1, SemanticVersion v2)
+    public override int GetHashCode()
+    {
+        unchecked
         {
-            if (v1 == null)
-                throw new ArgumentNullException(nameof(v1));
-            if (v2 == null)
-                throw new ArgumentNullException(nameof(v2));
-            return v1.CompareTo(v2) > 0;
+            var hashCode = this.Major;
+            hashCode = (hashCode * 397) ^ this.Minor;
+            hashCode = (hashCode * 397) ^ this.Patch;
+            hashCode = (hashCode * 397) ^ (this.PreReleaseTag != null ? this.PreReleaseTag.GetHashCode() : 0);
+            hashCode = (hashCode * 397) ^ (this.BuildMetaData != null ? this.BuildMetaData.GetHashCode() : 0);
+            return hashCode;
         }
+    }
 
-        public static bool operator >=(SemanticVersion v1, SemanticVersion v2)
+    public static bool operator ==(SemanticVersion? v1, SemanticVersion? v2)
+    {
+        if (v1 is null)
         {
-            if (v1 == null)
-                throw new ArgumentNullException(nameof(v1));
-            if (v2 == null)
-                throw new ArgumentNullException(nameof(v2));
-            return v1.CompareTo(v2) >= 0;
+            return v2 is null;
         }
+        return v1.Equals(v2);
+    }
 
-        public static bool operator <=(SemanticVersion v1, SemanticVersion v2)
-        {
-            if (v1 == null)
-                throw new ArgumentNullException(nameof(v1));
-            if (v2 == null)
-                throw new ArgumentNullException(nameof(v2));
+    public static bool operator !=(SemanticVersion? v1, SemanticVersion? v2) => !(v1 == v2);
 
-            return v1.CompareTo(v2) <= 0;
-        }
+    public static bool operator >(SemanticVersion v1, SemanticVersion v2)
+    {
+        if (v1 == null)
+            throw new ArgumentNullException(nameof(v1));
+        if (v2 == null)
+            throw new ArgumentNullException(nameof(v2));
+        return v1.CompareTo(v2) > 0;
+    }
 
-        public static bool operator <(SemanticVersion v1, SemanticVersion v2)
-        {
-            if (v1 == null)
-                throw new ArgumentNullException(nameof(v1));
-            if (v2 == null)
-                throw new ArgumentNullException(nameof(v2));
+    public static bool operator >=(SemanticVersion v1, SemanticVersion v2)
+    {
+        if (v1 == null)
+            throw new ArgumentNullException(nameof(v1));
+        if (v2 == null)
+            throw new ArgumentNullException(nameof(v2));
+        return v1.CompareTo(v2) >= 0;
+    }
 
-            return v1.CompareTo(v2) < 0;
-        }
+    public static bool operator <=(SemanticVersion v1, SemanticVersion v2)
+    {
+        if (v1 == null)
+            throw new ArgumentNullException(nameof(v1));
+        if (v2 == null)
+            throw new ArgumentNullException(nameof(v2));
 
-        public static SemanticVersion Parse(string version, string? tagPrefixRegex)
-        {
-            if (!TryParse(version, tagPrefixRegex, out var semanticVersion))
-                throw new WarningException($"Failed to parse {version} into a Semantic Version");
+        return v1.CompareTo(v2) <= 0;
+    }
 
-            return semanticVersion;
-        }
+    public static bool operator <(SemanticVersion v1, SemanticVersion v2)
+    {
+        if (v1 == null)
+            throw new ArgumentNullException(nameof(v1));
+        if (v2 == null)
+            throw new ArgumentNullException(nameof(v2));
 
-        public static bool TryParse(string version, string? tagPrefixRegex, [NotNullWhen(true)] out SemanticVersion? semanticVersion)
-        {
-            var match = Regex.Match(version, $"^({tagPrefixRegex})?(?<version>.*)$");
+        return v1.CompareTo(v2) < 0;
+    }
 
-            if (!match.Success)
-            {
-                semanticVersion = null;
-                return false;
-            }
+    public static SemanticVersion Parse(string version, string? tagPrefixRegex)
+    {
+        if (!TryParse(version, tagPrefixRegex, out var semanticVersion))
+            throw new WarningException($"Failed to parse {version} into a Semantic Version");
 
-            version = match.Groups["version"].Value;
-            var parsed = ParseSemVer.Match(version);
+        return semanticVersion;
+    }
 
-            if (!parsed.Success)
-            {
-                semanticVersion = null;
-                return false;
-            }
+    public static bool TryParse(string version, string? tagPrefixRegex, [NotNullWhen(true)] out SemanticVersion? semanticVersion)
+    {
+        var match = Regex.Match(version, $"^({tagPrefixRegex})?(?<version>.*)$");
 
-            var semanticVersionBuildMetaData = SemanticVersionBuildMetaData.Parse(parsed.Groups["BuildMetaData"].Value);
-            var fourthPart = parsed.Groups["FourthPart"];
-            if (fourthPart.Success && semanticVersionBuildMetaData.CommitsSinceTag == null)
-            {
-                semanticVersionBuildMetaData.CommitsSinceTag = int.Parse(fourthPart.Value);
-            }
+        if (!match.Success)
+        {
+            semanticVersion = null;
+            return false;
+        }
 
-            semanticVersion = new SemanticVersion
-            {
-                Major = int.Parse(parsed.Groups["Major"].Value),
-                Minor = parsed.Groups["Minor"].Success ? int.Parse(parsed.Groups["Minor"].Value) : 0,
-                Patch = parsed.Groups["Patch"].Success ? int.Parse(parsed.Groups["Patch"].Value) : 0,
-                PreReleaseTag = SemanticVersionPreReleaseTag.Parse(parsed.Groups["Tag"].Value),
-                BuildMetaData = semanticVersionBuildMetaData
-            };
+        version = match.Groups["version"].Value;
+        var parsed = ParseSemVer.Match(version);
 
-            return true;
+        if (!parsed.Success)
+        {
+            semanticVersion = null;
+            return false;
         }
 
-        public int CompareTo(SemanticVersion value) => CompareTo(value, true);
+        var semanticVersionBuildMetaData = SemanticVersionBuildMetaData.Parse(parsed.Groups["BuildMetaData"].Value);
+        var fourthPart = parsed.Groups["FourthPart"];
+        if (fourthPart.Success && semanticVersionBuildMetaData.CommitsSinceTag == null)
+        {
+            semanticVersionBuildMetaData.CommitsSinceTag = int.Parse(fourthPart.Value);
+        }
 
-        public int CompareTo(SemanticVersion? value, bool includePrerelease)
+        semanticVersion = new SemanticVersion
         {
-            if (value == null)
+            Major = int.Parse(parsed.Groups["Major"].Value),
+            Minor = parsed.Groups["Minor"].Success ? int.Parse(parsed.Groups["Minor"].Value) : 0,
+            Patch = parsed.Groups["Patch"].Success ? int.Parse(parsed.Groups["Patch"].Value) : 0,
+            PreReleaseTag = SemanticVersionPreReleaseTag.Parse(parsed.Groups["Tag"].Value),
+            BuildMetaData = semanticVersionBuildMetaData
+        };
+
+        return true;
+    }
+
+    public int CompareTo(SemanticVersion value) => CompareTo(value, true);
+
+    public int CompareTo(SemanticVersion? value, bool includePrerelease)
+    {
+        if (value == null)
+        {
+            return 1;
+        }
+        if (this.Major != value.Major)
+        {
+            if (this.Major > value.Major)
             {
                 return 1;
             }
-            if (this.Major != value.Major)
-            {
-                if (this.Major > value.Major)
-                {
-                    return 1;
-                }
-                return -1;
-            }
-            if (this.Minor != value.Minor)
+            return -1;
+        }
+        if (this.Minor != value.Minor)
+        {
+            if (this.Minor > value.Minor)
             {
-                if (this.Minor > value.Minor)
-                {
-                    return 1;
-                }
-                return -1;
+                return 1;
             }
-            if (this.Patch != value.Patch)
+            return -1;
+        }
+        if (this.Patch != value.Patch)
+        {
+            if (this.Patch > value.Patch)
             {
-                if (this.Patch > value.Patch)
-                {
-                    return 1;
-                }
-                return -1;
+                return 1;
             }
-            if (includePrerelease && this.PreReleaseTag != value?.PreReleaseTag)
+            return -1;
+        }
+        if (includePrerelease && this.PreReleaseTag != value?.PreReleaseTag)
+        {
+            if (this.PreReleaseTag > value?.PreReleaseTag)
             {
-                if (this.PreReleaseTag > value?.PreReleaseTag)
-                {
-                    return 1;
-                }
-                return -1;
+                return 1;
             }
-
-            return 0;
+            return -1;
         }
 
-        public override string ToString() => ToString(null);
-
-        /// <summary>
-        /// <para>s - Default SemVer [1.2.3-beta.4+5]</para>
-        /// <para>f - Full SemVer [1.2.3-beta.4+5]</para>
-        /// <para>i - Informational SemVer [1.2.3-beta.4+5.Branch.main.BranchType.main.Sha.000000]</para>
-        /// <para>j - Just the SemVer part [1.2.3]</para>
-        /// <para>t - SemVer with the tag [1.2.3-beta.4]</para>
-        /// <para>l - Legacy SemVer tag for systems which do not support SemVer 2.0 properly [1.2.3-beta4]</para>
-        /// <para>lp - Legacy SemVer tag for systems which do not support SemVer 2.0 properly (padded) [1.2.3-beta0004]</para>
-        /// </summary>
-        public string ToString(string? format, IFormatProvider? formatProvider = null)
-        {
-            if (format.IsNullOrEmpty())
-                format = "s";
+        return 0;
+    }
 
-            if (formatProvider?.GetFormat(GetType()) is ICustomFormatter formatter)
-                return formatter.Format(format, this, formatProvider);
+    public override string ToString() => ToString(null);
+
+    /// <summary>
+    /// <para>s - Default SemVer [1.2.3-beta.4+5]</para>
+    /// <para>f - Full SemVer [1.2.3-beta.4+5]</para>
+    /// <para>i - Informational SemVer [1.2.3-beta.4+5.Branch.main.BranchType.main.Sha.000000]</para>
+    /// <para>j - Just the SemVer part [1.2.3]</para>
+    /// <para>t - SemVer with the tag [1.2.3-beta.4]</para>
+    /// <para>l - Legacy SemVer tag for systems which do not support SemVer 2.0 properly [1.2.3-beta4]</para>
+    /// <para>lp - Legacy SemVer tag for systems which do not support SemVer 2.0 properly (padded) [1.2.3-beta0004]</para>
+    /// </summary>
+    public string ToString(string? format, IFormatProvider? formatProvider = null)
+    {
+        if (format.IsNullOrEmpty())
+            format = "s";
 
-            // Check for lp first because the param can vary
-            format = format.ToLower();
-            if (format.StartsWith("lp", StringComparison.Ordinal))
-            {
-                // handle the padding
-                return this.PreReleaseTag?.HasTag() == true ? $"{ToString("j")}-{this.PreReleaseTag.ToString(format)}" : ToString("j");
-            }
+        if (formatProvider?.GetFormat(GetType()) is ICustomFormatter formatter)
+            return formatter.Format(format, this, formatProvider);
 
-            switch (format)
-            {
-                case "j":
-                    return $"{this.Major}.{this.Minor}.{this.Patch}";
-                case "s":
-                    return this.PreReleaseTag?.HasTag() == true ? $"{ToString("j")}-{this.PreReleaseTag}" : ToString("j");
-                case "t":
-                    return this.PreReleaseTag?.HasTag() == true ? $"{ToString("j")}-{this.PreReleaseTag.ToString("t")}" : ToString("j");
-                case "l":
-                    return this.PreReleaseTag?.HasTag() == true ? $"{ToString("j")}-{this.PreReleaseTag.ToString("l")}" : ToString("j");
-                case "f":
-                    {
-                        var buildMetadata = this.BuildMetaData?.ToString();
-
-                        return !buildMetadata.IsNullOrEmpty() ? $"{ToString("s")}+{buildMetadata}" : ToString("s");
-                    }
-                case "i":
-                    {
-                        var buildMetadata = this.BuildMetaData?.ToString("f");
-
-                        return !buildMetadata.IsNullOrEmpty() ? $"{ToString("s")}+{buildMetadata}" : ToString("s");
-                    }
-                default:
-                    throw new ArgumentException($"Unrecognised format '{format}'", nameof(format));
-            }
+        // Check for lp first because the param can vary
+        format = format.ToLower();
+        if (format.StartsWith("lp", StringComparison.Ordinal))
+        {
+            // handle the padding
+            return this.PreReleaseTag?.HasTag() == true ? $"{ToString("j")}-{this.PreReleaseTag.ToString(format)}" : ToString("j");
         }
 
-        public SemanticVersion IncrementVersion(VersionField incrementStrategy)
+        switch (format)
         {
-            var incremented = new SemanticVersion(this);
-            if (incremented.PreReleaseTag?.HasTag() != true)
-            {
-                switch (incrementStrategy)
+            case "j":
+                return $"{this.Major}.{this.Minor}.{this.Patch}";
+            case "s":
+                return this.PreReleaseTag?.HasTag() == true ? $"{ToString("j")}-{this.PreReleaseTag}" : ToString("j");
+            case "t":
+                return this.PreReleaseTag?.HasTag() == true ? $"{ToString("j")}-{this.PreReleaseTag.ToString("t")}" : ToString("j");
+            case "l":
+                return this.PreReleaseTag?.HasTag() == true ? $"{ToString("j")}-{this.PreReleaseTag.ToString("l")}" : ToString("j");
+            case "f":
                 {
-                    case VersionField.None:
-                        break;
-                    case VersionField.Major:
-                        incremented.Major++;
-                        incremented.Minor = 0;
-                        incremented.Patch = 0;
-                        break;
-                    case VersionField.Minor:
-                        incremented.Minor++;
-                        incremented.Patch = 0;
-                        break;
-                    case VersionField.Patch:
-                        incremented.Patch++;
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException(nameof(incrementStrategy));
+                    var buildMetadata = this.BuildMetaData?.ToString();
+
+                    return !buildMetadata.IsNullOrEmpty() ? $"{ToString("s")}+{buildMetadata}" : ToString("s");
                 }
-            }
-            else if (incremented.PreReleaseTag.Number != null)
-            {
-                incremented.PreReleaseTag.Number++;
-            }
+            case "i":
+                {
+                    var buildMetadata = this.BuildMetaData?.ToString("f");
 
-            return incremented;
+                    return !buildMetadata.IsNullOrEmpty() ? $"{ToString("s")}+{buildMetadata}" : ToString("s");
+                }
+            default:
+                throw new ArgumentException($"Unrecognised format '{format}'", nameof(format));
         }
     }
 
-    public enum VersionField
+    public SemanticVersion IncrementVersion(VersionField incrementStrategy)
     {
-        None,
-        Patch,
-        Minor,
-        Major
+        var incremented = new SemanticVersion(this);
+        if (incremented.PreReleaseTag?.HasTag() != true)
+        {
+            switch (incrementStrategy)
+            {
+                case VersionField.None:
+                    break;
+                case VersionField.Major:
+                    incremented.Major++;
+                    incremented.Minor = 0;
+                    incremented.Patch = 0;
+                    break;
+                case VersionField.Minor:
+                    incremented.Minor++;
+                    incremented.Patch = 0;
+                    break;
+                case VersionField.Patch:
+                    incremented.Patch++;
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(incrementStrategy));
+            }
+        }
+        else if (incremented.PreReleaseTag.Number != null)
+        {
+            incremented.PreReleaseTag.Number++;
+        }
+
+        return incremented;
     }
 }
+
+public enum VersionField
+{
+    None,
+    Patch,
+    Minor,
+    Major
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
index d49ee6e50e..350190c464 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
@@ -3,155 +3,154 @@
 using GitVersion.Extensions;
 using GitVersion.Helpers;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class SemanticVersionBuildMetaData : IFormattable, IEquatable<SemanticVersionBuildMetaData?>
 {
-    public class SemanticVersionBuildMetaData : IFormattable, IEquatable<SemanticVersionBuildMetaData?>
+    private static readonly Regex ParseRegex = new(
+        @"(?<BuildNumber>\d+)?(\.?Branch(Name)?\.(?<BranchName>[^\.]+))?(\.?Sha?\.(?<Sha>[^\.]+))?(?<Other>.*)",
+        RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+    private static readonly LambdaEqualityHelper<SemanticVersionBuildMetaData> EqualityHelper =
+        new(x => x.CommitsSinceTag, x => x.Branch, x => x.Sha);
+
+    public int? CommitsSinceTag;
+    public string? Branch;
+    public string? Sha;
+    public string? ShortSha;
+    public string? OtherMetaData;
+    public DateTimeOffset? CommitDate;
+    public string? VersionSourceSha;
+    public int? CommitsSinceVersionSource;
+    public int UncommittedChanges;
+
+    public SemanticVersionBuildMetaData()
     {
-        private static readonly Regex ParseRegex = new(
-            @"(?<BuildNumber>\d+)?(\.?Branch(Name)?\.(?<BranchName>[^\.]+))?(\.?Sha?\.(?<Sha>[^\.]+))?(?<Other>.*)",
-            RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
-        private static readonly LambdaEqualityHelper<SemanticVersionBuildMetaData> EqualityHelper =
-           new(x => x.CommitsSinceTag, x => x.Branch, x => x.Sha);
-
-        public int? CommitsSinceTag;
-        public string? Branch;
-        public string? Sha;
-        public string? ShortSha;
-        public string? OtherMetaData;
-        public DateTimeOffset? CommitDate;
-        public string? VersionSourceSha;
-        public int? CommitsSinceVersionSource;
-        public int UncommittedChanges;
-
-        public SemanticVersionBuildMetaData()
-        {
-        }
+    }
 
-        public SemanticVersionBuildMetaData(string? versionSourceSha, int? commitsSinceTag, string? branch, string? commitSha, string? commitShortSha, DateTimeOffset? commitDate, int numbeerOfUncommitedChanges, string? otherMetadata = null)
-        {
-            this.Sha = commitSha;
-            this.ShortSha = commitShortSha;
-            this.CommitsSinceTag = commitsSinceTag;
-            this.Branch = branch;
-            this.CommitDate = commitDate;
-            this.OtherMetaData = otherMetadata;
-            this.VersionSourceSha = versionSourceSha;
-            this.CommitsSinceVersionSource = commitsSinceTag ?? 0;
-            this.UncommittedChanges = numbeerOfUncommitedChanges;
-        }
+    public SemanticVersionBuildMetaData(string? versionSourceSha, int? commitsSinceTag, string? branch, string? commitSha, string? commitShortSha, DateTimeOffset? commitDate, int numbeerOfUncommitedChanges, string? otherMetadata = null)
+    {
+        this.Sha = commitSha;
+        this.ShortSha = commitShortSha;
+        this.CommitsSinceTag = commitsSinceTag;
+        this.Branch = branch;
+        this.CommitDate = commitDate;
+        this.OtherMetaData = otherMetadata;
+        this.VersionSourceSha = versionSourceSha;
+        this.CommitsSinceVersionSource = commitsSinceTag ?? 0;
+        this.UncommittedChanges = numbeerOfUncommitedChanges;
+    }
 
-        public SemanticVersionBuildMetaData(SemanticVersionBuildMetaData? buildMetaData)
-        {
-            this.Sha = buildMetaData?.Sha;
-            this.ShortSha = buildMetaData?.ShortSha;
-            this.CommitsSinceTag = buildMetaData?.CommitsSinceTag;
-            this.Branch = buildMetaData?.Branch;
-            this.CommitDate = buildMetaData?.CommitDate;
-            this.OtherMetaData = buildMetaData?.OtherMetaData;
-            this.VersionSourceSha = buildMetaData?.VersionSourceSha;
-            this.CommitsSinceVersionSource = buildMetaData?.CommitsSinceVersionSource;
-            this.UncommittedChanges = buildMetaData?.UncommittedChanges ?? 0;
-        }
+    public SemanticVersionBuildMetaData(SemanticVersionBuildMetaData? buildMetaData)
+    {
+        this.Sha = buildMetaData?.Sha;
+        this.ShortSha = buildMetaData?.ShortSha;
+        this.CommitsSinceTag = buildMetaData?.CommitsSinceTag;
+        this.Branch = buildMetaData?.Branch;
+        this.CommitDate = buildMetaData?.CommitDate;
+        this.OtherMetaData = buildMetaData?.OtherMetaData;
+        this.VersionSourceSha = buildMetaData?.VersionSourceSha;
+        this.CommitsSinceVersionSource = buildMetaData?.CommitsSinceVersionSource;
+        this.UncommittedChanges = buildMetaData?.UncommittedChanges ?? 0;
+    }
 
-        public override bool Equals(object obj) => Equals(obj as SemanticVersionBuildMetaData);
+    public override bool Equals(object obj) => Equals(obj as SemanticVersionBuildMetaData);
 
-        public bool Equals(SemanticVersionBuildMetaData? other) => EqualityHelper.Equals(this, other);
+    public bool Equals(SemanticVersionBuildMetaData? other) => EqualityHelper.Equals(this, other);
 
-        public override int GetHashCode() => EqualityHelper.GetHashCode(this);
+    public override int GetHashCode() => EqualityHelper.GetHashCode(this);
 
-        public override string ToString() => ToString(null);
+    public override string ToString() => ToString(null);
 
-        /// <summary>
-        /// <para>b - Formats just the build number</para>
-        /// <para>s - Formats the build number and the Git Sha</para>
-        /// <para>f - Formats the full build metadata</para>
-        /// <para>p - Formats the padded build number. Can specify an integer for padding, default is 4. (i.e., p5)</para>
-        /// </summary>
-        public string ToString(string? format, IFormatProvider? formatProvider = null)
+    /// <summary>
+    /// <para>b - Formats just the build number</para>
+    /// <para>s - Formats the build number and the Git Sha</para>
+    /// <para>f - Formats the full build metadata</para>
+    /// <para>p - Formats the padded build number. Can specify an integer for padding, default is 4. (i.e., p5)</para>
+    /// </summary>
+    public string ToString(string? format, IFormatProvider? formatProvider = null)
+    {
+        if (formatProvider != null)
         {
-            if (formatProvider != null)
-            {
-                if (formatProvider.GetFormat(GetType()) is ICustomFormatter formatter)
-                    return formatter.Format(format, this, formatProvider);
-            }
+            if (formatProvider.GetFormat(GetType()) is ICustomFormatter formatter)
+                return formatter.Format(format, this, formatProvider);
+        }
 
-            if (format.IsNullOrEmpty())
-                format = "b";
+        if (format.IsNullOrEmpty())
+            format = "b";
 
-            format = format.ToLower();
-            if (format.StartsWith("p", StringComparison.Ordinal))
+        format = format.ToLower();
+        if (format.StartsWith("p", StringComparison.Ordinal))
+        {
+            // Handle format
+            var padding = 4;
+            if (format.Length > 1)
             {
-                // Handle format
-                var padding = 4;
-                if (format.Length > 1)
+                // try to parse
+                if (int.TryParse(format.Substring(1), out var p))
                 {
-                    // try to parse
-                    if (int.TryParse(format.Substring(1), out var p))
-                    {
-                        padding = p;
-                    }
+                    padding = p;
                 }
-
-                return this.CommitsSinceTag != null ? this.CommitsSinceTag.Value.ToString("D" + padding) : string.Empty;
             }
 
-            return format.ToLower() switch
-            {
-                "b" => this.CommitsSinceTag.ToString(),
-                "s" => $"{this.CommitsSinceTag}{(this.Sha.IsNullOrEmpty() ? null : ".Sha." + this.Sha)}".TrimStart('.'),
-                "f" => $"{this.CommitsSinceTag}{(this.Branch.IsNullOrEmpty() ? null : ".Branch." + FormatMetaDataPart(this.Branch))}{(this.Sha.IsNullOrEmpty() ? null : ".Sha." + this.Sha)}{(this.OtherMetaData.IsNullOrEmpty() ? null : "." + FormatMetaDataPart(this.OtherMetaData))}".TrimStart('.'),
-                _ => throw new ArgumentException("Unrecognised format", nameof(format))
-            };
+            return this.CommitsSinceTag != null ? this.CommitsSinceTag.Value.ToString("D" + padding) : string.Empty;
         }
 
-        public static bool operator ==(SemanticVersionBuildMetaData? left, SemanticVersionBuildMetaData? right) =>
-            Equals(left, right);
+        return format.ToLower() switch
+        {
+            "b" => this.CommitsSinceTag.ToString(),
+            "s" => $"{this.CommitsSinceTag}{(this.Sha.IsNullOrEmpty() ? null : ".Sha." + this.Sha)}".TrimStart('.'),
+            "f" => $"{this.CommitsSinceTag}{(this.Branch.IsNullOrEmpty() ? null : ".Branch." + FormatMetaDataPart(this.Branch))}{(this.Sha.IsNullOrEmpty() ? null : ".Sha." + this.Sha)}{(this.OtherMetaData.IsNullOrEmpty() ? null : "." + FormatMetaDataPart(this.OtherMetaData))}".TrimStart('.'),
+            _ => throw new ArgumentException("Unrecognised format", nameof(format))
+        };
+    }
 
-        public static bool operator !=(SemanticVersionBuildMetaData? left, SemanticVersionBuildMetaData? right) =>
-            !Equals(left, right);
+    public static bool operator ==(SemanticVersionBuildMetaData? left, SemanticVersionBuildMetaData? right) =>
+        Equals(left, right);
 
-        public static implicit operator string?(SemanticVersionBuildMetaData? preReleaseTag)
-        {
-            return preReleaseTag?.ToString();
-        }
+    public static bool operator !=(SemanticVersionBuildMetaData? left, SemanticVersionBuildMetaData? right) =>
+        !Equals(left, right);
 
-        public static implicit operator SemanticVersionBuildMetaData(string preReleaseTag)
-        {
-            return Parse(preReleaseTag);
-        }
+    public static implicit operator string?(SemanticVersionBuildMetaData? preReleaseTag)
+    {
+        return preReleaseTag?.ToString();
+    }
 
-        public static SemanticVersionBuildMetaData Parse(string? buildMetaData)
-        {
-            var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData();
-            if (buildMetaData.IsNullOrEmpty())
-                return semanticVersionBuildMetaData;
+    public static implicit operator SemanticVersionBuildMetaData(string preReleaseTag)
+    {
+        return Parse(preReleaseTag);
+    }
 
-            var parsed = ParseRegex.Match(buildMetaData);
+    public static SemanticVersionBuildMetaData Parse(string? buildMetaData)
+    {
+        var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData();
+        if (buildMetaData.IsNullOrEmpty())
+            return semanticVersionBuildMetaData;
 
-            if (parsed.Groups["BuildNumber"].Success)
-            {
-                semanticVersionBuildMetaData.CommitsSinceTag = int.Parse(parsed.Groups["BuildNumber"].Value);
-                semanticVersionBuildMetaData.CommitsSinceVersionSource = semanticVersionBuildMetaData.CommitsSinceTag ?? 0;
-            }
+        var parsed = ParseRegex.Match(buildMetaData);
 
-            if (parsed.Groups["BranchName"].Success)
-                semanticVersionBuildMetaData.Branch = parsed.Groups["BranchName"].Value;
+        if (parsed.Groups["BuildNumber"].Success)
+        {
+            semanticVersionBuildMetaData.CommitsSinceTag = int.Parse(parsed.Groups["BuildNumber"].Value);
+            semanticVersionBuildMetaData.CommitsSinceVersionSource = semanticVersionBuildMetaData.CommitsSinceTag ?? 0;
+        }
 
-            if (parsed.Groups["Sha"].Success)
-                semanticVersionBuildMetaData.Sha = parsed.Groups["Sha"].Value;
+        if (parsed.Groups["BranchName"].Success)
+            semanticVersionBuildMetaData.Branch = parsed.Groups["BranchName"].Value;
 
-            if (parsed.Groups["Other"].Success && !parsed.Groups["Other"].Value.IsNullOrEmpty())
-                semanticVersionBuildMetaData.OtherMetaData = parsed.Groups["Other"].Value.TrimStart('.');
+        if (parsed.Groups["Sha"].Success)
+            semanticVersionBuildMetaData.Sha = parsed.Groups["Sha"].Value;
 
-            return semanticVersionBuildMetaData;
-        }
+        if (parsed.Groups["Other"].Success && !parsed.Groups["Other"].Value.IsNullOrEmpty())
+            semanticVersionBuildMetaData.OtherMetaData = parsed.Groups["Other"].Value.TrimStart('.');
 
-        private static string FormatMetaDataPart(string value)
-        {
-            if (!value.IsNullOrEmpty())
-                value = Regex.Replace(value, "[^0-9A-Za-z-.]", "-");
-            return value;
-        }
+        return semanticVersionBuildMetaData;
+    }
+
+    private static string FormatMetaDataPart(string value)
+    {
+        if (!value.IsNullOrEmpty())
+            value = Regex.Replace(value, "[^0-9A-Za-z-.]", "-");
+        return value;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionExtensions.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionExtensions.cs
index 2ddb9786b2..d2a234806a 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionExtensions.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionExtensions.cs
@@ -1,21 +1,20 @@
 using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion
+namespace GitVersion;
+
+public static class SemanticVersionExtensions
 {
-    public static class SemanticVersionExtensions
+    public static void OverrideVersionManuallyIfNeeded(this SemanticVersion version, EffectiveConfiguration configuration)
     {
-        public static void OverrideVersionManuallyIfNeeded(this SemanticVersion version, EffectiveConfiguration configuration)
+        if (!configuration.NextVersion.IsNullOrEmpty() && SemanticVersion.TryParse(configuration.NextVersion, configuration.GitTagPrefix, out var manualNextVersion))
         {
-            if (!configuration.NextVersion.IsNullOrEmpty() && SemanticVersion.TryParse(configuration.NextVersion, configuration.GitTagPrefix, out var manualNextVersion))
+            if (manualNextVersion > version)
             {
-                if (manualNextVersion > version)
-                {
-                    version.Major = manualNextVersion.Major;
-                    version.Minor = manualNextVersion.Minor;
-                    version.Patch = manualNextVersion.Patch;
-                }
+                version.Major = manualNextVersion.Major;
+                version.Minor = manualNextVersion.Minor;
+                version.Patch = manualNextVersion.Patch;
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs
index b6bda809b5..dbf6cfe962 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs
@@ -3,101 +3,100 @@
 using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class SemanticVersionFormatValues
 {
-    public class SemanticVersionFormatValues
+    private readonly SemanticVersion semver;
+    private readonly EffectiveConfiguration config;
+
+    public SemanticVersionFormatValues(SemanticVersion semver, EffectiveConfiguration config)
     {
-        private readonly SemanticVersion semver;
-        private readonly EffectiveConfiguration config;
+        this.semver = semver;
+        this.config = config;
+    }
 
-        public SemanticVersionFormatValues(SemanticVersion semver, EffectiveConfiguration config)
-        {
-            this.semver = semver;
-            this.config = config;
-        }
+    public string Major => this.semver.Major.ToString();
 
-        public string Major => this.semver.Major.ToString();
+    public string Minor => this.semver.Minor.ToString();
 
-        public string Minor => this.semver.Minor.ToString();
+    public string Patch => this.semver.Patch.ToString();
 
-        public string Patch => this.semver.Patch.ToString();
+    public string? PreReleaseTag => this.semver.PreReleaseTag;
 
-        public string? PreReleaseTag => this.semver.PreReleaseTag;
+    public string? PreReleaseTagWithDash => this.semver.PreReleaseTag?.HasTag() == true ? "-" + this.semver.PreReleaseTag : null;
 
-        public string? PreReleaseTagWithDash => this.semver.PreReleaseTag?.HasTag() == true ? "-" + this.semver.PreReleaseTag : null;
+    public string? PreReleaseLabel => this.semver.PreReleaseTag?.HasTag() == true ? this.semver.PreReleaseTag.Name : null;
 
-        public string? PreReleaseLabel => this.semver.PreReleaseTag?.HasTag() == true ? this.semver.PreReleaseTag.Name : null;
+    public string? PreReleaseLabelWithDash => this.semver.PreReleaseTag?.HasTag() == true ? "-" + this.semver.PreReleaseTag.Name : null;
 
-        public string? PreReleaseLabelWithDash => this.semver.PreReleaseTag?.HasTag() == true ? "-" + this.semver.PreReleaseTag.Name : null;
+    public string? PreReleaseNumber => this.semver.PreReleaseTag?.HasTag() == true ? this.semver.PreReleaseTag.Number.ToString() : null;
 
-        public string? PreReleaseNumber => this.semver.PreReleaseTag?.HasTag() == true ? this.semver.PreReleaseTag.Number.ToString() : null;
+    public string WeightedPreReleaseNumber => GetWeightedPreReleaseNumber();
 
-        public string WeightedPreReleaseNumber => GetWeightedPreReleaseNumber();
+    public string? BuildMetaData => this.semver.BuildMetaData;
 
-        public string? BuildMetaData => this.semver.BuildMetaData;
+    public string? BuildMetaDataPadded => this.semver.BuildMetaData?.ToString("p" + this.config.BuildMetaDataPadding);
 
-        public string? BuildMetaDataPadded => this.semver.BuildMetaData?.ToString("p" + this.config.BuildMetaDataPadding);
+    public string? FullBuildMetaData => this.semver.BuildMetaData?.ToString("f");
 
-        public string? FullBuildMetaData => this.semver.BuildMetaData?.ToString("f");
+    public string MajorMinorPatch => $"{this.semver.Major}.{this.semver.Minor}.{this.semver.Patch}";
 
-        public string MajorMinorPatch => $"{this.semver.Major}.{this.semver.Minor}.{this.semver.Patch}";
+    public string SemVer => this.semver.ToString();
 
-        public string SemVer => this.semver.ToString();
+    public string LegacySemVer => this.semver.ToString("l");
 
-        public string LegacySemVer => this.semver.ToString("l");
+    public string LegacySemVerPadded => this.semver.ToString("lp" + this.config.LegacySemVerPadding);
 
-        public string LegacySemVerPadded => this.semver.ToString("lp" + this.config.LegacySemVerPadding);
+    public string? AssemblySemVer => this.semver.GetAssemblyVersion(this.config.AssemblyVersioningScheme);
 
-        public string? AssemblySemVer => this.semver.GetAssemblyVersion(this.config.AssemblyVersioningScheme);
+    public string? AssemblyFileSemVer => this.semver.GetAssemblyFileVersion(this.config.AssemblyFileVersioningScheme);
 
-        public string? AssemblyFileSemVer => this.semver.GetAssemblyFileVersion(this.config.AssemblyFileVersioningScheme);
+    public string FullSemVer => this.semver.ToString("f");
 
-        public string FullSemVer => this.semver.ToString("f");
+    public string? BranchName => this.semver.BuildMetaData?.Branch;
 
-        public string? BranchName => this.semver.BuildMetaData?.Branch;
+    public string? EscapedBranchName => this.semver.BuildMetaData?.Branch?.RegexReplace("[^a-zA-Z0-9-]", "-");
 
-        public string? EscapedBranchName => this.semver.BuildMetaData?.Branch?.RegexReplace("[^a-zA-Z0-9-]", "-");
+    public string? Sha => this.semver.BuildMetaData?.Sha;
 
-        public string? Sha => this.semver.BuildMetaData?.Sha;
+    public string? ShortSha => this.semver.BuildMetaData?.ShortSha;
 
-        public string? ShortSha => this.semver.BuildMetaData?.ShortSha;
+    public string? CommitDate => this.semver.BuildMetaData?.CommitDate?.UtcDateTime.ToString(this.config.CommitDateFormat, CultureInfo.InvariantCulture);
 
-        public string? CommitDate => this.semver.BuildMetaData?.CommitDate?.UtcDateTime.ToString(this.config.CommitDateFormat, CultureInfo.InvariantCulture);
+    // TODO When NuGet 3 is released: public string NuGetVersionV3 { get { return ??; } }
 
-        // TODO When NuGet 3 is released: public string NuGetVersionV3 { get { return ??; } }
+    public string NuGetVersionV2 => LegacySemVerPadded.ToLower();
 
-        public string NuGetVersionV2 => LegacySemVerPadded.ToLower();
+    public string NuGetVersion => NuGetVersionV2;
 
-        public string NuGetVersion => NuGetVersionV2;
+    public string? NuGetPreReleaseTagV2 => this.semver.PreReleaseTag?.HasTag() == true ? this.semver.PreReleaseTag?.ToString("lp")?.ToLower() : null;
 
-        public string? NuGetPreReleaseTagV2 => this.semver.PreReleaseTag?.HasTag() == true ? this.semver.PreReleaseTag?.ToString("lp")?.ToLower() : null;
+    public string? NuGetPreReleaseTag => NuGetPreReleaseTagV2;
 
-        public string? NuGetPreReleaseTag => NuGetPreReleaseTagV2;
+    public string InformationalVersion => this.semver.ToString("i");
 
-        public string InformationalVersion => this.semver.ToString("i");
+    [Obsolete("Use InformationalVersion instead")]
+    public string DefaultInformationalVersion => InformationalVersion;
 
-        [Obsolete("Use InformationalVersion instead")]
-        public string DefaultInformationalVersion => InformationalVersion;
+    public string? VersionSourceSha => this.semver.BuildMetaData?.VersionSourceSha;
 
-        public string? VersionSourceSha => this.semver.BuildMetaData?.VersionSourceSha;
+    public string? CommitsSinceVersionSource => this.semver.BuildMetaData?.CommitsSinceVersionSource?.ToString(CultureInfo.InvariantCulture);
 
-        public string? CommitsSinceVersionSource => this.semver.BuildMetaData?.CommitsSinceVersionSource?.ToString(CultureInfo.InvariantCulture);
+    public string? CommitsSinceVersionSourcePadded => this.semver.BuildMetaData?.CommitsSinceVersionSource?.ToString(CultureInfo.InvariantCulture).PadLeft(this.config.CommitsSinceVersionSourcePadding, '0');
 
-        public string? CommitsSinceVersionSourcePadded => this.semver.BuildMetaData?.CommitsSinceVersionSource?.ToString(CultureInfo.InvariantCulture).PadLeft(this.config.CommitsSinceVersionSourcePadding, '0');
+    public string? UncommittedChanges => this.semver.BuildMetaData?.UncommittedChanges.ToString(CultureInfo.InvariantCulture);
 
-        public string? UncommittedChanges => this.semver.BuildMetaData?.UncommittedChanges.ToString(CultureInfo.InvariantCulture);
+    private string GetWeightedPreReleaseNumber()
+    {
+        var weightedPreReleaseNumber =
+            this.semver.PreReleaseTag?.HasTag() == true ? (this.semver.PreReleaseTag.Number + this.config.PreReleaseWeight).ToString() : null;
 
-        private string GetWeightedPreReleaseNumber()
+        if (weightedPreReleaseNumber.IsNullOrEmpty())
         {
-            var weightedPreReleaseNumber =
-                this.semver.PreReleaseTag?.HasTag() == true ? (this.semver.PreReleaseTag.Number + this.config.PreReleaseWeight).ToString() : null;
-
-            if (weightedPreReleaseNumber.IsNullOrEmpty())
-            {
-                return $"{this.config.TagPreReleaseWeight}";
-            }
-
-            return weightedPreReleaseNumber;
+            return $"{this.config.TagPreReleaseWeight}";
         }
+
+        return weightedPreReleaseNumber;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
index 4e13bc686a..63a4f913db 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
@@ -4,178 +4,177 @@
 using GitVersion.Extensions;
 using GitVersion.Helpers;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class SemanticVersionPreReleaseTag :
+    IFormattable, IComparable<SemanticVersionPreReleaseTag>, IEquatable<SemanticVersionPreReleaseTag?>
 {
-    public class SemanticVersionPreReleaseTag :
-        IFormattable, IComparable<SemanticVersionPreReleaseTag>, IEquatable<SemanticVersionPreReleaseTag?>
+    private static readonly LambdaEqualityHelper<SemanticVersionPreReleaseTag> EqualityHelper =
+        new(x => x.Name, x => x.Number);
+
+    public SemanticVersionPreReleaseTag()
     {
-        private static readonly LambdaEqualityHelper<SemanticVersionPreReleaseTag> EqualityHelper =
-           new(x => x.Name, x => x.Number);
+    }
 
-        public SemanticVersionPreReleaseTag()
-        {
-        }
+    public SemanticVersionPreReleaseTag(string? name, int? number)
+    {
+        Name = name;
+        Number = number;
+    }
 
-        public SemanticVersionPreReleaseTag(string? name, int? number)
-        {
-            Name = name;
-            Number = number;
-        }
+    public SemanticVersionPreReleaseTag(SemanticVersionPreReleaseTag? preReleaseTag)
+    {
+        Name = preReleaseTag?.Name;
+        Number = preReleaseTag?.Number;
+        PromotedFromCommits = preReleaseTag?.PromotedFromCommits;
+    }
 
-        public SemanticVersionPreReleaseTag(SemanticVersionPreReleaseTag? preReleaseTag)
-        {
-            Name = preReleaseTag?.Name;
-            Number = preReleaseTag?.Number;
-            PromotedFromCommits = preReleaseTag?.PromotedFromCommits;
-        }
+    public string? Name { get; set; }
+    public int? Number { get; set; }
+    public bool? PromotedFromCommits { get; set; }
 
-        public string? Name { get; set; }
-        public int? Number { get; set; }
-        public bool? PromotedFromCommits { get; set; }
+    public override bool Equals(object? obj) => Equals(obj as SemanticVersionPreReleaseTag);
 
-        public override bool Equals(object? obj) => Equals(obj as SemanticVersionPreReleaseTag);
+    public bool Equals(SemanticVersionPreReleaseTag? other) => EqualityHelper.Equals(this, other);
 
-        public bool Equals(SemanticVersionPreReleaseTag? other) => EqualityHelper.Equals(this, other);
+    public override int GetHashCode() => EqualityHelper.GetHashCode(this);
 
-        public override int GetHashCode() => EqualityHelper.GetHashCode(this);
+    public static bool operator ==(SemanticVersionPreReleaseTag? left, SemanticVersionPreReleaseTag? right) =>
+        Equals(left, right);
 
-        public static bool operator ==(SemanticVersionPreReleaseTag? left, SemanticVersionPreReleaseTag? right) =>
-            Equals(left, right);
+    public static bool operator !=(SemanticVersionPreReleaseTag? left, SemanticVersionPreReleaseTag? right) =>
+        !Equals(left, right);
 
-        public static bool operator !=(SemanticVersionPreReleaseTag? left, SemanticVersionPreReleaseTag? right) =>
-            !Equals(left, right);
+    public static bool operator >(SemanticVersionPreReleaseTag? left, SemanticVersionPreReleaseTag? right) =>
+        left?.CompareTo(right) > 0;
 
-        public static bool operator >(SemanticVersionPreReleaseTag? left, SemanticVersionPreReleaseTag? right) =>
-            left?.CompareTo(right) > 0;
+    public static bool operator <(SemanticVersionPreReleaseTag? left, SemanticVersionPreReleaseTag? right) =>
+        left?.CompareTo(right) < 0;
 
-        public static bool operator <(SemanticVersionPreReleaseTag? left, SemanticVersionPreReleaseTag? right) =>
-            left?.CompareTo(right) < 0;
+    public static bool operator >=(SemanticVersionPreReleaseTag? left, SemanticVersionPreReleaseTag? right) =>
+        left?.CompareTo(right) >= 0;
 
-        public static bool operator >=(SemanticVersionPreReleaseTag? left, SemanticVersionPreReleaseTag? right) =>
-            left?.CompareTo(right) >= 0;
+    public static bool operator <=(SemanticVersionPreReleaseTag? left, SemanticVersionPreReleaseTag? right) =>
+        StringComparerUtils.IgnoreCaseComparer.Compare(left?.Name, right?.Name) != 1;
 
-        public static bool operator <=(SemanticVersionPreReleaseTag? left, SemanticVersionPreReleaseTag? right) =>
-            StringComparerUtils.IgnoreCaseComparer.Compare(left?.Name, right?.Name) != 1;
+    public static implicit operator string?(SemanticVersionPreReleaseTag? preReleaseTag)
+    {
+        return preReleaseTag?.ToString()!;
+    }
 
-        public static implicit operator string?(SemanticVersionPreReleaseTag? preReleaseTag)
-        {
-            return preReleaseTag?.ToString()!;
-        }
+    public static implicit operator SemanticVersionPreReleaseTag(string? preReleaseTag)
+    {
+        return Parse(preReleaseTag);
+    }
 
-        public static implicit operator SemanticVersionPreReleaseTag(string? preReleaseTag)
+    public static SemanticVersionPreReleaseTag Parse(string? preReleaseTag)
+    {
+        if (preReleaseTag.IsNullOrEmpty())
         {
-            return Parse(preReleaseTag);
+            return new SemanticVersionPreReleaseTag();
         }
 
-        public static SemanticVersionPreReleaseTag Parse(string? preReleaseTag)
+        var match = Regex.Match(preReleaseTag, @"(?<name>.*?)\.?(?<number>\d+)?$");
+        if (!match.Success)
         {
-            if (preReleaseTag.IsNullOrEmpty())
-            {
-                return new SemanticVersionPreReleaseTag();
-            }
+            // TODO check how to log this
+            Console.WriteLine($"Unable to successfully parse semver tag {preReleaseTag}");
+            return new SemanticVersionPreReleaseTag();
+        }
 
-            var match = Regex.Match(preReleaseTag, @"(?<name>.*?)\.?(?<number>\d+)?$");
-            if (!match.Success)
-            {
-                // TODO check how to log this
-                Console.WriteLine($"Unable to successfully parse semver tag {preReleaseTag}");
-                return new SemanticVersionPreReleaseTag();
-            }
+        var value = match.Groups["name"].Value;
+        var number = match.Groups["number"].Success ? int.Parse(match.Groups["number"].Value) : (int?)null;
+        if (value.EndsWith("-"))
+            return new SemanticVersionPreReleaseTag(preReleaseTag, null);
 
-            var value = match.Groups["name"].Value;
-            var number = match.Groups["number"].Success ? int.Parse(match.Groups["number"].Value) : (int?)null;
-            if (value.EndsWith("-"))
-                return new SemanticVersionPreReleaseTag(preReleaseTag, null);
+        return new SemanticVersionPreReleaseTag(value, number);
+    }
 
-            return new SemanticVersionPreReleaseTag(value, number);
+    public int CompareTo(SemanticVersionPreReleaseTag? other)
+    {
+        if (!HasTag() && other?.HasTag() == true)
+        {
+            return 1;
         }
-
-        public int CompareTo(SemanticVersionPreReleaseTag? other)
+        if (HasTag() && other?.HasTag() != true)
         {
-            if (!HasTag() && other?.HasTag() == true)
-            {
-                return 1;
-            }
-            if (HasTag() && other?.HasTag() != true)
-            {
-                return -1;
-            }
+            return -1;
+        }
 
 
-            var nameComparison = StringComparerUtils.IgnoreCaseComparer.Compare(Name, other?.Name);
-            if (nameComparison != 0)
-                return nameComparison;
+        var nameComparison = StringComparerUtils.IgnoreCaseComparer.Compare(Name, other?.Name);
+        if (nameComparison != 0)
+            return nameComparison;
 
-            return Nullable.Compare(Number, other?.Number);
-        }
+        return Nullable.Compare(Number, other?.Number);
+    }
 
-        public override string? ToString() => ToString(null);
+    public override string? ToString() => ToString(null);
 
-        /// <summary>
-        /// Default formats:
-        /// <para>t - SemVer 2.0 formatted tag [beta.1]</para>
-        /// <para>l - Legacy SemVer tag with the tag number padded. [beta1]</para>
-        /// <para>lp - Legacy SemVer tag with the tag number padded. [beta0001]. Can specify an integer to control padding (i.e., lp5)</para>
-        /// </summary>
-        public string? ToString(string? format, IFormatProvider? formatProvider = null)
+    /// <summary>
+    /// Default formats:
+    /// <para>t - SemVer 2.0 formatted tag [beta.1]</para>
+    /// <para>l - Legacy SemVer tag with the tag number padded. [beta1]</para>
+    /// <para>lp - Legacy SemVer tag with the tag number padded. [beta0001]. Can specify an integer to control padding (i.e., lp5)</para>
+    /// </summary>
+    public string? ToString(string? format, IFormatProvider? formatProvider = null)
+    {
+        if (formatProvider != null)
         {
-            if (formatProvider != null)
-            {
-                if (formatProvider.GetFormat(GetType()) is ICustomFormatter formatter)
-                    return formatter.Format(format, this, formatProvider);
-            }
+            if (formatProvider.GetFormat(GetType()) is ICustomFormatter formatter)
+                return formatter.Format(format, this, formatProvider);
+        }
 
-            if (format.IsNullOrEmpty())
-                format = "t";
+        if (format.IsNullOrEmpty())
+            format = "t";
 
-            format = format.ToLower();
-            if (format.StartsWith("lp", StringComparison.Ordinal))
+        format = format.ToLower();
+        if (format.StartsWith("lp", StringComparison.Ordinal))
+        {
+            // Handle format
+            var padding = 4;
+            if (format.Length > 2)
             {
-                // Handle format
-                var padding = 4;
-                if (format.Length > 2)
+                // try to parse
+                if (int.TryParse(format.Substring(2), out var p))
                 {
-                    // try to parse
-                    if (int.TryParse(format.Substring(2), out var p))
-                    {
-                        padding = p;
-                    }
+                    padding = p;
                 }
-
-                return Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString("D" + padding)) : FormatLegacy(GetLegacyName());
             }
 
-            return format switch
-            {
-                "t" => (Number.HasValue ? Name.IsNullOrEmpty() ? $"{Number}" : $"{Name}.{Number}" : Name),
-                "l" => (Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString()) : FormatLegacy(GetLegacyName())),
-                _ => throw new ArgumentException("Unknown format", nameof(format))
-            };
+            return Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString("D" + padding)) : FormatLegacy(GetLegacyName());
         }
 
-        private static string FormatLegacy(string tag, string number = "")
+        return format switch
         {
-            var tagEndsWithANumber = char.IsNumber(tag.LastOrDefault());
-            if (tagEndsWithANumber && number.Length > 0)
-                number = "-" + number;
+            "t" => (Number.HasValue ? Name.IsNullOrEmpty() ? $"{Number}" : $"{Name}.{Number}" : Name),
+            "l" => (Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString()) : FormatLegacy(GetLegacyName())),
+            _ => throw new ArgumentException("Unknown format", nameof(format))
+        };
+    }
 
-            if (tag.Length + number.Length > 20)
-                return $"{tag.Substring(0, 20 - number.Length)}{number}";
+    private static string FormatLegacy(string tag, string number = "")
+    {
+        var tagEndsWithANumber = char.IsNumber(tag.LastOrDefault());
+        if (tagEndsWithANumber && number.Length > 0)
+            number = "-" + number;
 
-            return $"{tag}{number}";
-        }
+        if (tag.Length + number.Length > 20)
+            return $"{tag.Substring(0, 20 - number.Length)}{number}";
 
-        private string GetLegacyName()
+        return $"{tag}{number}";
+    }
+
+    private string GetLegacyName()
+    {
+        if (Name.IsNullOrEmpty())
         {
-            if (Name.IsNullOrEmpty())
-            {
-                return string.Empty;
-            }
-            var firstPart = Name.Split('_')[0];
-            return firstPart.Replace(".", string.Empty);
+            return string.Empty;
         }
-
-        public bool HasTag() =>
-            !Name.IsNullOrEmpty() || (Number.HasValue && PromotedFromCommits != true);
+        var firstPart = Name.Split('_')[0];
+        return firstPart.Replace(".", string.Empty);
     }
-}
+
+    public bool HasTag() =>
+        !Name.IsNullOrEmpty() || (Number.HasValue && PromotedFromCommits != true);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/ShaVersionFilter.cs b/src/GitVersion.Core/VersionCalculation/ShaVersionFilter.cs
index 2fc7dac558..921c000fd0 100644
--- a/src/GitVersion.Core/VersionCalculation/ShaVersionFilter.cs
+++ b/src/GitVersion.Core/VersionCalculation/ShaVersionFilter.cs
@@ -3,28 +3,27 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
-namespace GitVersion.VersionCalculation
-{
-    public class ShaVersionFilter : IVersionFilter
-    {
-        private readonly IEnumerable<string> shas;
+namespace GitVersion.VersionCalculation;
 
-        public ShaVersionFilter(IEnumerable<string> shas) => this.shas = shas ?? throw new ArgumentNullException(nameof(shas));
+public class ShaVersionFilter : IVersionFilter
+{
+    private readonly IEnumerable<string> shas;
 
-        public bool Exclude(BaseVersion version, [NotNullWhen(true)] out string? reason)
-        {
-            if (version == null) throw new ArgumentNullException(nameof(version));
+    public ShaVersionFilter(IEnumerable<string> shas) => this.shas = shas ?? throw new ArgumentNullException(nameof(shas));
 
-            reason = null;
+    public bool Exclude(BaseVersion version, [NotNullWhen(true)] out string? reason)
+    {
+        if (version == null) throw new ArgumentNullException(nameof(version));
 
-            if (version.BaseVersionSource != null &&
-                this.shas.Any(sha => version.BaseVersionSource.Sha.StartsWith(sha, StringComparison.OrdinalIgnoreCase)))
-            {
-                reason = $"Sha {version.BaseVersionSource} was ignored due to commit having been excluded by configuration";
-                return true;
-            }
+        reason = null;
 
-            return false;
+        if (version.BaseVersionSource != null &&
+            this.shas.Any(sha => version.BaseVersionSource.Sha.StartsWith(sha, StringComparison.OrdinalIgnoreCase)))
+        {
+            reason = $"Sha {version.BaseVersionSource} was ignored due to commit having been excluded by configuration";
+            return true;
         }
+
+        return false;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/VariableProvider.cs b/src/GitVersion.Core/VersionCalculation/VariableProvider.cs
index 48896a9265..b2be307107 100644
--- a/src/GitVersion.Core/VersionCalculation/VariableProvider.cs
+++ b/src/GitVersion.Core/VersionCalculation/VariableProvider.cs
@@ -7,158 +7,157 @@
 using GitVersion.Model.Configuration;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public class VariableProvider : IVariableProvider
 {
-    public class VariableProvider : IVariableProvider
-    {
-        private readonly IEnvironment environment;
-        private readonly ILog log;
+    private readonly IEnvironment environment;
+    private readonly ILog log;
 
-        public VariableProvider(IEnvironment environment, ILog log)
-        {
-            this.environment = environment ?? throw new ArgumentNullException(nameof(environment));
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
-        }
+    public VariableProvider(IEnvironment environment, ILog log)
+    {
+        this.environment = environment ?? throw new ArgumentNullException(nameof(environment));
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
+    }
 
-        public VersionVariables GetVariablesFor(SemanticVersion semanticVersion, EffectiveConfiguration config, bool isCurrentCommitTagged)
+    public VersionVariables GetVariablesFor(SemanticVersion semanticVersion, EffectiveConfiguration config, bool isCurrentCommitTagged)
+    {
+        var isContinuousDeploymentMode = config.VersioningMode == VersioningMode.ContinuousDeployment && !isCurrentCommitTagged;
+        if (isContinuousDeploymentMode)
         {
-            var isContinuousDeploymentMode = config.VersioningMode == VersioningMode.ContinuousDeployment && !isCurrentCommitTagged;
-            if (isContinuousDeploymentMode)
-            {
-                semanticVersion = new SemanticVersion(semanticVersion);
-                // Continuous Deployment always requires a pre-release tag unless the commit is tagged
-                if (semanticVersion.PreReleaseTag?.HasTag() != true)
-                {
-                    semanticVersion.PreReleaseTag!.Name = config.GetBranchSpecificTag(this.log, semanticVersion.BuildMetaData?.Branch, null);
-                    if (semanticVersion.PreReleaseTag.Name.IsNullOrEmpty())
-                    {
-                        semanticVersion.PreReleaseTag.Name = config.ContinuousDeploymentFallbackTag;
-                    }
-                }
-            }
-
-            // Evaluate tag number pattern and append to prerelease tag, preserving build metadata
-            var appendTagNumberPattern = !config.TagNumberPattern.IsNullOrEmpty() && semanticVersion.PreReleaseTag?.HasTag() == true;
-            if (appendTagNumberPattern)
+            semanticVersion = new SemanticVersion(semanticVersion);
+            // Continuous Deployment always requires a pre-release tag unless the commit is tagged
+            if (semanticVersion.PreReleaseTag?.HasTag() != true)
             {
-                var match = Regex.Match(semanticVersion.BuildMetaData!.Branch, config.TagNumberPattern);
-                var numberGroup = match.Groups["number"];
-                if (numberGroup.Success)
+                semanticVersion.PreReleaseTag!.Name = config.GetBranchSpecificTag(this.log, semanticVersion.BuildMetaData?.Branch, null);
+                if (semanticVersion.PreReleaseTag.Name.IsNullOrEmpty())
                 {
-                    semanticVersion.PreReleaseTag!.Name += numberGroup.Value.PadLeft(config.BuildMetaDataPadding, '0');
+                    semanticVersion.PreReleaseTag.Name = config.ContinuousDeploymentFallbackTag;
                 }
             }
+        }
 
-            if (isContinuousDeploymentMode || appendTagNumberPattern || config.VersioningMode == VersioningMode.Mainline)
+        // Evaluate tag number pattern and append to prerelease tag, preserving build metadata
+        var appendTagNumberPattern = !config.TagNumberPattern.IsNullOrEmpty() && semanticVersion.PreReleaseTag?.HasTag() == true;
+        if (appendTagNumberPattern)
+        {
+            var match = Regex.Match(semanticVersion.BuildMetaData!.Branch, config.TagNumberPattern);
+            var numberGroup = match.Groups["number"];
+            if (numberGroup.Success)
             {
-                PromoteNumberOfCommitsToTagNumber(semanticVersion);
+                semanticVersion.PreReleaseTag!.Name += numberGroup.Value.PadLeft(config.BuildMetaDataPadding, '0');
             }
+        }
 
-            var semverFormatValues = new SemanticVersionFormatValues(semanticVersion, config);
-
-            var informationalVersion = CheckAndFormatString(config.AssemblyInformationalFormat, semverFormatValues, semverFormatValues.InformationalVersion, "AssemblyInformationalVersion");
-
-            var assemblyFileSemVer = CheckAndFormatString(config.AssemblyFileVersioningFormat, semverFormatValues, semverFormatValues.AssemblyFileSemVer, "AssemblyFileVersioningFormat");
-
-            var assemblySemVer = CheckAndFormatString(config.AssemblyVersioningFormat, semverFormatValues, semverFormatValues.AssemblySemVer, "AssemblyVersioningFormat");
-
-            var variables = new VersionVariables(
-                semverFormatValues.Major,
-                semverFormatValues.Minor,
-                semverFormatValues.Patch,
-                semverFormatValues.BuildMetaData,
-                semverFormatValues.BuildMetaDataPadded,
-                semverFormatValues.FullBuildMetaData,
-                semverFormatValues.BranchName,
-                semverFormatValues.EscapedBranchName,
-                semverFormatValues.Sha,
-                semverFormatValues.ShortSha,
-                semverFormatValues.MajorMinorPatch,
-                semverFormatValues.SemVer,
-                semverFormatValues.LegacySemVer,
-                semverFormatValues.LegacySemVerPadded,
-                semverFormatValues.FullSemVer,
-                assemblySemVer,
-                assemblyFileSemVer,
-                semverFormatValues.PreReleaseTag,
-                semverFormatValues.PreReleaseTagWithDash,
-                semverFormatValues.PreReleaseLabel,
-                semverFormatValues.PreReleaseLabelWithDash,
-                semverFormatValues.PreReleaseNumber,
-                semverFormatValues.WeightedPreReleaseNumber,
-                informationalVersion,
-                semverFormatValues.CommitDate,
-                semverFormatValues.NuGetVersion,
-                semverFormatValues.NuGetVersionV2,
-                semverFormatValues.NuGetPreReleaseTag,
-                semverFormatValues.NuGetPreReleaseTagV2,
-                semverFormatValues.VersionSourceSha,
-                semverFormatValues.CommitsSinceVersionSource,
-                semverFormatValues.CommitsSinceVersionSourcePadded,
-                semverFormatValues.UncommittedChanges);
-
-            return variables;
+        if (isContinuousDeploymentMode || appendTagNumberPattern || config.VersioningMode == VersioningMode.Mainline)
+        {
+            PromoteNumberOfCommitsToTagNumber(semanticVersion);
         }
 
-        private static void PromoteNumberOfCommitsToTagNumber(SemanticVersion semanticVersion)
+        var semverFormatValues = new SemanticVersionFormatValues(semanticVersion, config);
+
+        var informationalVersion = CheckAndFormatString(config.AssemblyInformationalFormat, semverFormatValues, semverFormatValues.InformationalVersion, "AssemblyInformationalVersion");
+
+        var assemblyFileSemVer = CheckAndFormatString(config.AssemblyFileVersioningFormat, semverFormatValues, semverFormatValues.AssemblyFileSemVer, "AssemblyFileVersioningFormat");
+
+        var assemblySemVer = CheckAndFormatString(config.AssemblyVersioningFormat, semverFormatValues, semverFormatValues.AssemblySemVer, "AssemblyVersioningFormat");
+
+        var variables = new VersionVariables(
+            semverFormatValues.Major,
+            semverFormatValues.Minor,
+            semverFormatValues.Patch,
+            semverFormatValues.BuildMetaData,
+            semverFormatValues.BuildMetaDataPadded,
+            semverFormatValues.FullBuildMetaData,
+            semverFormatValues.BranchName,
+            semverFormatValues.EscapedBranchName,
+            semverFormatValues.Sha,
+            semverFormatValues.ShortSha,
+            semverFormatValues.MajorMinorPatch,
+            semverFormatValues.SemVer,
+            semverFormatValues.LegacySemVer,
+            semverFormatValues.LegacySemVerPadded,
+            semverFormatValues.FullSemVer,
+            assemblySemVer,
+            assemblyFileSemVer,
+            semverFormatValues.PreReleaseTag,
+            semverFormatValues.PreReleaseTagWithDash,
+            semverFormatValues.PreReleaseLabel,
+            semverFormatValues.PreReleaseLabelWithDash,
+            semverFormatValues.PreReleaseNumber,
+            semverFormatValues.WeightedPreReleaseNumber,
+            informationalVersion,
+            semverFormatValues.CommitDate,
+            semverFormatValues.NuGetVersion,
+            semverFormatValues.NuGetVersionV2,
+            semverFormatValues.NuGetPreReleaseTag,
+            semverFormatValues.NuGetPreReleaseTagV2,
+            semverFormatValues.VersionSourceSha,
+            semverFormatValues.CommitsSinceVersionSource,
+            semverFormatValues.CommitsSinceVersionSourcePadded,
+            semverFormatValues.UncommittedChanges);
+
+        return variables;
+    }
+
+    private static void PromoteNumberOfCommitsToTagNumber(SemanticVersion semanticVersion)
+    {
+        // For continuous deployment the commits since tag gets promoted to the pre-release number
+        if (!semanticVersion.BuildMetaData!.CommitsSinceTag.HasValue)
         {
-            // For continuous deployment the commits since tag gets promoted to the pre-release number
-            if (!semanticVersion.BuildMetaData!.CommitsSinceTag.HasValue)
+            semanticVersion.PreReleaseTag!.Number = null;
+            semanticVersion.BuildMetaData.CommitsSinceVersionSource = 0;
+        }
+        else
+        {
+            // Number of commits since last tag should be added to PreRelease number if given. Remember to deduct automatic version bump.
+            if (semanticVersion.PreReleaseTag!.Number.HasValue)
             {
-                semanticVersion.PreReleaseTag!.Number = null;
-                semanticVersion.BuildMetaData.CommitsSinceVersionSource = 0;
+                semanticVersion.PreReleaseTag.Number += semanticVersion.BuildMetaData.CommitsSinceTag - 1;
             }
             else
             {
-                // Number of commits since last tag should be added to PreRelease number if given. Remember to deduct automatic version bump.
-                if (semanticVersion.PreReleaseTag!.Number.HasValue)
-                {
-                    semanticVersion.PreReleaseTag.Number += semanticVersion.BuildMetaData.CommitsSinceTag - 1;
-                }
-                else
-                {
-                    semanticVersion.PreReleaseTag.Number = semanticVersion.BuildMetaData.CommitsSinceTag;
-                    semanticVersion.PreReleaseTag.PromotedFromCommits = true;
-                }
-                semanticVersion.BuildMetaData.CommitsSinceVersionSource = semanticVersion.BuildMetaData.CommitsSinceTag.Value;
-                semanticVersion.BuildMetaData.CommitsSinceTag = null; // why is this set to null ?
+                semanticVersion.PreReleaseTag.Number = semanticVersion.BuildMetaData.CommitsSinceTag;
+                semanticVersion.PreReleaseTag.PromotedFromCommits = true;
             }
+            semanticVersion.BuildMetaData.CommitsSinceVersionSource = semanticVersion.BuildMetaData.CommitsSinceTag.Value;
+            semanticVersion.BuildMetaData.CommitsSinceTag = null; // why is this set to null ?
         }
+    }
+
+    private string? CheckAndFormatString<T>(string? formatString, T source, string? defaultValue, string formatVarName)
+    {
+        string? formattedString;
 
-        private string? CheckAndFormatString<T>(string? formatString, T source, string? defaultValue, string formatVarName)
+        if (formatString.IsNullOrEmpty())
         {
-            string? formattedString;
+            formattedString = defaultValue;
+        }
+        else
+        {
+            WarnIfUsingObsoleteFormatValues(formatString);
 
-            if (formatString.IsNullOrEmpty())
+            try
             {
-                formattedString = defaultValue;
+                formattedString = formatString.FormatWith(source, this.environment).RegexReplace("[^0-9A-Za-z-.+]", "-");
             }
-            else
+            catch (ArgumentException formex)
             {
-                WarnIfUsingObsoleteFormatValues(formatString);
-
-                try
-                {
-                    formattedString = formatString.FormatWith(source, this.environment).RegexReplace("[^0-9A-Za-z-.+]", "-");
-                }
-                catch (ArgumentException formex)
-                {
-                    throw new WarningException($"Unable to format {formatVarName}.  Check your format string: {formex.Message}");
-                }
+                throw new WarningException($"Unable to format {formatVarName}.  Check your format string: {formex.Message}");
             }
-
-            return formattedString;
         }
 
-        private void WarnIfUsingObsoleteFormatValues(string formatString)
-        {
+        return formattedString;
+    }
+
+    private void WarnIfUsingObsoleteFormatValues(string formatString)
+    {
 #pragma warning disable CS0618 // Type or member is obsolete
-            var obsoletePropertyName = nameof(SemanticVersionFormatValues.DefaultInformationalVersion);
+        var obsoletePropertyName = nameof(SemanticVersionFormatValues.DefaultInformationalVersion);
 #pragma warning restore CS0618 // Type or member is obsolete
-            if (formatString.Contains($"{{{obsoletePropertyName}}}"))
-            {
-                this.log.Write(LogLevel.Warn, $"Use format variable '{nameof(SemanticVersionFormatValues.InformationalVersion)}' instead of '{obsoletePropertyName}' which is obsolete and will be removed in a future release.");
-            }
+        if (formatString.Contains($"{{{obsoletePropertyName}}}"))
+        {
+            this.log.Write(LogLevel.Warn, $"Use format variable '{nameof(SemanticVersionFormatValues.InformationalVersion)}' instead of '{obsoletePropertyName}' which is obsolete and will be removed in a future release.");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/VersionCalculationModule.cs b/src/GitVersion.Core/VersionCalculation/VersionCalculationModule.cs
index 8762eeee56..ac301762e7 100644
--- a/src/GitVersion.Core/VersionCalculation/VersionCalculationModule.cs
+++ b/src/GitVersion.Core/VersionCalculation/VersionCalculationModule.cs
@@ -1,19 +1,18 @@
 using GitVersion.Extensions;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public class VersionCalculationModule : IGitVersionModule
 {
-    public class VersionCalculationModule : IGitVersionModule
+    public void RegisterTypes(IServiceCollection services)
     {
-        public void RegisterTypes(IServiceCollection services)
-        {
-            services.AddModule(new VersionStrategyModule());
+        services.AddModule(new VersionStrategyModule());
 
-            services.AddSingleton<IVariableProvider, VariableProvider>();
-            services.AddSingleton<IBaseVersionCalculator, BaseVersionCalculator>();
-            services.AddSingleton<IMainlineVersionCalculator, MainlineVersionCalculator>();
-            services.AddSingleton<INextVersionCalculator, NextVersionCalculator>();
-            services.AddSingleton<IIncrementStrategyFinder, IncrementStrategyFinder>();
-        }
+        services.AddSingleton<IVariableProvider, VariableProvider>();
+        services.AddSingleton<IBaseVersionCalculator, BaseVersionCalculator>();
+        services.AddSingleton<IMainlineVersionCalculator, MainlineVersionCalculator>();
+        services.AddSingleton<INextVersionCalculator, NextVersionCalculator>();
+        services.AddSingleton<IIncrementStrategyFinder, IncrementStrategyFinder>();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionCalculation/VersioningMode.cs b/src/GitVersion.Core/VersionCalculation/VersioningMode.cs
index d296e1538a..9c9cd2c2a5 100644
--- a/src/GitVersion.Core/VersionCalculation/VersioningMode.cs
+++ b/src/GitVersion.Core/VersionCalculation/VersioningMode.cs
@@ -1,9 +1,8 @@
-namespace GitVersion.VersionCalculation
+namespace GitVersion.VersionCalculation;
+
+public enum VersioningMode
 {
-    public enum VersioningMode
-    {
-        ContinuousDelivery,
-        ContinuousDeployment,
-        Mainline
-    }
-}
+    ContinuousDelivery,
+    ContinuousDeployment,
+    Mainline
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoContext.cs b/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoContext.cs
index 33e49e14ef..2b04fb8270 100644
--- a/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoContext.cs
+++ b/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoContext.cs
@@ -1,16 +1,15 @@
-namespace GitVersion.VersionConverters.AssemblyInfo
+namespace GitVersion.VersionConverters.AssemblyInfo;
+
+public readonly struct AssemblyInfoContext : IConverterContext
 {
-    public readonly struct AssemblyInfoContext : IConverterContext
+    public AssemblyInfoContext(string? workingDirectory, bool ensureAssemblyInfo, params string[] assemblyInfoFiles)
     {
-        public AssemblyInfoContext(string? workingDirectory, bool ensureAssemblyInfo, params string[] assemblyInfoFiles)
-        {
-            AssemblyInfoFiles = assemblyInfoFiles;
-            EnsureAssemblyInfo = ensureAssemblyInfo;
-            WorkingDirectory = workingDirectory;
-        }
-
-        public string? WorkingDirectory { get; }
-        public bool EnsureAssemblyInfo { get; }
-        public string[] AssemblyInfoFiles { get; }
+        AssemblyInfoFiles = assemblyInfoFiles;
+        EnsureAssemblyInfo = ensureAssemblyInfo;
+        WorkingDirectory = workingDirectory;
     }
-}
+
+    public string? WorkingDirectory { get; }
+    public bool EnsureAssemblyInfo { get; }
+    public string[] AssemblyInfoFiles { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoFileUpdater.cs b/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoFileUpdater.cs
index 1dbc9801bc..ecd6db6aa2 100644
--- a/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoFileUpdater.cs
+++ b/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoFileUpdater.cs
@@ -7,219 +7,218 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.VersionConverters.AssemblyInfo
+namespace GitVersion.VersionConverters.AssemblyInfo;
+
+public interface IAssemblyInfoFileUpdater : IVersionConverter<AssemblyInfoContext>
 {
-    public interface IAssemblyInfoFileUpdater : IVersionConverter<AssemblyInfoContext>
-    {
-    }
+}
+
+public sealed class AssemblyInfoFileUpdater : IAssemblyInfoFileUpdater
+{
+    private readonly List<Action> restoreBackupTasks = new();
+    private readonly List<Action> cleanupBackupTasks = new();
 
-    public sealed class AssemblyInfoFileUpdater : IAssemblyInfoFileUpdater
+    private readonly IDictionary<string, Regex> assemblyAttributeRegexes = new Dictionary<string, Regex>
     {
-        private readonly List<Action> restoreBackupTasks = new();
-        private readonly List<Action> cleanupBackupTasks = new();
+        {".cs", new Regex( @"(\s*\[\s*assembly:\s*(?:.*)\s*\]\s*$(\r?\n)?)", RegexOptions.Multiline) },
+        {".fs", new Regex( @"(\s*\[\s*\<assembly:\s*(?:.*)\>\s*\]\s*$(\r?\n)?)", RegexOptions.Multiline) },
+        {".vb", new Regex( @"(\s*\<Assembly:\s*(?:.*)\>\s*$(\r?\n)?)", RegexOptions.Multiline) },
+    };
 
-        private readonly IDictionary<string, Regex> assemblyAttributeRegexes = new Dictionary<string, Regex>
-        {
-            {".cs", new Regex( @"(\s*\[\s*assembly:\s*(?:.*)\s*\]\s*$(\r?\n)?)", RegexOptions.Multiline) },
-            {".fs", new Regex( @"(\s*\[\s*\<assembly:\s*(?:.*)\>\s*\]\s*$(\r?\n)?)", RegexOptions.Multiline) },
-            {".vb", new Regex( @"(\s*\<Assembly:\s*(?:.*)\>\s*$(\r?\n)?)", RegexOptions.Multiline) },
-        };
+    private readonly Regex assemblyVersionRegex = new(@"AssemblyVersion(Attribute)?\s*\(.*\)\s*");
+    private readonly Regex assemblyInfoVersionRegex = new(@"AssemblyInformationalVersion(Attribute)?\s*\(.*\)\s*");
+    private readonly Regex assemblyFileVersionRegex = new(@"AssemblyFileVersion(Attribute)?\s*\(.*\)\s*");
 
-        private readonly Regex assemblyVersionRegex = new(@"AssemblyVersion(Attribute)?\s*\(.*\)\s*");
-        private readonly Regex assemblyInfoVersionRegex = new(@"AssemblyInformationalVersion(Attribute)?\s*\(.*\)\s*");
-        private readonly Regex assemblyFileVersionRegex = new(@"AssemblyFileVersion(Attribute)?\s*\(.*\)\s*");
+    private const string NewLine = "\r\n";
 
-        private const string NewLine = "\r\n";
+    private readonly IFileSystem fileSystem;
+    private readonly ILog log;
+    private readonly TemplateManager templateManager;
 
-        private readonly IFileSystem fileSystem;
-        private readonly ILog log;
-        private readonly TemplateManager templateManager;
+    public AssemblyInfoFileUpdater(ILog log, IFileSystem fileSystem)
+    {
+        this.fileSystem = fileSystem;
+        this.log = log;
+        this.templateManager = new TemplateManager(TemplateType.AssemblyInfo);
+    }
 
-        public AssemblyInfoFileUpdater(ILog log, IFileSystem fileSystem)
-        {
-            this.fileSystem = fileSystem;
-            this.log = log;
-            this.templateManager = new TemplateManager(TemplateType.AssemblyInfo);
-        }
+    public void Execute(VersionVariables variables, AssemblyInfoContext context)
+    {
+        var assemblyInfoFiles = GetAssemblyInfoFiles(context).ToList();
+        this.log.Info("Updating assembly info files");
+        this.log.Info($"Found {assemblyInfoFiles.Count} files");
 
-        public void Execute(VersionVariables variables, AssemblyInfoContext context)
-        {
-            var assemblyInfoFiles = GetAssemblyInfoFiles(context).ToList();
-            this.log.Info("Updating assembly info files");
-            this.log.Info($"Found {assemblyInfoFiles.Count} files");
+        var assemblyVersion = variables.AssemblySemVer;
+        var assemblyVersionString = !assemblyVersion.IsNullOrWhiteSpace() ? $"AssemblyVersion(\"{assemblyVersion}\")" : null;
 
-            var assemblyVersion = variables.AssemblySemVer;
-            var assemblyVersionString = !assemblyVersion.IsNullOrWhiteSpace() ? $"AssemblyVersion(\"{assemblyVersion}\")" : null;
+        var assemblyInfoVersion = variables.InformationalVersion;
+        var assemblyInfoVersionString = !assemblyInfoVersion.IsNullOrWhiteSpace() ? $"AssemblyInformationalVersion(\"{assemblyInfoVersion}\")" : null;
 
-            var assemblyInfoVersion = variables.InformationalVersion;
-            var assemblyInfoVersionString = !assemblyInfoVersion.IsNullOrWhiteSpace() ? $"AssemblyInformationalVersion(\"{assemblyInfoVersion}\")" : null;
+        var assemblyFileVersion = variables.AssemblySemFileVer;
+        var assemblyFileVersionString = !assemblyFileVersion.IsNullOrWhiteSpace() ? $"AssemblyFileVersion(\"{assemblyFileVersion}\")" : null;
 
-            var assemblyFileVersion = variables.AssemblySemFileVer;
-            var assemblyFileVersionString = !assemblyFileVersion.IsNullOrWhiteSpace() ? $"AssemblyFileVersion(\"{assemblyFileVersion}\")" : null;
+        foreach (var assemblyInfoFile in assemblyInfoFiles)
+        {
+            var localAssemblyInfo = assemblyInfoFile.FullName;
+            var backupAssemblyInfo = localAssemblyInfo + ".bak";
+            this.fileSystem.Copy(localAssemblyInfo, backupAssemblyInfo, true);
 
-            foreach (var assemblyInfoFile in assemblyInfoFiles)
+            this.restoreBackupTasks.Add(() =>
             {
-                var localAssemblyInfo = assemblyInfoFile.FullName;
-                var backupAssemblyInfo = localAssemblyInfo + ".bak";
-                this.fileSystem.Copy(localAssemblyInfo, backupAssemblyInfo, true);
-
-                this.restoreBackupTasks.Add(() =>
+                if (this.fileSystem.Exists(localAssemblyInfo))
                 {
-                    if (this.fileSystem.Exists(localAssemblyInfo))
-                    {
-                        this.fileSystem.Delete(localAssemblyInfo);
-                    }
-
-                    this.fileSystem.Move(backupAssemblyInfo, localAssemblyInfo);
-                });
-
-                this.cleanupBackupTasks.Add(() => this.fileSystem.Delete(backupAssemblyInfo));
+                    this.fileSystem.Delete(localAssemblyInfo);
+                }
 
-                var originalFileContents = this.fileSystem.ReadAllText(localAssemblyInfo);
-                var fileContents = originalFileContents;
-                var appendedAttributes = false;
+                this.fileSystem.Move(backupAssemblyInfo, localAssemblyInfo);
+            });
 
-                if (!assemblyVersion.IsNullOrWhiteSpace())
-                {
-                    fileContents = ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(this.assemblyVersionRegex, fileContents, assemblyVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
-                }
+            this.cleanupBackupTasks.Add(() => this.fileSystem.Delete(backupAssemblyInfo));
 
-                if (!assemblyFileVersion.IsNullOrWhiteSpace())
-                {
-                    fileContents = ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(this.assemblyFileVersionRegex, fileContents, assemblyFileVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
-                }
+            var originalFileContents = this.fileSystem.ReadAllText(localAssemblyInfo);
+            var fileContents = originalFileContents;
+            var appendedAttributes = false;
 
-                if (!assemblyInfoVersion.IsNullOrWhiteSpace())
-                {
-                    fileContents = ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(this.assemblyInfoVersionRegex, fileContents, assemblyInfoVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
-                }
+            if (!assemblyVersion.IsNullOrWhiteSpace())
+            {
+                fileContents = ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(this.assemblyVersionRegex, fileContents, assemblyVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
+            }
 
-                if (appendedAttributes)
-                {
-                    // If we appended any attributes, put a new line after them
-                    fileContents += NewLine;
-                }
+            if (!assemblyFileVersion.IsNullOrWhiteSpace())
+            {
+                fileContents = ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(this.assemblyFileVersionRegex, fileContents, assemblyFileVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
+            }
 
-                if (originalFileContents != fileContents)
-                {
-                    this.fileSystem.WriteAllText(localAssemblyInfo, fileContents);
-                }
+            if (!assemblyInfoVersion.IsNullOrWhiteSpace())
+            {
+                fileContents = ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(this.assemblyInfoVersionRegex, fileContents, assemblyInfoVersionString, assemblyInfoFile.Extension, ref appendedAttributes);
             }
-            CommitChanges();
-        }
 
-        public void Dispose()
-        {
-            foreach (var restoreBackup in this.restoreBackupTasks)
+            if (appendedAttributes)
             {
-                restoreBackup();
+                // If we appended any attributes, put a new line after them
+                fileContents += NewLine;
             }
 
-            this.cleanupBackupTasks.Clear();
-            this.restoreBackupTasks.Clear();
+            if (originalFileContents != fileContents)
+            {
+                this.fileSystem.WriteAllText(localAssemblyInfo, fileContents);
+            }
         }
+        CommitChanges();
+    }
 
-        private void CommitChanges()
+    public void Dispose()
+    {
+        foreach (var restoreBackup in this.restoreBackupTasks)
         {
-            foreach (var cleanupBackupTask in this.cleanupBackupTasks)
-            {
-                cleanupBackupTask();
-            }
+            restoreBackup();
+        }
+
+        this.cleanupBackupTasks.Clear();
+        this.restoreBackupTasks.Clear();
+    }
 
-            this.cleanupBackupTasks.Clear();
-            this.restoreBackupTasks.Clear();
+    private void CommitChanges()
+    {
+        foreach (var cleanupBackupTask in this.cleanupBackupTasks)
+        {
+            cleanupBackupTask();
         }
 
-        private string ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(Regex replaceRegex, string inputString, string? replaceString, string fileExtension, ref bool appendedAttributes)
+        this.cleanupBackupTasks.Clear();
+        this.restoreBackupTasks.Clear();
+    }
+
+    private string ReplaceOrInsertAfterLastAssemblyAttributeOrAppend(Regex replaceRegex, string inputString, string? replaceString, string fileExtension, ref bool appendedAttributes)
+    {
+        var assemblyAddFormat = this.templateManager.GetAddFormatFor(fileExtension);
+
+        if (replaceRegex.IsMatch(inputString))
         {
-            var assemblyAddFormat = this.templateManager.GetAddFormatFor(fileExtension);
+            return replaceRegex.Replace(inputString, replaceString);
+        }
 
-            if (replaceRegex.IsMatch(inputString))
+        if (this.assemblyAttributeRegexes.TryGetValue(fileExtension, out var assemblyRegex))
+        {
+            var assemblyMatches = assemblyRegex.Matches(inputString);
+            if (assemblyMatches.Count > 0)
             {
-                return replaceRegex.Replace(inputString, replaceString);
+                var lastMatch = assemblyMatches[assemblyMatches.Count - 1];
+                var replacementString = lastMatch.Value;
+                if (!lastMatch.Value.EndsWith(NewLine)) replacementString += NewLine;
+                replacementString += string.Format(assemblyAddFormat, replaceString);
+                replacementString += NewLine;
+                return inputString.Replace(lastMatch.Value, replacementString);
             }
+        }
 
-            if (this.assemblyAttributeRegexes.TryGetValue(fileExtension, out var assemblyRegex))
-            {
-                var assemblyMatches = assemblyRegex.Matches(inputString);
-                if (assemblyMatches.Count > 0)
-                {
-                    var lastMatch = assemblyMatches[assemblyMatches.Count - 1];
-                    var replacementString = lastMatch.Value;
-                    if (!lastMatch.Value.EndsWith(NewLine)) replacementString += NewLine;
-                    replacementString += string.Format(assemblyAddFormat, replaceString);
-                    replacementString += NewLine;
-                    return inputString.Replace(lastMatch.Value, replacementString);
-                }
-            }
+        inputString += NewLine + string.Format(assemblyAddFormat, replaceString);
+        appendedAttributes = true;
+        return inputString;
+    }
 
-            inputString += NewLine + string.Format(assemblyAddFormat, replaceString);
-            appendedAttributes = true;
-            return inputString;
-        }
+    private IEnumerable<FileInfo> GetAssemblyInfoFiles(AssemblyInfoContext context)
+    {
+        var workingDirectory = context.WorkingDirectory!;
+        var ensureAssemblyInfo = context.EnsureAssemblyInfo;
+        var assemblyInfoFileNames = new HashSet<string>(context.AssemblyInfoFiles);
 
-        private IEnumerable<FileInfo> GetAssemblyInfoFiles(AssemblyInfoContext context)
+        if (assemblyInfoFileNames.Any(x => !x.IsNullOrWhiteSpace()))
         {
-            var workingDirectory = context.WorkingDirectory!;
-            var ensureAssemblyInfo = context.EnsureAssemblyInfo;
-            var assemblyInfoFileNames = new HashSet<string>(context.AssemblyInfoFiles);
-
-            if (assemblyInfoFileNames.Any(x => !x.IsNullOrWhiteSpace()))
+            foreach (var item in assemblyInfoFileNames)
             {
-                foreach (var item in assemblyInfoFileNames)
-                {
-                    var fullPath = Path.Combine(workingDirectory, item);
+                var fullPath = Path.Combine(workingDirectory, item);
 
-                    if (EnsureVersionAssemblyInfoFile(fullPath, ensureAssemblyInfo))
-                    {
-                        yield return new FileInfo(fullPath);
-                    }
+                if (EnsureVersionAssemblyInfoFile(fullPath, ensureAssemblyInfo))
+                {
+                    yield return new FileInfo(fullPath);
                 }
             }
-            else
+        }
+        else
+        {
+            foreach (var item in this.fileSystem.DirectoryEnumerateFiles(workingDirectory, "AssemblyInfo.*", SearchOption.AllDirectories))
             {
-                foreach (var item in this.fileSystem.DirectoryEnumerateFiles(workingDirectory, "AssemblyInfo.*", SearchOption.AllDirectories))
-                {
-                    var assemblyInfoFile = new FileInfo(item);
+                var assemblyInfoFile = new FileInfo(item);
 
-                    if (this.templateManager.IsSupported(assemblyInfoFile.Extension))
-                    {
-                        yield return assemblyInfoFile;
-                    }
+                if (this.templateManager.IsSupported(assemblyInfoFile.Extension))
+                {
+                    yield return assemblyInfoFile;
                 }
             }
         }
+    }
 
-        private bool EnsureVersionAssemblyInfoFile(string fullPath, bool ensureAssemblyInfo)
+    private bool EnsureVersionAssemblyInfoFile(string fullPath, bool ensureAssemblyInfo)
+    {
+        fullPath = fullPath ?? throw new ArgumentNullException(nameof(fullPath));
+        if (this.fileSystem.Exists(fullPath))
         {
-            fullPath = fullPath ?? throw new ArgumentNullException(nameof(fullPath));
-            if (this.fileSystem.Exists(fullPath))
-            {
-                return true;
-            }
-
-            if (!ensureAssemblyInfo)
-            {
-                return false;
-            }
+            return true;
+        }
 
-            var assemblyInfoSource = this.templateManager.GetTemplateFor(Path.GetExtension(fullPath));
+        if (!ensureAssemblyInfo)
+        {
+            return false;
+        }
 
-            if (!assemblyInfoSource.IsNullOrWhiteSpace())
-            {
-                var fileInfo = new FileInfo(fullPath);
+        var assemblyInfoSource = this.templateManager.GetTemplateFor(Path.GetExtension(fullPath));
 
-                if (fileInfo.Directory != null && !this.fileSystem.DirectoryExists(fileInfo.Directory.FullName))
-                {
-                    this.fileSystem.CreateDirectory(fileInfo.Directory.FullName);
-                }
+        if (!assemblyInfoSource.IsNullOrWhiteSpace())
+        {
+            var fileInfo = new FileInfo(fullPath);
 
-                this.fileSystem.WriteAllText(fullPath, assemblyInfoSource);
-                return true;
+            if (fileInfo.Directory != null && !this.fileSystem.DirectoryExists(fileInfo.Directory.FullName))
+            {
+                this.fileSystem.CreateDirectory(fileInfo.Directory.FullName);
             }
 
-            this.log.Warning($"No version assembly info template available to create source file '{fullPath}'");
-            return false;
+            this.fileSystem.WriteAllText(fullPath, assemblyInfoSource);
+            return true;
         }
+
+        this.log.Warning($"No version assembly info template available to create source file '{fullPath}'");
+        return false;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs b/src/GitVersion.Core/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs
index 694fba28e1..0053d9309c 100644
--- a/src/GitVersion.Core/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs
+++ b/src/GitVersion.Core/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs
@@ -7,219 +7,218 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.VersionConverters.AssemblyInfo
+namespace GitVersion.VersionConverters.AssemblyInfo;
+
+public interface IProjectFileUpdater : IVersionConverter<AssemblyInfoContext>
+{
+}
+
+public sealed class ProjectFileUpdater : IProjectFileUpdater
 {
-    public interface IProjectFileUpdater : IVersionConverter<AssemblyInfoContext>
+    internal const string AssemblyVersionElement = "AssemblyVersion";
+    internal const string FileVersionElement = "FileVersion";
+    internal const string InformationalVersionElement = "InformationalVersion";
+    internal const string VersionElement = "Version";
+
+    private readonly List<Action> restoreBackupTasks = new();
+    private readonly List<Action> cleanupBackupTasks = new();
+
+    private readonly IFileSystem fileSystem;
+    private readonly ILog log;
+
+    public ProjectFileUpdater(ILog log, IFileSystem fileSystem)
     {
+        this.fileSystem = fileSystem;
+        this.log = log;
     }
 
-    public sealed class ProjectFileUpdater : IProjectFileUpdater
+    public void Execute(VersionVariables variables, AssemblyInfoContext context)
     {
-        internal const string AssemblyVersionElement = "AssemblyVersion";
-        internal const string FileVersionElement = "FileVersion";
-        internal const string InformationalVersionElement = "InformationalVersion";
-        internal const string VersionElement = "Version";
+        if (context.EnsureAssemblyInfo)
+            throw new WarningException($"Configuration setting {nameof(context.EnsureAssemblyInfo)} is not valid when updating project files!");
 
-        private readonly List<Action> restoreBackupTasks = new();
-        private readonly List<Action> cleanupBackupTasks = new();
+        var projectFilesToUpdate = GetProjectFiles(context).ToList();
 
-        private readonly IFileSystem fileSystem;
-        private readonly ILog log;
+        var assemblyVersion = variables.AssemblySemVer;
+        var assemblyInfoVersion = variables.InformationalVersion;
+        var assemblyFileVersion = variables.AssemblySemFileVer;
+        var packageVersion = variables.NuGetVersion;
 
-        public ProjectFileUpdater(ILog log, IFileSystem fileSystem)
+        foreach (var projectFile in projectFilesToUpdate)
         {
-            this.fileSystem = fileSystem;
-            this.log = log;
-        }
-
-        public void Execute(VersionVariables variables, AssemblyInfoContext context)
-        {
-            if (context.EnsureAssemblyInfo)
-                throw new WarningException($"Configuration setting {nameof(context.EnsureAssemblyInfo)} is not valid when updating project files!");
-
-            var projectFilesToUpdate = GetProjectFiles(context).ToList();
+            var localProjectFile = projectFile.FullName;
 
-            var assemblyVersion = variables.AssemblySemVer;
-            var assemblyInfoVersion = variables.InformationalVersion;
-            var assemblyFileVersion = variables.AssemblySemFileVer;
-            var packageVersion = variables.NuGetVersion;
+            var originalFileContents = this.fileSystem.ReadAllText(localProjectFile);
+            var fileXml = XElement.Parse(originalFileContents);
 
-            foreach (var projectFile in projectFilesToUpdate)
+            if (!CanUpdateProjectFile(fileXml))
             {
-                var localProjectFile = projectFile.FullName;
-
-                var originalFileContents = this.fileSystem.ReadAllText(localProjectFile);
-                var fileXml = XElement.Parse(originalFileContents);
-
-                if (!CanUpdateProjectFile(fileXml))
-                {
-                    this.log.Warning($"Unable to update file: {localProjectFile}");
-                    continue;
-                }
-
-                this.log.Debug($"Update file: {localProjectFile}");
-
-                var backupProjectFile = localProjectFile + ".bak";
-                this.fileSystem.Copy(localProjectFile, backupProjectFile, true);
-
-                this.restoreBackupTasks.Add(() =>
-                {
-                    if (this.fileSystem.Exists(localProjectFile))
-                    {
-                        this.fileSystem.Delete(localProjectFile);
-                    }
-
-                    this.fileSystem.Move(backupProjectFile, localProjectFile);
-                });
+                this.log.Warning($"Unable to update file: {localProjectFile}");
+                continue;
+            }
 
-                this.cleanupBackupTasks.Add(() => this.fileSystem.Delete(backupProjectFile));
+            this.log.Debug($"Update file: {localProjectFile}");
 
-                if (!assemblyVersion.IsNullOrWhiteSpace())
-                {
-                    UpdateProjectVersionElement(fileXml, AssemblyVersionElement, assemblyVersion);
-                }
+            var backupProjectFile = localProjectFile + ".bak";
+            this.fileSystem.Copy(localProjectFile, backupProjectFile, true);
 
-                if (!assemblyFileVersion.IsNullOrWhiteSpace())
+            this.restoreBackupTasks.Add(() =>
+            {
+                if (this.fileSystem.Exists(localProjectFile))
                 {
-                    UpdateProjectVersionElement(fileXml, FileVersionElement, assemblyFileVersion);
+                    this.fileSystem.Delete(localProjectFile);
                 }
 
-                if (!assemblyInfoVersion.IsNullOrWhiteSpace())
-                {
-                    UpdateProjectVersionElement(fileXml, InformationalVersionElement, assemblyInfoVersion);
-                }
+                this.fileSystem.Move(backupProjectFile, localProjectFile);
+            });
 
-                if (!packageVersion.IsNullOrWhiteSpace())
-                {
-                    UpdateProjectVersionElement(fileXml, VersionElement, packageVersion);
-                }
+            this.cleanupBackupTasks.Add(() => this.fileSystem.Delete(backupProjectFile));
 
-                var outputXmlString = fileXml.ToString();
-                if (originalFileContents != outputXmlString)
-                {
-                    this.fileSystem.WriteAllText(localProjectFile, outputXmlString);
-                }
+            if (!assemblyVersion.IsNullOrWhiteSpace())
+            {
+                UpdateProjectVersionElement(fileXml, AssemblyVersionElement, assemblyVersion);
             }
 
-            CommitChanges();
-        }
-
-        internal bool CanUpdateProjectFile(XElement xmlRoot)
-        {
-            if (xmlRoot.Name != "Project")
+            if (!assemblyFileVersion.IsNullOrWhiteSpace())
             {
-                this.log.Warning($"Invalid project file specified, root element must be <Project>.");
-                return false;
+                UpdateProjectVersionElement(fileXml, FileVersionElement, assemblyFileVersion);
             }
 
-            var supportedSdks = new[] { "Microsoft.NET.Sdk", "Microsoft.NET.Sdk.Web", "Microsoft.NET.Sdk.WindowsDesktop", "Microsoft.NET.Sdk.Razor", "Microsoft.NET.Sdk.Worker" };
-            var sdkAttribute = xmlRoot.Attribute("Sdk");
-            if (sdkAttribute == null || !supportedSdks.Contains(sdkAttribute.Value))
+            if (!assemblyInfoVersion.IsNullOrWhiteSpace())
             {
-                var supportedSdkString = string.Join("|", supportedSdks);
-                this.log.Warning($"Specified project file Sdk ({sdkAttribute?.Value}) is not supported, please ensure the project sdk is of the following: {supportedSdkString}.");
-                return false;
+                UpdateProjectVersionElement(fileXml, InformationalVersionElement, assemblyInfoVersion);
             }
 
-            var propertyGroups = xmlRoot.Descendants("PropertyGroup").ToList();
-            if (!propertyGroups.Any())
+            if (!packageVersion.IsNullOrWhiteSpace())
             {
-                this.log.Warning("Unable to locate any <PropertyGroup> elements in specified project file. Are you sure it is in a correct format?");
-                return false;
+                UpdateProjectVersionElement(fileXml, VersionElement, packageVersion);
             }
 
-            var lastGenerateAssemblyInfoElement = propertyGroups.SelectMany(s => s.Elements("GenerateAssemblyInfo")).LastOrDefault();
-            if (lastGenerateAssemblyInfoElement != null && (bool)lastGenerateAssemblyInfoElement == false)
+            var outputXmlString = fileXml.ToString();
+            if (originalFileContents != outputXmlString)
             {
-                this.log.Warning($"Project file specifies <GenerateAssemblyInfo>false</GenerateAssemblyInfo>: versions set in this project file will not affect the output artifacts.");
-                return false;
+                this.fileSystem.WriteAllText(localProjectFile, outputXmlString);
             }
-
-            return true;
         }
 
-        internal static void UpdateProjectVersionElement(XElement xmlRoot, string versionElement, string versionValue)
-        {
-            var propertyGroups = xmlRoot.Descendants("PropertyGroup").ToList();
+        CommitChanges();
+    }
 
-            var propertyGroupToModify = propertyGroups.LastOrDefault(l => l.Element(versionElement) != null)
-                ?? propertyGroups.First();
+    internal bool CanUpdateProjectFile(XElement xmlRoot)
+    {
+        if (xmlRoot.Name != "Project")
+        {
+            this.log.Warning($"Invalid project file specified, root element must be <Project>.");
+            return false;
+        }
 
-            var versionXmlElement = propertyGroupToModify.Elements(versionElement).LastOrDefault();
-            if (versionXmlElement != null)
-            {
-                versionXmlElement.Value = versionValue;
-            }
-            else
-            {
-                propertyGroupToModify.SetElementValue(versionElement, versionValue);
-            }
+        var supportedSdks = new[] { "Microsoft.NET.Sdk", "Microsoft.NET.Sdk.Web", "Microsoft.NET.Sdk.WindowsDesktop", "Microsoft.NET.Sdk.Razor", "Microsoft.NET.Sdk.Worker" };
+        var sdkAttribute = xmlRoot.Attribute("Sdk");
+        if (sdkAttribute == null || !supportedSdks.Contains(sdkAttribute.Value))
+        {
+            var supportedSdkString = string.Join("|", supportedSdks);
+            this.log.Warning($"Specified project file Sdk ({sdkAttribute?.Value}) is not supported, please ensure the project sdk is of the following: {supportedSdkString}.");
+            return false;
         }
 
-        public void Dispose()
+        var propertyGroups = xmlRoot.Descendants("PropertyGroup").ToList();
+        if (!propertyGroups.Any())
         {
-            foreach (var restoreBackup in this.restoreBackupTasks)
-            {
-                restoreBackup();
-            }
+            this.log.Warning("Unable to locate any <PropertyGroup> elements in specified project file. Are you sure it is in a correct format?");
+            return false;
+        }
 
-            this.cleanupBackupTasks.Clear();
-            this.restoreBackupTasks.Clear();
+        var lastGenerateAssemblyInfoElement = propertyGroups.SelectMany(s => s.Elements("GenerateAssemblyInfo")).LastOrDefault();
+        if (lastGenerateAssemblyInfoElement != null && (bool)lastGenerateAssemblyInfoElement == false)
+        {
+            this.log.Warning($"Project file specifies <GenerateAssemblyInfo>false</GenerateAssemblyInfo>: versions set in this project file will not affect the output artifacts.");
+            return false;
         }
 
-        private void CommitChanges()
+        return true;
+    }
+
+    internal static void UpdateProjectVersionElement(XElement xmlRoot, string versionElement, string versionValue)
+    {
+        var propertyGroups = xmlRoot.Descendants("PropertyGroup").ToList();
+
+        var propertyGroupToModify = propertyGroups.LastOrDefault(l => l.Element(versionElement) != null)
+                                    ?? propertyGroups.First();
+
+        var versionXmlElement = propertyGroupToModify.Elements(versionElement).LastOrDefault();
+        if (versionXmlElement != null)
         {
-            foreach (var cleanupBackupTask in this.cleanupBackupTasks)
-            {
-                cleanupBackupTask();
-            }
+            versionXmlElement.Value = versionValue;
+        }
+        else
+        {
+            propertyGroupToModify.SetElementValue(versionElement, versionValue);
+        }
+    }
 
-            this.cleanupBackupTasks.Clear();
-            this.restoreBackupTasks.Clear();
+    public void Dispose()
+    {
+        foreach (var restoreBackup in this.restoreBackupTasks)
+        {
+            restoreBackup();
         }
 
-        private IEnumerable<FileInfo> GetProjectFiles(AssemblyInfoContext context)
+        this.cleanupBackupTasks.Clear();
+        this.restoreBackupTasks.Clear();
+    }
+
+    private void CommitChanges()
+    {
+        foreach (var cleanupBackupTask in this.cleanupBackupTasks)
         {
-            var workingDirectory = context.WorkingDirectory;
-            var assemblyInfoFileNames = new HashSet<string>(context.AssemblyInfoFiles);
+            cleanupBackupTask();
+        }
+
+        this.cleanupBackupTasks.Clear();
+        this.restoreBackupTasks.Clear();
+    }
 
-            if (assemblyInfoFileNames.Any(x => !x.IsNullOrWhiteSpace()))
+    private IEnumerable<FileInfo> GetProjectFiles(AssemblyInfoContext context)
+    {
+        var workingDirectory = context.WorkingDirectory;
+        var assemblyInfoFileNames = new HashSet<string>(context.AssemblyInfoFiles);
+
+        if (assemblyInfoFileNames.Any(x => !x.IsNullOrWhiteSpace()))
+        {
+            foreach (var item in assemblyInfoFileNames)
             {
-                foreach (var item in assemblyInfoFileNames)
+                var fullPath = Path.Combine(workingDirectory, item);
+
+                if (this.fileSystem.Exists(fullPath))
                 {
-                    var fullPath = Path.Combine(workingDirectory, item);
-
-                    if (this.fileSystem.Exists(fullPath))
-                    {
-                        yield return new FileInfo(fullPath);
-                    }
-                    else
-                    {
-                        this.log.Warning($"Specified file {fullPath} was not found and will not be updated.");
-                    }
+                    yield return new FileInfo(fullPath);
                 }
-            }
-            else
-            {
-                foreach (var item in this.fileSystem.DirectoryEnumerateFiles(workingDirectory, "*", SearchOption.AllDirectories).Where(IsSupportedProjectFile))
+                else
                 {
-                    var assemblyInfoFile = new FileInfo(item);
-
-                    yield return assemblyInfoFile;
+                    this.log.Warning($"Specified file {fullPath} was not found and will not be updated.");
                 }
             }
         }
-
-        private bool IsSupportedProjectFile(string fileName)
+        else
         {
-            if (fileName.IsNullOrEmpty())
+            foreach (var item in this.fileSystem.DirectoryEnumerateFiles(workingDirectory, "*", SearchOption.AllDirectories).Where(IsSupportedProjectFile))
             {
-                return false;
+                var assemblyInfoFile = new FileInfo(item);
+
+                yield return assemblyInfoFile;
             }
+        }
+    }
 
-            return fileName.EndsWith(".csproj") ||
-                   fileName.EndsWith(".fsproj") ||
-                   fileName.EndsWith(".vbproj");
+    private bool IsSupportedProjectFile(string fileName)
+    {
+        if (fileName.IsNullOrEmpty())
+        {
+            return false;
         }
+
+        return fileName.EndsWith(".csproj") ||
+               fileName.EndsWith(".fsproj") ||
+               fileName.EndsWith(".vbproj");
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoContext.cs b/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoContext.cs
index 8682d6100c..8eac2d68e4 100644
--- a/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoContext.cs
+++ b/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoContext.cs
@@ -1,16 +1,15 @@
-namespace GitVersion.VersionConverters.GitVersionInfo
+namespace GitVersion.VersionConverters.GitVersionInfo;
+
+public readonly struct GitVersionInfoContext : IConverterContext
 {
-    public readonly struct GitVersionInfoContext : IConverterContext
+    public GitVersionInfoContext(string? workingDirectory, string fileName, string fileExtension)
     {
-        public GitVersionInfoContext(string? workingDirectory, string fileName, string fileExtension)
-        {
-            WorkingDirectory = workingDirectory;
-            FileName = fileName;
-            FileExtension = fileExtension;
-        }
-
-        public string? WorkingDirectory { get; }
-        public string FileName { get; }
-        public string FileExtension { get; }
+        WorkingDirectory = workingDirectory;
+        FileName = fileName;
+        FileExtension = fileExtension;
     }
-}
+
+    public string? WorkingDirectory { get; }
+    public string FileName { get; }
+    public string FileExtension { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoGenerator.cs b/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoGenerator.cs
index 62ab9982a5..81977e987a 100644
--- a/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoGenerator.cs
+++ b/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoGenerator.cs
@@ -3,62 +3,61 @@
 using System.Linq;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.VersionConverters.GitVersionInfo
+namespace GitVersion.VersionConverters.GitVersionInfo;
+
+public interface IGitVersionInfoGenerator : IVersionConverter<GitVersionInfoContext>
 {
-    public interface IGitVersionInfoGenerator : IVersionConverter<GitVersionInfoContext>
+}
+
+public sealed class GitVersionInfoGenerator : IGitVersionInfoGenerator
+{
+    private readonly IFileSystem fileSystem;
+    private readonly TemplateManager templateManager;
+
+    public GitVersionInfoGenerator(IFileSystem fileSystem)
     {
+        this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
+        this.templateManager = new TemplateManager(TemplateType.GitVersionInfo);
     }
 
-    public sealed class GitVersionInfoGenerator : IGitVersionInfoGenerator
+    public void Execute(VersionVariables variables, GitVersionInfoContext context)
     {
-        private readonly IFileSystem fileSystem;
-        private readonly TemplateManager templateManager;
+        var fileName = context.FileName;
+        var directory = context.WorkingDirectory;
+        var filePath = Path.Combine(directory, fileName);
 
-        public GitVersionInfoGenerator(IFileSystem fileSystem)
-        {
-            this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
-            this.templateManager = new TemplateManager(TemplateType.GitVersionInfo);
-        }
+        string? originalFileContents = null;
 
-        public void Execute(VersionVariables variables, GitVersionInfoContext context)
+        if (File.Exists(filePath))
         {
-            var fileName = context.FileName;
-            var directory = context.WorkingDirectory;
-            var filePath = Path.Combine(directory, fileName);
-
-            string? originalFileContents = null;
-
-            if (File.Exists(filePath))
-            {
-                originalFileContents = this.fileSystem.ReadAllText(filePath);
-            }
-
-            var fileExtension = Path.GetExtension(filePath);
-            var template = this.templateManager.GetTemplateFor(fileExtension);
-            var addFormat = this.templateManager.GetAddFormatFor(fileExtension);
-            var indentation = GetIndentation(fileExtension);
+            originalFileContents = this.fileSystem.ReadAllText(filePath);
+        }
 
-            var members = string.Join(System.Environment.NewLine, variables.Select(v => string.Format(indentation + addFormat, v.Key, v.Value)));
+        var fileExtension = Path.GetExtension(filePath);
+        var template = this.templateManager.GetTemplateFor(fileExtension);
+        var addFormat = this.templateManager.GetAddFormatFor(fileExtension);
+        var indentation = GetIndentation(fileExtension);
 
-            var fileContents = string.Format(template, members);
+        var members = string.Join(System.Environment.NewLine, variables.Select(v => string.Format(indentation + addFormat, v.Key, v.Value)));
 
-            if (fileContents != originalFileContents)
-            {
-                this.fileSystem.WriteAllText(filePath, fileContents);
-            }
-        }
+        var fileContents = string.Format(template, members);
 
-        public void Dispose()
+        if (fileContents != originalFileContents)
         {
+            this.fileSystem.WriteAllText(filePath, fileContents);
         }
+    }
 
-        // Because The VB-generated class is included in a namespace declaration,
-        // the properties must be offsetted by 2 tabs.
-        // Whereas in the C# and F# cases, 1 tab is enough.
-        private static string GetIndentation(string fileExtension)
-        {
-            var tabs = fileExtension.ToLowerInvariant().EndsWith("vb") ? 2 : 1;
-            return new string(' ', tabs * 4);
-        }
+    public void Dispose()
+    {
     }
-}
+
+    // Because The VB-generated class is included in a namespace declaration,
+    // the properties must be offsetted by 2 tabs.
+    // Whereas in the C# and F# cases, 1 tab is enough.
+    private static string GetIndentation(string fileExtension)
+    {
+        var tabs = fileExtension.ToLowerInvariant().EndsWith("vb") ? 2 : 1;
+        return new string(' ', tabs * 4);
+    }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionConverters/IConverterContext.cs b/src/GitVersion.Core/VersionConverters/IConverterContext.cs
index 5b0d077f2a..cd567a57f2 100644
--- a/src/GitVersion.Core/VersionConverters/IConverterContext.cs
+++ b/src/GitVersion.Core/VersionConverters/IConverterContext.cs
@@ -1,7 +1,6 @@
-namespace GitVersion.VersionConverters
+namespace GitVersion.VersionConverters;
+
+public interface IConverterContext
 {
-    public interface IConverterContext
-    {
-        public string? WorkingDirectory { get; }
-    }
-}
+    public string? WorkingDirectory { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionConverters/IVersionConverter.cs b/src/GitVersion.Core/VersionConverters/IVersionConverter.cs
index ec48684676..b192a83f60 100644
--- a/src/GitVersion.Core/VersionConverters/IVersionConverter.cs
+++ b/src/GitVersion.Core/VersionConverters/IVersionConverter.cs
@@ -1,10 +1,9 @@
 using System;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.VersionConverters
+namespace GitVersion.VersionConverters;
+
+public interface IVersionConverter<in T> : IDisposable where T : IConverterContext
 {
-    public interface IVersionConverter<in T> : IDisposable where T : IConverterContext
-    {
-        public void Execute(VersionVariables variables, T context);
-    }
-}
+    public void Execute(VersionVariables variables, T context);
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputContext.cs b/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputContext.cs
index 9663ac3138..cee39d10be 100644
--- a/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputContext.cs
+++ b/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputContext.cs
@@ -1,16 +1,15 @@
-namespace GitVersion.VersionConverters.OutputGenerator
+namespace GitVersion.VersionConverters.OutputGenerator;
+
+public readonly struct OutputContext : IConverterContext
 {
-    public readonly struct OutputContext : IConverterContext
+    public OutputContext(string? workingDirectory, string? outputFile, bool? updateBuildNumber)
     {
-        public OutputContext(string? workingDirectory, string? outputFile, bool? updateBuildNumber)
-        {
-            WorkingDirectory = workingDirectory;
-            OutputFile = outputFile;
-            UpdateBuildNumber = updateBuildNumber;
-        }
-
-        public string? WorkingDirectory { get; }
-        public string? OutputFile { get; }
-        public bool? UpdateBuildNumber { get; }
+        WorkingDirectory = workingDirectory;
+        OutputFile = outputFile;
+        UpdateBuildNumber = updateBuildNumber;
     }
-}
+
+    public string? WorkingDirectory { get; }
+    public string? OutputFile { get; }
+    public bool? UpdateBuildNumber { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputGenerator.cs b/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputGenerator.cs
index 5b9117c003..13ec3abdcc 100644
--- a/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputGenerator.cs
+++ b/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputGenerator.cs
@@ -7,61 +7,60 @@
 using GitVersion.OutputVariables;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion.VersionConverters.OutputGenerator
+namespace GitVersion.VersionConverters.OutputGenerator;
+
+public interface IOutputGenerator : IVersionConverter<OutputContext>
 {
-    public interface IOutputGenerator : IVersionConverter<OutputContext>
+}
+
+public sealed class OutputGenerator : IOutputGenerator
+{
+    private readonly IConsole console;
+    private readonly IFileSystem fileSystem;
+    private readonly IOptions<GitVersionOptions> options;
+    private readonly ICurrentBuildAgent buildAgent;
+
+    public OutputGenerator(ICurrentBuildAgent buildAgent, IConsole console, IFileSystem fileSystem, IOptions<GitVersionOptions> options)
     {
+        this.console = console ?? throw new ArgumentNullException(nameof(console));
+        this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
+        this.options = options ?? throw new ArgumentNullException(nameof(options));
+        this.buildAgent = buildAgent;
     }
 
-    public sealed class OutputGenerator : IOutputGenerator
+    public void Execute(VersionVariables variables, OutputContext context)
     {
-        private readonly IConsole console;
-        private readonly IFileSystem fileSystem;
-        private readonly IOptions<GitVersionOptions> options;
-        private readonly ICurrentBuildAgent buildAgent;
-
-        public OutputGenerator(ICurrentBuildAgent buildAgent, IConsole console, IFileSystem fileSystem, IOptions<GitVersionOptions> options)
+        var gitVersionOptions = this.options.Value;
+        if (gitVersionOptions.Output.Contains(OutputType.BuildServer))
         {
-            this.console = console ?? throw new ArgumentNullException(nameof(console));
-            this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
-            this.options = options ?? throw new ArgumentNullException(nameof(options));
-            this.buildAgent = buildAgent;
+            this.buildAgent?.WriteIntegration(this.console.WriteLine, variables, context.UpdateBuildNumber ?? true);
         }
-
-        public void Execute(VersionVariables variables, OutputContext context)
+        if (gitVersionOptions.Output.Contains(OutputType.File))
         {
-            var gitVersionOptions = this.options.Value;
-            if (gitVersionOptions.Output.Contains(OutputType.BuildServer))
-            {
-                this.buildAgent?.WriteIntegration(this.console.WriteLine, variables, context.UpdateBuildNumber ?? true);
-            }
-            if (gitVersionOptions.Output.Contains(OutputType.File))
-            {
-                var retryOperation = new RetryAction<IOException>();
-                retryOperation.Execute(() => this.fileSystem.WriteAllText(context.OutputFile, variables.ToString()));
-            }
-            if (gitVersionOptions.Output.Contains(OutputType.Json))
+            var retryOperation = new RetryAction<IOException>();
+            retryOperation.Execute(() => this.fileSystem.WriteAllText(context.OutputFile, variables.ToString()));
+        }
+        if (gitVersionOptions.Output.Contains(OutputType.Json))
+        {
+            switch (gitVersionOptions.ShowVariable)
             {
-                switch (gitVersionOptions.ShowVariable)
-                {
-                    case null:
-                        this.console.WriteLine(variables.ToString());
-                        break;
+                case null:
+                    this.console.WriteLine(variables.ToString());
+                    break;
 
-                    default:
-                        if (!variables.TryGetValue(gitVersionOptions.ShowVariable, out var part))
-                        {
-                            throw new WarningException($"'{gitVersionOptions.ShowVariable}' variable does not exist");
-                        }
+                default:
+                    if (!variables.TryGetValue(gitVersionOptions.ShowVariable, out var part))
+                    {
+                        throw new WarningException($"'{gitVersionOptions.ShowVariable}' variable does not exist");
+                    }
 
-                        this.console.WriteLine(part);
-                        break;
-                }
+                    this.console.WriteLine(part);
+                    break;
             }
         }
+    }
 
-        public void Dispose()
-        {
-        }
+    public void Dispose()
+    {
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionConverters/TemplateManager.cs b/src/GitVersion.Core/VersionConverters/TemplateManager.cs
index 20dbb59314..1446a9fa76 100644
--- a/src/GitVersion.Core/VersionConverters/TemplateManager.cs
+++ b/src/GitVersion.Core/VersionConverters/TemplateManager.cs
@@ -4,81 +4,80 @@
 using System.Linq;
 using GitVersion.Extensions;
 
-namespace GitVersion.VersionConverters
+namespace GitVersion.VersionConverters;
+
+internal enum TemplateType
 {
-    internal enum TemplateType
+    AssemblyInfo,
+    GitVersionInfo
+}
+
+internal class TemplateManager
+{
+    private readonly Dictionary<string, string> templates;
+    private readonly Dictionary<string, string> addFormats;
+
+    public TemplateManager(TemplateType templateType)
     {
-        AssemblyInfo,
-        GitVersionInfo
+        this.templates = GetEmbeddedTemplates(templateType, "Templates").ToDictionary(Path.GetExtension, v => v, StringComparer.OrdinalIgnoreCase);
+        this.addFormats = GetEmbeddedTemplates(templateType, "AddFormats").ToDictionary(Path.GetExtension, v => v, StringComparer.OrdinalIgnoreCase);
     }
 
-    internal class TemplateManager
+    public string? GetTemplateFor(string fileExtension)
     {
-        private readonly Dictionary<string, string> templates;
-        private readonly Dictionary<string, string> addFormats;
-
-        public TemplateManager(TemplateType templateType)
+        if (fileExtension == null)
         {
-            this.templates = GetEmbeddedTemplates(templateType, "Templates").ToDictionary(Path.GetExtension, v => v, StringComparer.OrdinalIgnoreCase);
-            this.addFormats = GetEmbeddedTemplates(templateType, "AddFormats").ToDictionary(Path.GetExtension, v => v, StringComparer.OrdinalIgnoreCase);
+            throw new ArgumentNullException(nameof(fileExtension));
         }
 
-        public string? GetTemplateFor(string fileExtension)
-        {
-            if (fileExtension == null)
-            {
-                throw new ArgumentNullException(nameof(fileExtension));
-            }
-
-            string? result = null;
+        string? result = null;
 
-            if (this.templates.TryGetValue(fileExtension, out var template) && template != null)
-            {
-                result = template.ReadAsStringFromEmbeddedResource<TemplateManager>();
-            }
-
-            return result;
+        if (this.templates.TryGetValue(fileExtension, out var template) && template != null)
+        {
+            result = template.ReadAsStringFromEmbeddedResource<TemplateManager>();
         }
 
-        public string? GetAddFormatFor(string fileExtension)
-        {
-            if (fileExtension == null)
-            {
-                throw new ArgumentNullException(nameof(fileExtension));
-            }
+        return result;
+    }
 
-            string? result = null;
+    public string? GetAddFormatFor(string fileExtension)
+    {
+        if (fileExtension == null)
+        {
+            throw new ArgumentNullException(nameof(fileExtension));
+        }
 
-            if (this.addFormats.TryGetValue(fileExtension, out var addFormat) && addFormat != null)
-            {
-                result = addFormat.ReadAsStringFromEmbeddedResource<TemplateManager>().TrimEnd('\r', '\n');
-            }
+        string? result = null;
 
-            return result;
+        if (this.addFormats.TryGetValue(fileExtension, out var addFormat) && addFormat != null)
+        {
+            result = addFormat.ReadAsStringFromEmbeddedResource<TemplateManager>().TrimEnd('\r', '\n');
         }
 
-        public bool IsSupported(string fileExtension)
-        {
-            if (fileExtension == null)
-            {
-                throw new ArgumentNullException(nameof(fileExtension));
-            }
+        return result;
+    }
 
-            return this.templates.ContainsKey(fileExtension);
+    public bool IsSupported(string fileExtension)
+    {
+        if (fileExtension == null)
+        {
+            throw new ArgumentNullException(nameof(fileExtension));
         }
 
-        private static IEnumerable<string> GetEmbeddedTemplates(TemplateType templateType, string templateCategory)
-        {
+        return this.templates.ContainsKey(fileExtension);
+    }
 
-            var assy = typeof(TemplateManager).Assembly;
+    private static IEnumerable<string> GetEmbeddedTemplates(TemplateType templateType, string templateCategory)
+    {
+
+        var assy = typeof(TemplateManager).Assembly;
 
-            foreach (var name in assy.GetManifestResourceNames())
+        foreach (var name in assy.GetManifestResourceNames())
+        {
+            if (name.Contains(templateType.ToString()) && name.Contains(templateCategory))
             {
-                if (name.Contains(templateType.ToString()) && name.Contains(templateCategory))
-                {
-                    yield return name;
-                }
+                yield return name;
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionConverters/VersionConvertersModule.cs b/src/GitVersion.Core/VersionConverters/VersionConvertersModule.cs
index cb44632b5f..fdf1ac9736 100644
--- a/src/GitVersion.Core/VersionConverters/VersionConvertersModule.cs
+++ b/src/GitVersion.Core/VersionConverters/VersionConvertersModule.cs
@@ -4,17 +4,16 @@
 using GitVersion.VersionConverters.WixUpdater;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GitVersion.VersionConverters
+namespace GitVersion.VersionConverters;
+
+public class VersionConvertersModule : IGitVersionModule
 {
-    public class VersionConvertersModule : IGitVersionModule
+    public void RegisterTypes(IServiceCollection services)
     {
-        public void RegisterTypes(IServiceCollection services)
-        {
-            services.AddSingleton<IOutputGenerator, OutputGenerator.OutputGenerator>();
-            services.AddSingleton<IGitVersionInfoGenerator, GitVersionInfoGenerator>();
-            services.AddSingleton<IWixVersionFileUpdater, WixVersionFileUpdater>();
-            services.AddSingleton<IAssemblyInfoFileUpdater, AssemblyInfoFileUpdater>();
-            services.AddSingleton<IProjectFileUpdater, ProjectFileUpdater>();
-        }
+        services.AddSingleton<IOutputGenerator, OutputGenerator.OutputGenerator>();
+        services.AddSingleton<IGitVersionInfoGenerator, GitVersionInfoGenerator>();
+        services.AddSingleton<IWixVersionFileUpdater, WixVersionFileUpdater>();
+        services.AddSingleton<IAssemblyInfoFileUpdater, AssemblyInfoFileUpdater>();
+        services.AddSingleton<IProjectFileUpdater, ProjectFileUpdater>();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionContext.cs b/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionContext.cs
index 89294500a6..b01aed1b8c 100644
--- a/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionContext.cs
+++ b/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionContext.cs
@@ -1,10 +1,9 @@
-namespace GitVersion.VersionConverters.WixUpdater
+namespace GitVersion.VersionConverters.WixUpdater;
+
+public readonly struct WixVersionContext : IConverterContext
 {
-    public readonly struct WixVersionContext : IConverterContext
-    {
-        public WixVersionContext(string? workingDirectory) =>
-            WorkingDirectory = workingDirectory;
+    public WixVersionContext(string? workingDirectory) =>
+        WorkingDirectory = workingDirectory;
 
-        public string? WorkingDirectory { get; }
-    }
-}
+    public string? WorkingDirectory { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionFileUpdater.cs b/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionFileUpdater.cs
index a886487515..4506850e94 100644
--- a/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionFileUpdater.cs
+++ b/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionFileUpdater.cs
@@ -5,55 +5,54 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
-namespace GitVersion.VersionConverters.WixUpdater
+namespace GitVersion.VersionConverters.WixUpdater;
+
+public interface IWixVersionFileUpdater : IVersionConverter<WixVersionContext>
+{
+}
+public sealed class WixVersionFileUpdater : IWixVersionFileUpdater
 {
-    public interface IWixVersionFileUpdater : IVersionConverter<WixVersionContext>
+    private readonly IFileSystem fileSystem;
+    private readonly ILog log;
+    private string? wixVersionFile;
+    public const string WixVersionFileName = "GitVersion_WixVersion.wxi";
+
+    public WixVersionFileUpdater(IFileSystem fileSystem, ILog log)
     {
+        this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
     }
-    public sealed class WixVersionFileUpdater : IWixVersionFileUpdater
-    {
-        private readonly IFileSystem fileSystem;
-        private readonly ILog log;
-        private string? wixVersionFile;
-        public const string WixVersionFileName = "GitVersion_WixVersion.wxi";
-
-        public WixVersionFileUpdater(IFileSystem fileSystem, ILog log)
-        {
-            this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
-        }
 
-        public void Execute(VersionVariables variables, WixVersionContext context)
-        {
-            this.wixVersionFile = Path.Combine(context.WorkingDirectory, WixVersionFileName);
-            this.log.Info("Updating GitVersion_WixVersion.wxi");
+    public void Execute(VersionVariables variables, WixVersionContext context)
+    {
+        this.wixVersionFile = Path.Combine(context.WorkingDirectory, WixVersionFileName);
+        this.log.Info("Updating GitVersion_WixVersion.wxi");
 
-            var doc = new XmlDocument();
-            doc.LoadXml(GetWixFormatFromVersionVariables(variables));
+        var doc = new XmlDocument();
+        doc.LoadXml(GetWixFormatFromVersionVariables(variables));
 
-            var xmlDecl = doc.CreateXmlDeclaration("1.0", "utf-8", null);
-            var root = doc.DocumentElement;
-            doc.InsertBefore(xmlDecl, root);
+        var xmlDecl = doc.CreateXmlDeclaration("1.0", "utf-8", null);
+        var root = doc.DocumentElement;
+        doc.InsertBefore(xmlDecl, root);
 
-            this.fileSystem.Delete(this.wixVersionFile);
-            using var fs = this.fileSystem.OpenWrite(this.wixVersionFile);
-            doc.Save(fs);
-        }
+        this.fileSystem.Delete(this.wixVersionFile);
+        using var fs = this.fileSystem.OpenWrite(this.wixVersionFile);
+        doc.Save(fs);
+    }
 
-        private static string GetWixFormatFromVersionVariables(VersionVariables variables)
+    private static string GetWixFormatFromVersionVariables(VersionVariables variables)
+    {
+        var builder = new StringBuilder();
+        builder.Append("<Include xmlns=\"http://schemas.microsoft.com/wix/2006/wi\">\n");
+        var availableVariables = VersionVariables.AvailableVariables;
+        foreach (var variable in availableVariables)
         {
-            var builder = new StringBuilder();
-            builder.Append("<Include xmlns=\"http://schemas.microsoft.com/wix/2006/wi\">\n");
-            var availableVariables = VersionVariables.AvailableVariables;
-            foreach (var variable in availableVariables)
-            {
-                variables.TryGetValue(variable, out var value);
-                builder.Append($"\t<?define {variable}=\"{value}\"?>\n");
-            }
-            builder.Append("</Include>\n");
-            return builder.ToString();
+            variables.TryGetValue(variable, out var value);
+            builder.Append($"\t<?define {variable}=\"{value}\"?>\n");
         }
-
-        public void Dispose() => this.log.Info($"Done writing {this.wixVersionFile}");
+        builder.Append("</Include>\n");
+        return builder.ToString();
     }
-}
+
+    public void Dispose() => this.log.Info($"Done writing {this.wixVersionFile}");
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/Git/Branch.cs b/src/GitVersion.LibGit2Sharp/Git/Branch.cs
index e4537c5d09..f775bffe37 100644
--- a/src/GitVersion.LibGit2Sharp/Git/Branch.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/Branch.cs
@@ -1,40 +1,39 @@
 using System;
 using GitVersion.Helpers;
 
-namespace GitVersion
-{
-    internal sealed class Branch : IBranch
-    {
-        private static readonly LambdaEqualityHelper<IBranch> equalityHelper = new(x => x.Name.Canonical);
-        private static readonly LambdaKeyComparer<IBranch, string> comparerHelper = new(x => x.Name.Canonical);
-
-        private readonly LibGit2Sharp.Branch innerBranch;
+namespace GitVersion;
 
-        internal Branch(LibGit2Sharp.Branch branch)
-        {
-            this.innerBranch = branch;
-            Name = new ReferenceName(branch.CanonicalName);
-
-            var commit = this.innerBranch.Tip;
-            Tip = commit is null ? null : new Commit(commit);
+internal sealed class Branch : IBranch
+{
+    private static readonly LambdaEqualityHelper<IBranch> equalityHelper = new(x => x.Name.Canonical);
+    private static readonly LambdaKeyComparer<IBranch, string> comparerHelper = new(x => x.Name.Canonical);
 
-            var commits = this.innerBranch.Commits;
-            Commits = commits is null ? null : new CommitCollection(commits);
-        }
-        public ReferenceName Name { get; }
-        public ICommit? Tip { get; }
-        public ICommitCollection? Commits { get; }
+    private readonly LibGit2Sharp.Branch innerBranch;
 
-        public int CompareTo(IBranch other) => comparerHelper.Compare(this, other);
-        public bool Equals(IBranch? other) => equalityHelper.Equals(this, other);
-        public override bool Equals(object obj) => Equals((obj as IBranch)!);
-        public override int GetHashCode() => equalityHelper.GetHashCode(this);
-        public override string ToString() => Name.ToString();
-        public static implicit operator LibGit2Sharp.Branch(Branch d) => d.innerBranch;
+    internal Branch(LibGit2Sharp.Branch branch)
+    {
+        this.innerBranch = branch;
+        Name = new ReferenceName(branch.CanonicalName);
 
-        public bool IsDetachedHead => Name.Canonical.Equals("(no branch)", StringComparison.OrdinalIgnoreCase);
+        var commit = this.innerBranch.Tip;
+        Tip = commit is null ? null : new Commit(commit);
 
-        public bool IsRemote => this.innerBranch.IsRemote;
-        public bool IsTracking => this.innerBranch.IsTracking;
+        var commits = this.innerBranch.Commits;
+        Commits = commits is null ? null : new CommitCollection(commits);
     }
-}
+    public ReferenceName Name { get; }
+    public ICommit? Tip { get; }
+    public ICommitCollection? Commits { get; }
+
+    public int CompareTo(IBranch other) => comparerHelper.Compare(this, other);
+    public bool Equals(IBranch? other) => equalityHelper.Equals(this, other);
+    public override bool Equals(object obj) => Equals((obj as IBranch)!);
+    public override int GetHashCode() => equalityHelper.GetHashCode(this);
+    public override string ToString() => Name.ToString();
+    public static implicit operator LibGit2Sharp.Branch(Branch d) => d.innerBranch;
+
+    public bool IsDetachedHead => Name.Canonical.Equals("(no branch)", StringComparison.OrdinalIgnoreCase);
+
+    public bool IsRemote => this.innerBranch.IsRemote;
+    public bool IsTracking => this.innerBranch.IsTracking;
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/Git/BranchCollection.cs b/src/GitVersion.LibGit2Sharp/Git/BranchCollection.cs
index 87ee3ae186..f6e7c6ba45 100644
--- a/src/GitVersion.LibGit2Sharp/Git/BranchCollection.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/BranchCollection.cs
@@ -2,27 +2,26 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal sealed class BranchCollection : IBranchCollection
 {
-    internal sealed class BranchCollection : IBranchCollection
-    {
-        private readonly LibGit2Sharp.BranchCollection innerCollection;
-        internal BranchCollection(LibGit2Sharp.BranchCollection collection) => this.innerCollection = collection;
+    private readonly LibGit2Sharp.BranchCollection innerCollection;
+    internal BranchCollection(LibGit2Sharp.BranchCollection collection) => this.innerCollection = collection;
 
-        public IEnumerator<IBranch> GetEnumerator() => this.innerCollection.Select(branch => new Branch(branch)).GetEnumerator();
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-        public IBranch? this[string name]
+    public IEnumerator<IBranch> GetEnumerator() => this.innerCollection.Select(branch => new Branch(branch)).GetEnumerator();
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    public IBranch? this[string name]
+    {
+        get
         {
-            get
-            {
-                var branch = this.innerCollection[name];
-                return branch is null ? null : new Branch(branch);
-            }
+            var branch = this.innerCollection[name];
+            return branch is null ? null : new Branch(branch);
         }
-
-        public IEnumerable<IBranch> ExcludeBranches(IEnumerable<IBranch> branchesToExclude) =>
-            this.Where(b => branchesToExclude.All(bte => !b.Equals(bte)));
-        public void UpdateTrackedBranch(IBranch branch, string remoteTrackingReferenceName) =>
-            this.innerCollection.Update((Branch)branch, b => b.TrackedBranch = remoteTrackingReferenceName);
     }
-}
+
+    public IEnumerable<IBranch> ExcludeBranches(IEnumerable<IBranch> branchesToExclude) =>
+        this.Where(b => branchesToExclude.All(bte => !b.Equals(bte)));
+    public void UpdateTrackedBranch(IBranch branch, string remoteTrackingReferenceName) =>
+        this.innerCollection.Update((Branch)branch, b => b.TrackedBranch = remoteTrackingReferenceName);
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/Git/Commit.cs b/src/GitVersion.LibGit2Sharp/Git/Commit.cs
index 3c1d03cfa0..f97666ca9a 100644
--- a/src/GitVersion.LibGit2Sharp/Git/Commit.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/Commit.cs
@@ -3,32 +3,31 @@
 using System.Linq;
 using GitVersion.Helpers;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal sealed class Commit : GitObject, ICommit
 {
-    internal sealed class Commit : GitObject, ICommit
-    {
-        private static readonly LambdaEqualityHelper<ICommit> equalityHelper = new(x => x.Id);
-        private static readonly LambdaKeyComparer<ICommit, string> comparerHelper = new(x => x.Sha);
+    private static readonly LambdaEqualityHelper<ICommit> equalityHelper = new(x => x.Id);
+    private static readonly LambdaKeyComparer<ICommit, string> comparerHelper = new(x => x.Sha);
 
-        private readonly LibGit2Sharp.Commit innerCommit;
+    private readonly LibGit2Sharp.Commit innerCommit;
 
-        internal Commit(LibGit2Sharp.Commit innerCommit) : base(innerCommit)
-        {
-            this.innerCommit = innerCommit;
-            Parents = innerCommit.Parents.Select(parent => new Commit(parent));
-            When = innerCommit.Committer.When;
-        }
+    internal Commit(LibGit2Sharp.Commit innerCommit) : base(innerCommit)
+    {
+        this.innerCommit = innerCommit;
+        Parents = innerCommit.Parents.Select(parent => new Commit(parent));
+        When = innerCommit.Committer.When;
+    }
 
-        public int CompareTo(ICommit other) => comparerHelper.Compare(this, other);
-        public bool Equals(ICommit? other) => equalityHelper.Equals(this, other);
-        public override bool Equals(object obj) => Equals((obj as ICommit)!);
-        public override int GetHashCode() => equalityHelper.GetHashCode(this);
-        public override string ToString() => $"{Id.ToString(7)} {this.innerCommit.MessageShort}";
-        public static implicit operator LibGit2Sharp.Commit(Commit d) => d.innerCommit;
+    public int CompareTo(ICommit other) => comparerHelper.Compare(this, other);
+    public bool Equals(ICommit? other) => equalityHelper.Equals(this, other);
+    public override bool Equals(object obj) => Equals((obj as ICommit)!);
+    public override int GetHashCode() => equalityHelper.GetHashCode(this);
+    public override string ToString() => $"{Id.ToString(7)} {this.innerCommit.MessageShort}";
+    public static implicit operator LibGit2Sharp.Commit(Commit d) => d.innerCommit;
 
-        public IEnumerable<ICommit> Parents { get; }
-        public DateTimeOffset When { get; }
+    public IEnumerable<ICommit> Parents { get; }
+    public DateTimeOffset When { get; }
 
-        public string Message => this.innerCommit.Message;
-    }
-}
+    public string Message => this.innerCommit.Message;
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/Git/CommitCollection.cs b/src/GitVersion.LibGit2Sharp/Git/CommitCollection.cs
index ef9be5212c..5b5100c550 100644
--- a/src/GitVersion.LibGit2Sharp/Git/CommitCollection.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/CommitCollection.cs
@@ -4,41 +4,40 @@
 using System.Linq;
 using LibGit2Sharp;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal sealed class CommitCollection : ICommitCollection
 {
-    internal sealed class CommitCollection : ICommitCollection
-    {
-        private readonly ICommitLog innerCollection;
-        internal CommitCollection(ICommitLog collection) => this.innerCollection = collection;
+    private readonly ICommitLog innerCollection;
+    internal CommitCollection(ICommitLog collection) => this.innerCollection = collection;
 
-        public IEnumerator<ICommit> GetEnumerator() => this.innerCollection.Select(commit => new Commit(commit)).GetEnumerator();
+    public IEnumerator<ICommit> GetEnumerator() => this.innerCollection.Select(commit => new Commit(commit)).GetEnumerator();
 
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
-        public IEnumerable<ICommit> GetCommitsPriorTo(DateTimeOffset olderThan) => this.SkipWhile(c => c.When > olderThan);
-        public IEnumerable<ICommit> QueryBy(CommitFilter commitFilter)
+    public IEnumerable<ICommit> GetCommitsPriorTo(DateTimeOffset olderThan) => this.SkipWhile(c => c.When > olderThan);
+    public IEnumerable<ICommit> QueryBy(CommitFilter commitFilter)
+    {
+        static object? GetReacheableFrom(object? item)
         {
-            static object? GetReacheableFrom(object? item)
+            return item switch
             {
-                return item switch
-                {
-                    Commit c => (LibGit2Sharp.Commit)c,
-                    Branch b => (LibGit2Sharp.Branch)b,
-                    _ => null
-                };
-            }
-
-            var includeReachableFrom = GetReacheableFrom(commitFilter.IncludeReachableFrom);
-            var excludeReachableFrom = GetReacheableFrom(commitFilter.ExcludeReachableFrom);
-            var filter = new LibGit2Sharp.CommitFilter
-            {
-                IncludeReachableFrom = includeReachableFrom,
-                ExcludeReachableFrom = excludeReachableFrom,
-                FirstParentOnly = commitFilter.FirstParentOnly,
-                SortBy = (LibGit2Sharp.CommitSortStrategies)commitFilter.SortBy,
+                Commit c => (LibGit2Sharp.Commit)c,
+                Branch b => (LibGit2Sharp.Branch)b,
+                _ => null
             };
-            var commitLog = ((IQueryableCommitLog)this.innerCollection).QueryBy(filter);
-            return new CommitCollection(commitLog);
         }
+
+        var includeReachableFrom = GetReacheableFrom(commitFilter.IncludeReachableFrom);
+        var excludeReachableFrom = GetReacheableFrom(commitFilter.ExcludeReachableFrom);
+        var filter = new LibGit2Sharp.CommitFilter
+        {
+            IncludeReachableFrom = includeReachableFrom,
+            ExcludeReachableFrom = excludeReachableFrom,
+            FirstParentOnly = commitFilter.FirstParentOnly,
+            SortBy = (LibGit2Sharp.CommitSortStrategies)commitFilter.SortBy,
+        };
+        var commitLog = ((IQueryableCommitLog)this.innerCollection).QueryBy(filter);
+        return new CommitCollection(commitLog);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/Git/GitObject.cs b/src/GitVersion.LibGit2Sharp/Git/GitObject.cs
index fdbc069c89..74e3358fcf 100644
--- a/src/GitVersion.LibGit2Sharp/Git/GitObject.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/GitObject.cs
@@ -1,25 +1,24 @@
 using GitVersion.Helpers;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal class GitObject : IGitObject
 {
-    internal class GitObject : IGitObject
-    {
-        private static readonly LambdaEqualityHelper<IGitObject> equalityHelper = new(x => x.Id);
-        private static readonly LambdaKeyComparer<IGitObject, string> comparerHelper = new(x => x.Sha);
+    private static readonly LambdaEqualityHelper<IGitObject> equalityHelper = new(x => x.Id);
+    private static readonly LambdaKeyComparer<IGitObject, string> comparerHelper = new(x => x.Sha);
 
-        internal GitObject(LibGit2Sharp.GitObject innerGitObject)
-        {
-            Id = new ObjectId(innerGitObject.Id);
-            Sha = innerGitObject.Sha;
-        }
+    internal GitObject(LibGit2Sharp.GitObject innerGitObject)
+    {
+        Id = new ObjectId(innerGitObject.Id);
+        Sha = innerGitObject.Sha;
+    }
 
-        public int CompareTo(IGitObject other) => comparerHelper.Compare(this, other);
-        public bool Equals(IGitObject? other) => equalityHelper.Equals(this, other);
-        public override bool Equals(object obj) => Equals((obj as IGitObject)!);
-        public override int GetHashCode() => equalityHelper.GetHashCode(this);
-        public override string ToString() => Id.ToString(7);
+    public int CompareTo(IGitObject other) => comparerHelper.Compare(this, other);
+    public bool Equals(IGitObject? other) => equalityHelper.Equals(this, other);
+    public override bool Equals(object obj) => Equals((obj as IGitObject)!);
+    public override int GetHashCode() => equalityHelper.GetHashCode(this);
+    public override string ToString() => Id.ToString(7);
 
-        public IObjectId Id { get; }
-        public string Sha { get; }
-    }
-}
+    public IObjectId Id { get; }
+    public string Sha { get; }
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/Git/GitRepository.cs b/src/GitVersion.LibGit2Sharp/Git/GitRepository.cs
index b9a6b6e76c..1655720175 100644
--- a/src/GitVersion.LibGit2Sharp/Git/GitRepository.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/GitRepository.cs
@@ -7,223 +7,222 @@
 using LibGit2Sharp;
 using LibGit2Sharp.Handlers;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal sealed class GitRepository : IMutatingGitRepository
 {
-    internal sealed class GitRepository : IMutatingGitRepository
+    private readonly ILog log;
+    private readonly Lazy<IRepository> repositoryLazy;
+    private IRepository repositoryInstance => this.repositoryLazy.Value;
+
+    public GitRepository(ILog log, IGitRepositoryInfo repositoryInfo)
+        : this(log, () => repositoryInfo.GitRootPath)
     {
-        private readonly ILog log;
-        private readonly Lazy<IRepository> repositoryLazy;
-        private IRepository repositoryInstance => this.repositoryLazy.Value;
+    }
 
-        public GitRepository(ILog log, IGitRepositoryInfo repositoryInfo)
-            : this(log, () => repositoryInfo.GitRootPath)
-        {
-        }
+    internal GitRepository(string gitRootDirectory)
+        : this(new NullLog(), () => gitRootDirectory)
+    {
+    }
 
-        internal GitRepository(string gitRootDirectory)
-            : this(new NullLog(), () => gitRootDirectory)
-        {
-        }
+    internal GitRepository(IRepository repository)
+    {
+        this.log = new NullLog();
+        this.repositoryLazy = new Lazy<IRepository>(() => repository);
+    }
 
-        internal GitRepository(IRepository repository)
-        {
-            this.log = new NullLog();
-            this.repositoryLazy = new Lazy<IRepository>(() => repository);
-        }
+    private GitRepository(ILog log, Func<string?> getGitRootDirectory)
+    {
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
+        this.repositoryLazy = new Lazy<IRepository>(() => new Repository(getGitRootDirectory()));
+    }
 
-        private GitRepository(ILog log, Func<string?> getGitRootDirectory)
-        {
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.repositoryLazy = new Lazy<IRepository>(() => new Repository(getGitRootDirectory()));
-        }
+    public void Dispose()
+    {
+        if (this.repositoryLazy.IsValueCreated) repositoryInstance.Dispose();
+    }
+
+    public string Path => repositoryInstance.Info.Path;
+    public string WorkingDirectory => repositoryInstance.Info.WorkingDirectory;
+    public bool IsHeadDetached => repositoryInstance.Info.IsHeadDetached;
+
+    public IBranch Head => new Branch(repositoryInstance.Head);
+    public ITagCollection Tags => new TagCollection(repositoryInstance.Tags);
+    public IReferenceCollection Refs => new ReferenceCollection(repositoryInstance.Refs);
+    public IBranchCollection Branches => new BranchCollection(repositoryInstance.Branches);
+    public ICommitCollection Commits => new CommitCollection(repositoryInstance.Commits);
+    public IRemoteCollection Remotes => new RemoteCollection(repositoryInstance.Network.Remotes);
+
+    public ICommit FindMergeBase(ICommit commit, ICommit otherCommit)
+    {
+        _ = commit ?? throw new ArgumentNullException(nameof(commit));
+        _ = otherCommit ?? throw new ArgumentNullException(nameof(otherCommit));
 
-        public void Dispose()
+        var retryAction = new RetryAction<LockedFileException, ICommit>();
+        return retryAction.Execute(() =>
         {
-            if (this.repositoryLazy.IsValueCreated) repositoryInstance.Dispose();
+            var mergeBase = repositoryInstance.ObjectDatabase.FindMergeBase((Commit)commit, (Commit)otherCommit);
+            return new Commit(mergeBase);
+        });
+    }
+    public int GetNumberOfUncommittedChanges()
+    {
+        var retryAction = new RetryAction<LibGit2Sharp.LockedFileException, int>();
+        return retryAction.Execute(GetNumberOfUncommittedChangesInternal);
+    }
+    private int GetNumberOfUncommittedChangesInternal()
+    {
+        // check if we have a branch tip at all to behave properly with empty repos
+        // => return that we have actually uncomitted changes because we are apparently
+        // running GitVersion on something which lives inside this brand new repo _/\Ö/\_
+        if (repositoryInstance.Head?.Tip == null || repositoryInstance.Diff == null)
+        {
+            // this is a somewhat cumbersome way of figuring out the number of changes in the repo
+            // which is more expensive than to use the Diff as it gathers more info, but
+            // we can't use the other method when we are dealing with a new/empty repo
+            try
+            {
+                var status = repositoryInstance.RetrieveStatus();
+                return status.Untracked.Count() + status.Staged.Count();
+            }
+            catch (Exception)
+            {
+                return int.MaxValue; // this should be somewhat puzzling to see,
+                // so we may have reached our goal to show that
+                // that repo is really "Dirty"...
+            }
         }
 
-        public string Path => repositoryInstance.Info.Path;
-        public string WorkingDirectory => repositoryInstance.Info.WorkingDirectory;
-        public bool IsHeadDetached => repositoryInstance.Info.IsHeadDetached;
+        // gets all changes of the last commit vs Staging area and WT
+        var changes = repositoryInstance.Diff.Compare<TreeChanges>(repositoryInstance.Head.Tip.Tree,
+            DiffTargets.Index | DiffTargets.WorkingDirectory);
 
-        public IBranch Head => new Branch(repositoryInstance.Head);
-        public ITagCollection Tags => new TagCollection(repositoryInstance.Tags);
-        public IReferenceCollection Refs => new ReferenceCollection(repositoryInstance.Refs);
-        public IBranchCollection Branches => new BranchCollection(repositoryInstance.Branches);
-        public ICommitCollection Commits => new CommitCollection(repositoryInstance.Commits);
-        public IRemoteCollection Remotes => new RemoteCollection(repositoryInstance.Network.Remotes);
+        return changes.Count;
+    }
 
-        public ICommit FindMergeBase(ICommit commit, ICommit otherCommit)
+    public void CreateBranchForPullRequestBranch(AuthenticationInfo auth) =>
+        RepositoryExtensions.RunSafe(() =>
         {
-            _ = commit ?? throw new ArgumentNullException(nameof(commit));
-            _ = otherCommit ?? throw new ArgumentNullException(nameof(otherCommit));
+            var network = repositoryInstance.Network;
+            var remote = network.Remotes.Single();
+
+            this.log.Info("Fetching remote refs to see if there is a pull request ref");
+            var credentialsProvider = GetCredentialsProvider(auth);
+            var remoteTips = (credentialsProvider != null
+                    ? network.ListReferences(remote, credentialsProvider)
+                    : network.ListReferences(remote))
+                .Select(r => r.ResolveToDirectReference()).ToList();
 
-            var retryAction = new RetryAction<LockedFileException, ICommit>();
-            return retryAction.Execute(() =>
+            this.log.Info($"Remote Refs:{System.Environment.NewLine}" + string.Join(System.Environment.NewLine, remoteTips.Select(r => r.CanonicalName)));
+
+            // FIX ME: What to do when Tip is null?
+            var headTipSha = Head.Tip!.Sha;
+
+            var refs = remoteTips.Where(r => r.TargetIdentifier == headTipSha).ToList();
+
+            if (refs.Count == 0)
             {
-                var mergeBase = repositoryInstance.ObjectDatabase.FindMergeBase((Commit)commit, (Commit)otherCommit);
-                return new Commit(mergeBase);
-            });
-        }
-        public int GetNumberOfUncommittedChanges()
-        {
-            var retryAction = new RetryAction<LibGit2Sharp.LockedFileException, int>();
-            return retryAction.Execute(GetNumberOfUncommittedChangesInternal);
-        }
-        private int GetNumberOfUncommittedChangesInternal()
-        {
-            // check if we have a branch tip at all to behave properly with empty repos
-            // => return that we have actually uncomitted changes because we are apparently
-            // running GitVersion on something which lives inside this brand new repo _/\Ö/\_
-            if (repositoryInstance.Head?.Tip == null || repositoryInstance.Diff == null)
+                var message = $"Couldn't find any remote tips from remote '{remote.Url}' pointing at the commit '{headTipSha}'.";
+                throw new WarningException(message);
+            }
+
+            if (refs.Count > 1)
             {
-                // this is a somewhat cumbersome way of figuring out the number of changes in the repo
-                // which is more expensive than to use the Diff as it gathers more info, but
-                // we can't use the other method when we are dealing with a new/empty repo
-                try
-                {
-                    var status = repositoryInstance.RetrieveStatus();
-                    return status.Untracked.Count() + status.Staged.Count();
-                }
-                catch (Exception)
-                {
-                    return int.MaxValue; // this should be somewhat puzzling to see,
-                    // so we may have reached our goal to show that
-                    // that repo is really "Dirty"...
-                }
+                var names = string.Join(", ", refs.Select(r => r.CanonicalName));
+                var message = $"Found more than one remote tip from remote '{remote.Url}' pointing at the commit '{headTipSha}'. Unable to determine which one to use ({names}).";
+                throw new WarningException(message);
             }
 
-            // gets all changes of the last commit vs Staging area and WT
-            var changes = repositoryInstance.Diff.Compare<TreeChanges>(repositoryInstance.Head.Tip.Tree,
-                DiffTargets.Index | DiffTargets.WorkingDirectory);
+            var reference = refs.First();
+            var canonicalName = reference.CanonicalName;
+            var referenceName = ReferenceName.Parse(reference.CanonicalName);
+            this.log.Info($"Found remote tip '{canonicalName}' pointing at the commit '{headTipSha}'.");
 
-            return changes.Count;
-        }
+            if (referenceName.IsTag)
+            {
+                this.log.Info($"Checking out tag '{canonicalName}'");
+                Checkout(reference.Target.Sha);
+            }
+            else if (referenceName.IsPullRequest)
+            {
+                var fakeBranchName = canonicalName.Replace("refs/pull/", "refs/heads/pull/").Replace("refs/pull-requests/", "refs/heads/pull-requests/");
 
-        public void CreateBranchForPullRequestBranch(AuthenticationInfo auth) =>
-            RepositoryExtensions.RunSafe(() =>
+                this.log.Info($"Creating fake local branch '{fakeBranchName}'.");
+                Refs.Add(fakeBranchName, headTipSha);
+
+                this.log.Info($"Checking local branch '{fakeBranchName}' out.");
+                Checkout(fakeBranchName);
+            }
+            else
             {
-                var network = repositoryInstance.Network;
-                var remote = network.Remotes.Single();
-
-                this.log.Info("Fetching remote refs to see if there is a pull request ref");
-                var credentialsProvider = GetCredentialsProvider(auth);
-                var remoteTips = (credentialsProvider != null
-                        ? network.ListReferences(remote, credentialsProvider)
-                        : network.ListReferences(remote))
-                    .Select(r => r.ResolveToDirectReference()).ToList();
-
-                this.log.Info($"Remote Refs:{System.Environment.NewLine}" + string.Join(System.Environment.NewLine, remoteTips.Select(r => r.CanonicalName)));
-
-                // FIX ME: What to do when Tip is null?
-                var headTipSha = Head.Tip!.Sha;
-
-                var refs = remoteTips.Where(r => r.TargetIdentifier == headTipSha).ToList();
-
-                if (refs.Count == 0)
-                {
-                    var message = $"Couldn't find any remote tips from remote '{remote.Url}' pointing at the commit '{headTipSha}'.";
-                    throw new WarningException(message);
-                }
-
-                if (refs.Count > 1)
-                {
-                    var names = string.Join(", ", refs.Select(r => r.CanonicalName));
-                    var message = $"Found more than one remote tip from remote '{remote.Url}' pointing at the commit '{headTipSha}'. Unable to determine which one to use ({names}).";
-                    throw new WarningException(message);
-                }
-
-                var reference = refs.First();
-                var canonicalName = reference.CanonicalName;
-                var referenceName = ReferenceName.Parse(reference.CanonicalName);
-                this.log.Info($"Found remote tip '{canonicalName}' pointing at the commit '{headTipSha}'.");
-
-                if (referenceName.IsTag)
-                {
-                    this.log.Info($"Checking out tag '{canonicalName}'");
-                    Checkout(reference.Target.Sha);
-                }
-                else if (referenceName.IsPullRequest)
-                {
-                    var fakeBranchName = canonicalName.Replace("refs/pull/", "refs/heads/pull/").Replace("refs/pull-requests/", "refs/heads/pull-requests/");
-
-                    this.log.Info($"Creating fake local branch '{fakeBranchName}'.");
-                    Refs.Add(fakeBranchName, headTipSha);
-
-                    this.log.Info($"Checking local branch '{fakeBranchName}' out.");
-                    Checkout(fakeBranchName);
-                }
-                else
-                {
-                    var message = $"Remote tip '{canonicalName}' from remote '{remote.Url}' doesn't look like a valid pull request.";
-                    throw new WarningException(message);
-                }
-            });
-
-        public void Clone(string? sourceUrl, string? workdirPath, AuthenticationInfo auth)
+                var message = $"Remote tip '{canonicalName}' from remote '{remote.Url}' doesn't look like a valid pull request.";
+                throw new WarningException(message);
+            }
+        });
+
+    public void Clone(string? sourceUrl, string? workdirPath, AuthenticationInfo auth)
+    {
+        try
         {
-            try
+            var path = Repository.Clone(sourceUrl, workdirPath, GetCloneOptions(auth));
+            this.log.Info($"Returned path after repository clone: {path}");
+        }
+        catch (LibGit2Sharp.LockedFileException ex)
+        {
+            throw new LockedFileException(ex);
+        }
+        catch (LibGit2SharpException ex)
+        {
+            var message = ex.Message;
+            if (message.Contains("401"))
             {
-                var path = Repository.Clone(sourceUrl, workdirPath, GetCloneOptions(auth));
-                this.log.Info($"Returned path after repository clone: {path}");
+                throw new Exception("Unauthorized: Incorrect username/password", ex);
             }
-            catch (LibGit2Sharp.LockedFileException ex)
+            if (message.Contains("403"))
             {
-                throw new LockedFileException(ex);
+                throw new Exception("Forbidden: Possibly Incorrect username/password", ex);
             }
-            catch (LibGit2SharpException ex)
+            if (message.Contains("404"))
             {
-                var message = ex.Message;
-                if (message.Contains("401"))
-                {
-                    throw new Exception("Unauthorized: Incorrect username/password", ex);
-                }
-                if (message.Contains("403"))
-                {
-                    throw new Exception("Forbidden: Possibly Incorrect username/password", ex);
-                }
-                if (message.Contains("404"))
-                {
-                    throw new Exception("Not found: The repository was not found", ex);
-                }
-
-                throw new Exception("There was an unknown problem with the Git repository you provided", ex);
+                throw new Exception("Not found: The repository was not found", ex);
             }
+
+            throw new Exception("There was an unknown problem with the Git repository you provided", ex);
         }
-        public void Checkout(string commitOrBranchSpec) =>
-            RepositoryExtensions.RunSafe(() =>
-                Commands.Checkout(repositoryInstance, commitOrBranchSpec));
+    }
+    public void Checkout(string commitOrBranchSpec) =>
+        RepositoryExtensions.RunSafe(() =>
+            Commands.Checkout(repositoryInstance, commitOrBranchSpec));
 
-        public void Fetch(string remote, IEnumerable<string> refSpecs, AuthenticationInfo auth, string? logMessage) =>
-            RepositoryExtensions.RunSafe(() =>
-                Commands.Fetch((Repository)repositoryInstance, remote, refSpecs, GetFetchOptions(auth), logMessage));
+    public void Fetch(string remote, IEnumerable<string> refSpecs, AuthenticationInfo auth, string? logMessage) =>
+        RepositoryExtensions.RunSafe(() =>
+            Commands.Fetch((Repository)repositoryInstance, remote, refSpecs, GetFetchOptions(auth), logMessage));
 
-        internal static string Discover(string? path) => Repository.Discover(path);
+    internal static string Discover(string? path) => Repository.Discover(path);
 
-        private static FetchOptions GetFetchOptions(AuthenticationInfo auth) =>
-            new()
-            {
-                CredentialsProvider = GetCredentialsProvider(auth)
-            };
+    private static FetchOptions GetFetchOptions(AuthenticationInfo auth) =>
+        new()
+        {
+            CredentialsProvider = GetCredentialsProvider(auth)
+        };
 
-        private static CloneOptions GetCloneOptions(AuthenticationInfo auth) =>
-            new()
-            {
-                Checkout = false,
-                CredentialsProvider = GetCredentialsProvider(auth)
-            };
+    private static CloneOptions GetCloneOptions(AuthenticationInfo auth) =>
+        new()
+        {
+            Checkout = false,
+            CredentialsProvider = GetCredentialsProvider(auth)
+        };
 
-        private static CredentialsHandler? GetCredentialsProvider(AuthenticationInfo auth)
+    private static CredentialsHandler? GetCredentialsProvider(AuthenticationInfo auth)
+    {
+        if (!auth.Username.IsNullOrWhiteSpace())
         {
-            if (!auth.Username.IsNullOrWhiteSpace())
+            return (_, _, _) => new UsernamePasswordCredentials
             {
-                return (_, _, _) => new UsernamePasswordCredentials
-                {
-                    Username = auth.Username,
-                    Password = auth.Password ?? string.Empty
-                };
-            }
-            return null;
+                Username = auth.Username,
+                Password = auth.Password ?? string.Empty
+            };
         }
+        return null;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs b/src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs
index 078e353a79..71db455895 100644
--- a/src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs
@@ -4,112 +4,111 @@
 using GitVersion.Extensions;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal class GitRepositoryInfo : IGitRepositoryInfo
 {
-    internal class GitRepositoryInfo : IGitRepositoryInfo
-    {
-        private readonly IOptions<GitVersionOptions> options;
-        private GitVersionOptions gitVersionOptions => this.options.Value;
+    private readonly IOptions<GitVersionOptions> options;
+    private GitVersionOptions gitVersionOptions => this.options.Value;
 
-        private readonly Lazy<string?> dynamicGitRepositoryPath;
-        private readonly Lazy<string?> dotGitDirectory;
-        private readonly Lazy<string?> gitRootPath;
-        private readonly Lazy<string?> projectRootDirectory;
+    private readonly Lazy<string?> dynamicGitRepositoryPath;
+    private readonly Lazy<string?> dotGitDirectory;
+    private readonly Lazy<string?> gitRootPath;
+    private readonly Lazy<string?> projectRootDirectory;
 
-        public GitRepositoryInfo(IOptions<GitVersionOptions> options)
-        {
-            this.options = options ?? throw new ArgumentNullException(nameof(options));
+    public GitRepositoryInfo(IOptions<GitVersionOptions> options)
+    {
+        this.options = options ?? throw new ArgumentNullException(nameof(options));
 
-            this.dynamicGitRepositoryPath = new Lazy<string?>(GetDynamicGitRepositoryPath);
-            this.dotGitDirectory = new Lazy<string?>(GetDotGitDirectory);
-            this.gitRootPath = new Lazy<string?>(GetGitRootPath);
-            this.projectRootDirectory = new Lazy<string?>(GetProjectRootDirectory);
-        }
+        this.dynamicGitRepositoryPath = new Lazy<string?>(GetDynamicGitRepositoryPath);
+        this.dotGitDirectory = new Lazy<string?>(GetDotGitDirectory);
+        this.gitRootPath = new Lazy<string?>(GetGitRootPath);
+        this.projectRootDirectory = new Lazy<string?>(GetProjectRootDirectory);
+    }
 
-        public string? DynamicGitRepositoryPath => this.dynamicGitRepositoryPath.Value;
-        public string? DotGitDirectory => this.dotGitDirectory.Value;
-        public string? GitRootPath => this.gitRootPath.Value;
-        public string? ProjectRootDirectory => this.projectRootDirectory.Value;
+    public string? DynamicGitRepositoryPath => this.dynamicGitRepositoryPath.Value;
+    public string? DotGitDirectory => this.dotGitDirectory.Value;
+    public string? GitRootPath => this.gitRootPath.Value;
+    public string? ProjectRootDirectory => this.projectRootDirectory.Value;
 
-        private string? GetDynamicGitRepositoryPath()
-        {
-            var repositoryInfo = gitVersionOptions.RepositoryInfo;
-            if (repositoryInfo.TargetUrl.IsNullOrWhiteSpace()) return null;
+    private string? GetDynamicGitRepositoryPath()
+    {
+        var repositoryInfo = gitVersionOptions.RepositoryInfo;
+        if (repositoryInfo.TargetUrl.IsNullOrWhiteSpace()) return null;
 
-            var targetUrl = repositoryInfo.TargetUrl;
-            var dynamicRepositoryClonePath = repositoryInfo.DynamicRepositoryClonePath;
+        var targetUrl = repositoryInfo.TargetUrl;
+        var dynamicRepositoryClonePath = repositoryInfo.DynamicRepositoryClonePath;
 
-            var userTemp = dynamicRepositoryClonePath ?? Path.GetTempPath();
-            var repositoryName = targetUrl.Split('/', '\\').Last().Replace(".git", string.Empty);
-            var possiblePath = Path.Combine(userTemp, repositoryName);
+        var userTemp = dynamicRepositoryClonePath ?? Path.GetTempPath();
+        var repositoryName = targetUrl.Split('/', '\\').Last().Replace(".git", string.Empty);
+        var possiblePath = Path.Combine(userTemp, repositoryName);
 
-            // Verify that the existing directory is ok for us to use
-            if (Directory.Exists(possiblePath) && !GitRepoHasMatchingRemote(possiblePath, targetUrl))
+        // Verify that the existing directory is ok for us to use
+        if (Directory.Exists(possiblePath) && !GitRepoHasMatchingRemote(possiblePath, targetUrl))
+        {
+            var i = 1;
+            var originalPath = possiblePath;
+            bool possiblePathExists;
+            do
             {
-                var i = 1;
-                var originalPath = possiblePath;
-                bool possiblePathExists;
-                do
-                {
-                    possiblePath = string.Concat(originalPath, "_", i++.ToString());
-                    possiblePathExists = Directory.Exists(possiblePath);
-                } while (possiblePathExists && !GitRepoHasMatchingRemote(possiblePath, targetUrl));
-            }
-
-            var repositoryPath = Path.Combine(possiblePath, ".git");
-            return repositoryPath;
+                possiblePath = string.Concat(originalPath, "_", i++.ToString());
+                possiblePathExists = Directory.Exists(possiblePath);
+            } while (possiblePathExists && !GitRepoHasMatchingRemote(possiblePath, targetUrl));
         }
 
-        private string? GetDotGitDirectory()
-        {
-            var gitDirectory = !DynamicGitRepositoryPath.IsNullOrWhiteSpace()
-                ? DynamicGitRepositoryPath
-                : GitRepository.Discover(gitVersionOptions.WorkingDirectory);
+        var repositoryPath = Path.Combine(possiblePath, ".git");
+        return repositoryPath;
+    }
+
+    private string? GetDotGitDirectory()
+    {
+        var gitDirectory = !DynamicGitRepositoryPath.IsNullOrWhiteSpace()
+            ? DynamicGitRepositoryPath
+            : GitRepository.Discover(gitVersionOptions.WorkingDirectory);
 
-            gitDirectory = gitDirectory?.TrimEnd('/', '\\');
-            if (gitDirectory.IsNullOrEmpty())
-                throw new DirectoryNotFoundException("Cannot find the .git directory");
+        gitDirectory = gitDirectory?.TrimEnd('/', '\\');
+        if (gitDirectory.IsNullOrEmpty())
+            throw new DirectoryNotFoundException("Cannot find the .git directory");
 
-            return gitDirectory?.Contains(Path.Combine(".git", "worktrees")) == true
-                ? Directory.GetParent(Directory.GetParent(gitDirectory).FullName).FullName
-                : gitDirectory;
-        }
+        return gitDirectory?.Contains(Path.Combine(".git", "worktrees")) == true
+            ? Directory.GetParent(Directory.GetParent(gitDirectory).FullName).FullName
+            : gitDirectory;
+    }
 
-        private string? GetProjectRootDirectory()
+    private string? GetProjectRootDirectory()
+    {
+        if (!DynamicGitRepositoryPath.IsNullOrWhiteSpace())
         {
-            if (!DynamicGitRepositoryPath.IsNullOrWhiteSpace())
-            {
-                return gitVersionOptions.WorkingDirectory;
-            }
+            return gitVersionOptions.WorkingDirectory;
+        }
 
-            var gitDirectory = GitRepository.Discover(gitVersionOptions.WorkingDirectory);
+        var gitDirectory = GitRepository.Discover(gitVersionOptions.WorkingDirectory);
 
-            if (gitDirectory.IsNullOrEmpty())
-                throw new DirectoryNotFoundException("Cannot find the .git directory");
+        if (gitDirectory.IsNullOrEmpty())
+            throw new DirectoryNotFoundException("Cannot find the .git directory");
 
-            return new GitRepository(gitDirectory).WorkingDirectory;
-        }
+        return new GitRepository(gitDirectory).WorkingDirectory;
+    }
 
-        private string? GetGitRootPath()
-        {
-            var isDynamicRepo = !DynamicGitRepositoryPath.IsNullOrWhiteSpace();
-            var rootDirectory = isDynamicRepo ? DotGitDirectory : ProjectRootDirectory;
+    private string? GetGitRootPath()
+    {
+        var isDynamicRepo = !DynamicGitRepositoryPath.IsNullOrWhiteSpace();
+        var rootDirectory = isDynamicRepo ? DotGitDirectory : ProjectRootDirectory;
 
-            return rootDirectory;
-        }
+        return rootDirectory;
+    }
 
-        private static bool GitRepoHasMatchingRemote(string possiblePath, string targetUrl)
+    private static bool GitRepoHasMatchingRemote(string possiblePath, string targetUrl)
+    {
+        try
         {
-            try
-            {
-                var gitRepository = new GitRepository(possiblePath);
-                return gitRepository.Remotes.Any(r => r.Url == targetUrl);
-            }
-            catch (Exception)
-            {
-                return false;
-            }
+            var gitRepository = new GitRepository(possiblePath);
+            return gitRepository.Remotes.Any(r => r.Url == targetUrl);
+        }
+        catch (Exception)
+        {
+            return false;
         }
-
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/Git/ObjectId.cs b/src/GitVersion.LibGit2Sharp/Git/ObjectId.cs
index 588ac70104..1456161c39 100644
--- a/src/GitVersion.LibGit2Sharp/Git/ObjectId.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/ObjectId.cs
@@ -1,27 +1,26 @@
 using GitVersion.Helpers;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal sealed class ObjectId : IObjectId
 {
-    internal sealed class ObjectId : IObjectId
-    {
-        private static readonly LambdaEqualityHelper<IObjectId> equalityHelper = new(x => x.Sha);
-        private static readonly LambdaKeyComparer<IObjectId, string> comparerHelper = new(x => x.Sha);
+    private static readonly LambdaEqualityHelper<IObjectId> equalityHelper = new(x => x.Sha);
+    private static readonly LambdaKeyComparer<IObjectId, string> comparerHelper = new(x => x.Sha);
 
-        private readonly LibGit2Sharp.ObjectId innerObjectId;
-        internal ObjectId(LibGit2Sharp.ObjectId objectId) => this.innerObjectId = objectId;
+    private readonly LibGit2Sharp.ObjectId innerObjectId;
+    internal ObjectId(LibGit2Sharp.ObjectId objectId) => this.innerObjectId = objectId;
 
-        public ObjectId(string sha) : this(new LibGit2Sharp.ObjectId(sha))
-        {
-        }
+    public ObjectId(string sha) : this(new LibGit2Sharp.ObjectId(sha))
+    {
+    }
 
-        public int CompareTo(IObjectId other) => comparerHelper.Compare(this, other);
-        public bool Equals(IObjectId? other) => equalityHelper.Equals(this, other);
-        public override bool Equals(object obj) => Equals((obj as IObjectId)!);
-        public override int GetHashCode() => equalityHelper.GetHashCode(this);
-        public override string ToString() => ToString(7);
-        public static implicit operator LibGit2Sharp.ObjectId(ObjectId d) => d.innerObjectId;
-        public string Sha => this.innerObjectId.Sha;
+    public int CompareTo(IObjectId other) => comparerHelper.Compare(this, other);
+    public bool Equals(IObjectId? other) => equalityHelper.Equals(this, other);
+    public override bool Equals(object obj) => Equals((obj as IObjectId)!);
+    public override int GetHashCode() => equalityHelper.GetHashCode(this);
+    public override string ToString() => ToString(7);
+    public static implicit operator LibGit2Sharp.ObjectId(ObjectId d) => d.innerObjectId;
+    public string Sha => this.innerObjectId.Sha;
 
-        public string ToString(int prefixLength) => this.innerObjectId.ToString(prefixLength);
-    }
-}
+    public string ToString(int prefixLength) => this.innerObjectId.ToString(prefixLength);
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/Git/RefSpec.cs b/src/GitVersion.LibGit2Sharp/Git/RefSpec.cs
index 1a11f97577..2955957396 100644
--- a/src/GitVersion.LibGit2Sharp/Git/RefSpec.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/RefSpec.cs
@@ -1,23 +1,22 @@
 using GitVersion.Helpers;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class RefSpec : IRefSpec
 {
-    public class RefSpec : IRefSpec
-    {
-        private static readonly LambdaEqualityHelper<IRefSpec> equalityHelper = new(x => x.Specification);
-        private static readonly LambdaKeyComparer<IRefSpec, string> comparerHelper = new(x => x.Specification);
+    private static readonly LambdaEqualityHelper<IRefSpec> equalityHelper = new(x => x.Specification);
+    private static readonly LambdaKeyComparer<IRefSpec, string> comparerHelper = new(x => x.Specification);
 
-        private readonly LibGit2Sharp.RefSpec innerRefSpec;
+    private readonly LibGit2Sharp.RefSpec innerRefSpec;
 
-        internal RefSpec(LibGit2Sharp.RefSpec refSpec) => this.innerRefSpec = refSpec;
-        public int CompareTo(IRefSpec other) => comparerHelper.Compare(this, other);
-        public bool Equals(IRefSpec? other) => equalityHelper.Equals(this, other);
-        public override bool Equals(object obj) => Equals((obj as IRefSpec)!);
-        public override int GetHashCode() => equalityHelper.GetHashCode(this);
-        public override string ToString() => Specification;
-        public string Specification => this.innerRefSpec.Specification;
-        public RefSpecDirection Direction => (RefSpecDirection)this.innerRefSpec.Direction;
-        public string Source => this.innerRefSpec.Source;
-        public string Destination => this.innerRefSpec.Destination;
-    }
-}
+    internal RefSpec(LibGit2Sharp.RefSpec refSpec) => this.innerRefSpec = refSpec;
+    public int CompareTo(IRefSpec other) => comparerHelper.Compare(this, other);
+    public bool Equals(IRefSpec? other) => equalityHelper.Equals(this, other);
+    public override bool Equals(object obj) => Equals((obj as IRefSpec)!);
+    public override int GetHashCode() => equalityHelper.GetHashCode(this);
+    public override string ToString() => Specification;
+    public string Specification => this.innerRefSpec.Specification;
+    public RefSpecDirection Direction => (RefSpecDirection)this.innerRefSpec.Direction;
+    public string Source => this.innerRefSpec.Source;
+    public string Destination => this.innerRefSpec.Destination;
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/Git/RefSpecCollection.cs b/src/GitVersion.LibGit2Sharp/Git/RefSpecCollection.cs
index f76210f021..b415b5b995 100644
--- a/src/GitVersion.LibGit2Sharp/Git/RefSpecCollection.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/RefSpecCollection.cs
@@ -2,13 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal sealed class RefSpecCollection : IRefSpecCollection
 {
-    internal sealed class RefSpecCollection : IRefSpecCollection
-    {
-        private readonly LibGit2Sharp.RefSpecCollection innerCollection;
-        internal RefSpecCollection(LibGit2Sharp.RefSpecCollection collection) => this.innerCollection = collection;
-        public IEnumerator<IRefSpec> GetEnumerator() => this.innerCollection.Select(tag => new RefSpec(tag)).GetEnumerator();
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-    }
-}
+    private readonly LibGit2Sharp.RefSpecCollection innerCollection;
+    internal RefSpecCollection(LibGit2Sharp.RefSpecCollection collection) => this.innerCollection = collection;
+    public IEnumerator<IRefSpec> GetEnumerator() => this.innerCollection.Select(tag => new RefSpec(tag)).GetEnumerator();
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs b/src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs
index 3466194b55..283c826b1c 100644
--- a/src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs
@@ -2,32 +2,31 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal sealed class ReferenceCollection : IReferenceCollection
 {
-    internal sealed class ReferenceCollection : IReferenceCollection
-    {
-        private readonly LibGit2Sharp.ReferenceCollection innerCollection;
-        internal ReferenceCollection(LibGit2Sharp.ReferenceCollection collection) => this.innerCollection = collection;
+    private readonly LibGit2Sharp.ReferenceCollection innerCollection;
+    internal ReferenceCollection(LibGit2Sharp.ReferenceCollection collection) => this.innerCollection = collection;
 
-        public IEnumerator<IReference> GetEnumerator() => this.innerCollection.Select(reference => new Reference(reference)).GetEnumerator();
+    public IEnumerator<IReference> GetEnumerator() => this.innerCollection.Select(reference => new Reference(reference)).GetEnumerator();
 
-        public void Add(string name, string canonicalRefNameOrObjectish, bool allowOverwrite = false) => this.innerCollection.Add(name, canonicalRefNameOrObjectish, allowOverwrite);
+    public void Add(string name, string canonicalRefNameOrObjectish, bool allowOverwrite = false) => this.innerCollection.Add(name, canonicalRefNameOrObjectish, allowOverwrite);
 
-        public void UpdateTarget(IReference directRef, IObjectId targetId) => RepositoryExtensions.RunSafe(() => this.innerCollection.UpdateTarget((Reference)directRef, (ObjectId)targetId));
+    public void UpdateTarget(IReference directRef, IObjectId targetId) => RepositoryExtensions.RunSafe(() => this.innerCollection.UpdateTarget((Reference)directRef, (ObjectId)targetId));
 
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
-        public IReference? this[string name]
+    public IReference? this[string name]
+    {
+        get
         {
-            get
-            {
-                var reference = this.innerCollection[name];
-                return reference is null ? null : new Reference(reference);
-            }
+            var reference = this.innerCollection[name];
+            return reference is null ? null : new Reference(reference);
         }
+    }
 
-        public IReference? Head => this["HEAD"];
+    public IReference? Head => this["HEAD"];
 
-        public IEnumerable<IReference> FromGlob(string prefix) => this.innerCollection.FromGlob(prefix).Select(reference => new Reference(reference));
-    }
-}
+    public IEnumerable<IReference> FromGlob(string prefix) => this.innerCollection.FromGlob(prefix).Select(reference => new Reference(reference));
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/Git/Remote.cs b/src/GitVersion.LibGit2Sharp/Git/Remote.cs
index 422aa39d1d..0732a6f30f 100644
--- a/src/GitVersion.LibGit2Sharp/Git/Remote.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/Remote.cs
@@ -2,37 +2,36 @@
 using System.Linq;
 using GitVersion.Helpers;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal sealed class Remote : IRemote
 {
-    internal sealed class Remote : IRemote
-    {
-        private static readonly LambdaEqualityHelper<IRemote> equalityHelper = new(x => x.Name);
-        private static readonly LambdaKeyComparer<IRemote, string> comparerHelper = new(x => x.Name);
+    private static readonly LambdaEqualityHelper<IRemote> equalityHelper = new(x => x.Name);
+    private static readonly LambdaKeyComparer<IRemote, string> comparerHelper = new(x => x.Name);
 
-        private readonly LibGit2Sharp.Remote innerRemote;
+    private readonly LibGit2Sharp.Remote innerRemote;
 
-        internal Remote(LibGit2Sharp.Remote remote) => this.innerRemote = remote;
+    internal Remote(LibGit2Sharp.Remote remote) => this.innerRemote = remote;
 
-        public int CompareTo(IRemote other) => comparerHelper.Compare(this, other);
-        public bool Equals(IRemote? other) => equalityHelper.Equals(this, other);
-        public override bool Equals(object obj) => Equals((obj as IRemote)!);
-        public override int GetHashCode() => equalityHelper.GetHashCode(this);
-        public override string ToString() => Name;
-        public string Name => this.innerRemote.Name;
-        public string Url => this.innerRemote.Url;
+    public int CompareTo(IRemote other) => comparerHelper.Compare(this, other);
+    public bool Equals(IRemote? other) => equalityHelper.Equals(this, other);
+    public override bool Equals(object obj) => Equals((obj as IRemote)!);
+    public override int GetHashCode() => equalityHelper.GetHashCode(this);
+    public override string ToString() => Name;
+    public string Name => this.innerRemote.Name;
+    public string Url => this.innerRemote.Url;
 
-        public IEnumerable<IRefSpec> RefSpecs
+    public IEnumerable<IRefSpec> RefSpecs
+    {
+        get
         {
-            get
-            {
-                var refSpecs = this.innerRemote.RefSpecs;
-                return refSpecs is null
-                    ? Enumerable.Empty<IRefSpec>()
-                    : new RefSpecCollection((LibGit2Sharp.RefSpecCollection)refSpecs);
-            }
+            var refSpecs = this.innerRemote.RefSpecs;
+            return refSpecs is null
+                ? Enumerable.Empty<IRefSpec>()
+                : new RefSpecCollection((LibGit2Sharp.RefSpecCollection)refSpecs);
         }
-        public IEnumerable<IRefSpec> FetchRefSpecs => RefSpecs.Where(x => x.Direction == RefSpecDirection.Fetch);
-
-        public IEnumerable<IRefSpec> PushRefSpecs => RefSpecs.Where(x => x.Direction == RefSpecDirection.Push);
     }
-}
+    public IEnumerable<IRefSpec> FetchRefSpecs => RefSpecs.Where(x => x.Direction == RefSpecDirection.Fetch);
+
+    public IEnumerable<IRefSpec> PushRefSpecs => RefSpecs.Where(x => x.Direction == RefSpecDirection.Push);
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/Git/RemoteCollection.cs b/src/GitVersion.LibGit2Sharp/Git/RemoteCollection.cs
index 8436836a7e..9f7caeafec 100644
--- a/src/GitVersion.LibGit2Sharp/Git/RemoteCollection.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/RemoteCollection.cs
@@ -2,26 +2,25 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal sealed class RemoteCollection : IRemoteCollection
 {
-    internal sealed class RemoteCollection : IRemoteCollection
-    {
-        private readonly LibGit2Sharp.RemoteCollection innerCollection;
-        internal RemoteCollection(LibGit2Sharp.RemoteCollection collection) => this.innerCollection = collection;
+    private readonly LibGit2Sharp.RemoteCollection innerCollection;
+    internal RemoteCollection(LibGit2Sharp.RemoteCollection collection) => this.innerCollection = collection;
 
-        public IEnumerator<IRemote> GetEnumerator() => this.innerCollection.Select(reference => new Remote(reference)).GetEnumerator();
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    public IEnumerator<IRemote> GetEnumerator() => this.innerCollection.Select(reference => new Remote(reference)).GetEnumerator();
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
-        public IRemote? this[string name]
+    public IRemote? this[string name]
+    {
+        get
         {
-            get
-            {
-                var remote = this.innerCollection[name];
-                return remote is null ? null : new Remote(remote);
-            }
+            var remote = this.innerCollection[name];
+            return remote is null ? null : new Remote(remote);
         }
-
-        public void Remove(string remoteName) => this.innerCollection.Remove(remoteName);
-        public void Update(string remoteName, string refSpec) => this.innerCollection.Update(remoteName, r => r.FetchRefSpecs.Add(refSpec));
     }
-}
+
+    public void Remove(string remoteName) => this.innerCollection.Remove(remoteName);
+    public void Update(string remoteName, string refSpec) => this.innerCollection.Update(remoteName, r => r.FetchRefSpecs.Add(refSpec));
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/Git/Tag.cs b/src/GitVersion.LibGit2Sharp/Git/Tag.cs
index 26511100cc..a67eb03048 100644
--- a/src/GitVersion.LibGit2Sharp/Git/Tag.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/Tag.cs
@@ -1,38 +1,37 @@
 using GitVersion.Helpers;
 using LibGit2Sharp;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal sealed class Tag : ITag
 {
-    internal sealed class Tag : ITag
+    private static readonly LambdaEqualityHelper<ITag> equalityHelper = new(x => x.Name.Canonical);
+    private static readonly LambdaKeyComparer<ITag, string> comparerHelper = new(x => x.Name.Canonical);
+
+    private readonly LibGit2Sharp.Tag innerTag;
+    internal Tag(LibGit2Sharp.Tag tag)
     {
-        private static readonly LambdaEqualityHelper<ITag> equalityHelper = new(x => x.Name.Canonical);
-        private static readonly LambdaKeyComparer<ITag, string> comparerHelper = new(x => x.Name.Canonical);
+        this.innerTag = tag;
+        Name = new ReferenceName(this.innerTag.CanonicalName);
+    }
+    public ReferenceName Name { get; }
 
-        private readonly LibGit2Sharp.Tag innerTag;
-        internal Tag(LibGit2Sharp.Tag tag)
-        {
-            this.innerTag = tag;
-            Name = new ReferenceName(this.innerTag.CanonicalName);
-        }
-        public ReferenceName Name { get; }
+    public int CompareTo(ITag other) => comparerHelper.Compare(this, other);
+    public bool Equals(ITag? other) => equalityHelper.Equals(this, other);
+    public override bool Equals(object obj) => Equals((obj as ITag)!);
+    public override int GetHashCode() => equalityHelper.GetHashCode(this);
+    public override string ToString() => Name.ToString();
+    public string TargetSha => this.innerTag.Target.Sha;
 
-        public int CompareTo(ITag other) => comparerHelper.Compare(this, other);
-        public bool Equals(ITag? other) => equalityHelper.Equals(this, other);
-        public override bool Equals(object obj) => Equals((obj as ITag)!);
-        public override int GetHashCode() => equalityHelper.GetHashCode(this);
-        public override string ToString() => Name.ToString();
-        public string TargetSha => this.innerTag.Target.Sha;
+    public ICommit? PeeledTargetCommit()
+    {
+        var target = this.innerTag.Target;
 
-        public ICommit? PeeledTargetCommit()
+        while (target is TagAnnotation annotation)
         {
-            var target = this.innerTag.Target;
-
-            while (target is TagAnnotation annotation)
-            {
-                target = annotation.Target;
-            }
-
-            return target is LibGit2Sharp.Commit commit ? new Commit(commit) : null;
+            target = annotation.Target;
         }
+
+        return target is LibGit2Sharp.Commit commit ? new Commit(commit) : null;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/Git/TagCollection.cs b/src/GitVersion.LibGit2Sharp/Git/TagCollection.cs
index 42b4a91bcc..8f02fcdd05 100644
--- a/src/GitVersion.LibGit2Sharp/Git/TagCollection.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/TagCollection.cs
@@ -2,15 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace GitVersion
+namespace GitVersion;
+
+internal sealed class TagCollection : ITagCollection
 {
-    internal sealed class TagCollection : ITagCollection
-    {
-        private readonly LibGit2Sharp.TagCollection innerCollection;
-        internal TagCollection(LibGit2Sharp.TagCollection collection) => this.innerCollection = collection;
+    private readonly LibGit2Sharp.TagCollection innerCollection;
+    internal TagCollection(LibGit2Sharp.TagCollection collection) => this.innerCollection = collection;
 
-        public IEnumerator<ITag> GetEnumerator() => this.innerCollection.Select(tag => new Tag(tag)).GetEnumerator();
+    public IEnumerator<ITag> GetEnumerator() => this.innerCollection.Select(tag => new Tag(tag)).GetEnumerator();
 
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-    }
-}
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/GitVersionLibGit2SharpModule.cs b/src/GitVersion.LibGit2Sharp/GitVersionLibGit2SharpModule.cs
index 56c79fdb90..307328fcab 100644
--- a/src/GitVersion.LibGit2Sharp/GitVersionLibGit2SharpModule.cs
+++ b/src/GitVersion.LibGit2Sharp/GitVersionLibGit2SharpModule.cs
@@ -1,14 +1,13 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GitVersion
+namespace GitVersion;
+
+public class GitVersionLibGit2SharpModule : IGitVersionModule
 {
-    public class GitVersionLibGit2SharpModule : IGitVersionModule
+    public void RegisterTypes(IServiceCollection services)
     {
-        public void RegisterTypes(IServiceCollection services)
-        {
-            services.AddSingleton<IGitRepository, GitRepository>();
-            services.AddSingleton<IMutatingGitRepository, GitRepository>();
-            services.AddSingleton<IGitRepositoryInfo, GitRepositoryInfo>();
-        }
+        services.AddSingleton<IGitRepository, GitRepository>();
+        services.AddSingleton<IMutatingGitRepository, GitRepository>();
+        services.AddSingleton<IGitRepositoryInfo, GitRepositoryInfo>();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.LibGit2Sharp/RepositoryExtensions.cs b/src/GitVersion.LibGit2Sharp/RepositoryExtensions.cs
index 790139a5c6..28c0edea01 100644
--- a/src/GitVersion.LibGit2Sharp/RepositoryExtensions.cs
+++ b/src/GitVersion.LibGit2Sharp/RepositoryExtensions.cs
@@ -2,37 +2,36 @@
 using LibGit2Sharp;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion
+namespace GitVersion;
+
+public static class RepositoryExtensions
 {
-    public static class RepositoryExtensions
-    {
-        public static IGitRepository ToGitRepository(this IRepository repository) => new GitRepository(repository);
-        public static IGitRepositoryInfo ToGitRepositoryInfo(IOptions<GitVersionOptions> options) => new GitRepositoryInfo(options);
+    public static IGitRepository ToGitRepository(this IRepository repository) => new GitRepository(repository);
+    public static IGitRepositoryInfo ToGitRepositoryInfo(IOptions<GitVersionOptions> options) => new GitRepositoryInfo(options);
 
-        public static void RunSafe(Action operation)
+    public static void RunSafe(Action operation)
+    {
+        try
+        {
+            operation();
+        }
+        catch (LibGit2Sharp.LockedFileException ex)
         {
-            try
-            {
-                operation();
-            }
-            catch (LibGit2Sharp.LockedFileException ex)
-            {
-                // Wrap this exception so that callers that want to catch it don't need to take a dependency on LibGit2Sharp.
-                throw new LockedFileException(ex);
-            }
+            // Wrap this exception so that callers that want to catch it don't need to take a dependency on LibGit2Sharp.
+            throw new LockedFileException(ex);
         }
+    }
 
-        public static T RunSafe<T>(Func<T> operation)
+    public static T RunSafe<T>(Func<T> operation)
+    {
+        try
+        {
+            return operation();
+        }
+        catch (LibGit2Sharp.LockedFileException ex)
         {
-            try
-            {
-                return operation();
-            }
-            catch (LibGit2Sharp.LockedFileException ex)
-            {
-                // Wrap this exception so that callers that want to catch it don't need to take a dependency on LibGit2Sharp.
-                throw new LockedFileException(ex);
-            }
+            // Wrap this exception so that callers that want to catch it don't need to take a dependency on LibGit2Sharp.
+            throw new LockedFileException(ex);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild.Tests/FileHelperTests.cs b/src/GitVersion.MsBuild.Tests/FileHelperTests.cs
index b6e1de3a2a..9e816536a5 100644
--- a/src/GitVersion.MsBuild.Tests/FileHelperTests.cs
+++ b/src/GitVersion.MsBuild.Tests/FileHelperTests.cs
@@ -1,45 +1,44 @@
 using NUnit.Framework;
 
-namespace GitVersion.MsBuild.Tests
+namespace GitVersion.MsBuild.Tests;
+
+[TestFixture]
+public class FileHelperTests
 {
-    [TestFixture]
-    public class FileHelperTests
+    [Test]
+    [TestCase("C#", "cs")]
+    [TestCase("F#", "fs")]
+    [TestCase("VB", "vb")]
+    [TestCase("XY", null)]
+    public void GetFileExtensionShouldReturnCorrectExtension(string language, string expectedExtension)
     {
-        [Test]
-        [TestCase("C#", "cs")]
-        [TestCase("F#", "fs")]
-        [TestCase("VB", "vb")]
-        [TestCase("XY", null)]
-        public void GetFileExtensionShouldReturnCorrectExtension(string language, string expectedExtension)
+        if (expectedExtension != null)
         {
-            if (expectedExtension != null)
-            {
-                Assert.That(FileHelper.GetFileExtension(language), Is.EqualTo(expectedExtension));
-            }
-            else
-            {
-                Assert.That((TestDelegate)(() => FileHelper.GetFileExtension(language)), Throws.ArgumentException.With.Message.EqualTo($"Unknown language detected: '{language}'"));
-            }
+            Assert.That(FileHelper.GetFileExtension(language), Is.EqualTo(expectedExtension));
         }
-
-        [Test]
-        public void GetFileWriteInfoShouldCreateConstantNamedFileWhenIntermediateOutputPath()
+        else
         {
-            var fileInfo = "MyIntermediateOutputPath".GetFileWriteInfo("C#", "MyProject.csproj", "GeneratedVersionInformation");
-
-            Assert.That(fileInfo.WorkingDirectory, Is.EqualTo("MyIntermediateOutputPath"));
-            Assert.That(fileInfo.FileName, Is.EqualTo("GeneratedVersionInformation.g.cs"));
-            Assert.That(fileInfo.FileExtension, Is.EqualTo("cs"));
+            Assert.That((TestDelegate)(() => FileHelper.GetFileExtension(language)), Throws.ArgumentException.With.Message.EqualTo($"Unknown language detected: '{language}'"));
         }
+    }
 
-        [Test]
-        public void GetFileWriteInfoShouldCreateRandomNamedFileWhenNoIntermediateOutputPath()
-        {
-            var fileInfo = FileHelper.GetFileWriteInfo(null, "C#", "MyProject.csproj", "GeneratedVersionInformation");
+    [Test]
+    public void GetFileWriteInfoShouldCreateConstantNamedFileWhenIntermediateOutputPath()
+    {
+        var fileInfo = "MyIntermediateOutputPath".GetFileWriteInfo("C#", "MyProject.csproj", "GeneratedVersionInformation");
 
-            Assert.That(fileInfo.WorkingDirectory, Is.EqualTo(FileHelper.TempPath));
-            Assert.That(fileInfo.FileName, Does.StartWith("GeneratedVersionInformation_MyProject_").And.EndsWith(".g.cs"));
-            Assert.That(fileInfo.FileExtension, Is.EqualTo("cs"));
-        }
+        Assert.That(fileInfo.WorkingDirectory, Is.EqualTo("MyIntermediateOutputPath"));
+        Assert.That(fileInfo.FileName, Is.EqualTo("GeneratedVersionInformation.g.cs"));
+        Assert.That(fileInfo.FileExtension, Is.EqualTo("cs"));
+    }
+
+    [Test]
+    public void GetFileWriteInfoShouldCreateRandomNamedFileWhenNoIntermediateOutputPath()
+    {
+        var fileInfo = FileHelper.GetFileWriteInfo(null, "C#", "MyProject.csproj", "GeneratedVersionInformation");
+
+        Assert.That(fileInfo.WorkingDirectory, Is.EqualTo(FileHelper.TempPath));
+        Assert.That(fileInfo.FileName, Does.StartWith("GeneratedVersionInformation_MyProject_").And.EndsWith(".g.cs"));
+        Assert.That(fileInfo.FileExtension, Is.EqualTo("cs"));
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild.Tests/Helpers/EventArgsFormatting.cs b/src/GitVersion.MsBuild.Tests/Helpers/EventArgsFormatting.cs
index 644104b514..1fa0b06ba7 100644
--- a/src/GitVersion.MsBuild.Tests/Helpers/EventArgsFormatting.cs
+++ b/src/GitVersion.MsBuild.Tests/Helpers/EventArgsFormatting.cs
@@ -3,281 +3,280 @@
 using System.Text;
 using Microsoft.Build.Framework;
 
-namespace GitVersion.MsBuild.Tests.Helpers
+namespace GitVersion.MsBuild.Tests.Helpers;
+
+/// <summary>
+/// Offers a default string format for Error and Warning events
+/// </summary>
+internal static class EventArgsFormatting
 {
     /// <summary>
-    /// Offers a default string format for Error and Warning events
+    /// Format the error event message and all the other event data into
+    /// a single string.
     /// </summary>
-    internal static class EventArgsFormatting
-    {
-        /// <summary>
-        /// Format the error event message and all the other event data into
-        /// a single string.
-        /// </summary>
-        /// <param name="e">Error to format</param>
-        /// <returns>The formatted message string.</returns>
-        internal static string FormatEventMessage(BuildErrorEventArgs e) =>
-            // "error" should not be localized
-            FormatEventMessage("error", e.Subcategory, e.Message,
-                e.Code, e.File, null, e.LineNumber, e.EndLineNumber,
-                e.ColumnNumber, e.EndColumnNumber, e.ThreadId);
+    /// <param name="e">Error to format</param>
+    /// <returns>The formatted message string.</returns>
+    internal static string FormatEventMessage(BuildErrorEventArgs e) =>
+        // "error" should not be localized
+        FormatEventMessage("error", e.Subcategory, e.Message,
+            e.Code, e.File, null, e.LineNumber, e.EndLineNumber,
+            e.ColumnNumber, e.EndColumnNumber, e.ThreadId);
 
-        /// <summary>
-        /// Format the error event message and all the other event data into
-        /// a single string.
-        /// </summary>
-        /// <param name="e">Error to format</param>
-        /// <param name="showProjectFile"><code>true</code> to show the project file which issued the event, otherwise <code>false</code>.</param>
-        /// <returns>The formatted message string.</returns>
-        internal static string FormatEventMessage(BuildErrorEventArgs e, bool showProjectFile) =>
-            // "error" should not be localized
-            FormatEventMessage("error", e.Subcategory, e.Message,
-                e.Code, e.File, showProjectFile ? e.ProjectFile : null, e.LineNumber, e.EndLineNumber,
-                e.ColumnNumber, e.EndColumnNumber, e.ThreadId);
+    /// <summary>
+    /// Format the error event message and all the other event data into
+    /// a single string.
+    /// </summary>
+    /// <param name="e">Error to format</param>
+    /// <param name="showProjectFile"><code>true</code> to show the project file which issued the event, otherwise <code>false</code>.</param>
+    /// <returns>The formatted message string.</returns>
+    internal static string FormatEventMessage(BuildErrorEventArgs e, bool showProjectFile) =>
+        // "error" should not be localized
+        FormatEventMessage("error", e.Subcategory, e.Message,
+            e.Code, e.File, showProjectFile ? e.ProjectFile : null, e.LineNumber, e.EndLineNumber,
+            e.ColumnNumber, e.EndColumnNumber, e.ThreadId);
 
-        /// <summary>
-        /// Format the warning message and all the other event data into a
-        /// single string.
-        /// </summary>
-        /// <param name="e">Warning to format</param>
-        /// <returns>The formatted message string.</returns>
-        internal static string FormatEventMessage(BuildWarningEventArgs e) =>
-            // "warning" should not be localized
-            FormatEventMessage("warning", e.Subcategory, e.Message,
-                e.Code, e.File, null, e.LineNumber, e.EndLineNumber,
-                e.ColumnNumber, e.EndColumnNumber, e.ThreadId);
+    /// <summary>
+    /// Format the warning message and all the other event data into a
+    /// single string.
+    /// </summary>
+    /// <param name="e">Warning to format</param>
+    /// <returns>The formatted message string.</returns>
+    internal static string FormatEventMessage(BuildWarningEventArgs e) =>
+        // "warning" should not be localized
+        FormatEventMessage("warning", e.Subcategory, e.Message,
+            e.Code, e.File, null, e.LineNumber, e.EndLineNumber,
+            e.ColumnNumber, e.EndColumnNumber, e.ThreadId);
+
+    /// <summary>
+    /// Format the warning message and all the other event data into a
+    /// single string.
+    /// </summary>
+    /// <param name="e">Warning to format</param>
+    /// <param name="showProjectFile"><code>true</code> to show the project file which issued the event, otherwise <code>false</code>.</param>
+    /// <returns>The formatted message string.</returns>
+    internal static string FormatEventMessage(BuildWarningEventArgs e, bool showProjectFile) =>
+        // "warning" should not be localized
+        FormatEventMessage("warning", e.Subcategory, e.Message,
+            e.Code, e.File, showProjectFile ? e.ProjectFile : null, e.LineNumber, e.EndLineNumber,
+            e.ColumnNumber, e.EndColumnNumber, e.ThreadId);
 
-        /// <summary>
-        /// Format the warning message and all the other event data into a
-        /// single string.
-        /// </summary>
-        /// <param name="e">Warning to format</param>
-        /// <param name="showProjectFile"><code>true</code> to show the project file which issued the event, otherwise <code>false</code>.</param>
-        /// <returns>The formatted message string.</returns>
-        internal static string FormatEventMessage(BuildWarningEventArgs e, bool showProjectFile) =>
-            // "warning" should not be localized
-            FormatEventMessage("warning", e.Subcategory, e.Message,
-                e.Code, e.File, showProjectFile ? e.ProjectFile : null, e.LineNumber, e.EndLineNumber,
-                e.ColumnNumber, e.EndColumnNumber, e.ThreadId);
+    /// <summary>
+    /// Format the message and all the other event data into a
+    /// single string.
+    /// </summary>
+    /// <param name="e">Message to format</param>
+    /// <returns>The formatted message string.</returns>
+    internal static string FormatEventMessage(BuildMessageEventArgs e) => FormatEventMessage(e, false);
 
-        /// <summary>
-        /// Format the message and all the other event data into a
-        /// single string.
-        /// </summary>
-        /// <param name="e">Message to format</param>
-        /// <returns>The formatted message string.</returns>
-        internal static string FormatEventMessage(BuildMessageEventArgs e) => FormatEventMessage(e, false);
+    /// <summary>
+    /// Format the message and all the other event data into a
+    /// single string.
+    /// </summary>
+    /// <param name="e">Message to format</param>
+    /// <param name="showProjectFile">Show project file or not</param>
+    /// <returns>The formatted message string.</returns>
+    internal static string FormatEventMessage(BuildMessageEventArgs e, bool showProjectFile) =>
+        // "message" should not be localized
+        FormatEventMessage("message", e.Subcategory, e.Message,
+            e.Code, e.File, showProjectFile ? e.ProjectFile : null, e.LineNumber, e.EndLineNumber, e.ColumnNumber, e.EndColumnNumber, e.ThreadId);
 
-        /// <summary>
-        /// Format the message and all the other event data into a
-        /// single string.
-        /// </summary>
-        /// <param name="e">Message to format</param>
-        /// <param name="showProjectFile">Show project file or not</param>
-        /// <returns>The formatted message string.</returns>
-        internal static string FormatEventMessage(BuildMessageEventArgs e, bool showProjectFile) =>
-            // "message" should not be localized
-            FormatEventMessage("message", e.Subcategory, e.Message,
-                e.Code, e.File, showProjectFile ? e.ProjectFile : null, e.LineNumber, e.EndLineNumber, e.ColumnNumber, e.EndColumnNumber, e.ThreadId);
+    /// <summary>
+    /// Format the event message and all the other event data into a
+    /// single string.
+    /// </summary>
+    /// <param name="category">category ("error" or "warning")</param>
+    /// <param name="subcategory">subcategory</param>
+    /// <param name="message">event message</param>
+    /// <param name="code">error or warning code number</param>
+    /// <param name="file">file name</param>
+    /// <param name="lineNumber">line number (0 if n/a)</param>
+    /// <param name="endLineNumber">end line number (0 if n/a)</param>
+    /// <param name="columnNumber">column number (0 if n/a)</param>
+    /// <param name="endColumnNumber">end column number (0 if n/a)</param>
+    /// <param name="threadId">thread id</param>
+    /// <returns>The formatted message string.</returns>
+    internal static string FormatEventMessage
+    (
+        string category,
+        string subcategory,
+        string message,
+        string code,
+        string file,
+        int lineNumber,
+        int endLineNumber,
+        int columnNumber,
+        int endColumnNumber,
+        int threadId
+    ) => FormatEventMessage(category, subcategory, message, code, file, null, lineNumber, endLineNumber, columnNumber, endColumnNumber, threadId);
 
-        /// <summary>
-        /// Format the event message and all the other event data into a
-        /// single string.
-        /// </summary>
-        /// <param name="category">category ("error" or "warning")</param>
-        /// <param name="subcategory">subcategory</param>
-        /// <param name="message">event message</param>
-        /// <param name="code">error or warning code number</param>
-        /// <param name="file">file name</param>
-        /// <param name="lineNumber">line number (0 if n/a)</param>
-        /// <param name="endLineNumber">end line number (0 if n/a)</param>
-        /// <param name="columnNumber">column number (0 if n/a)</param>
-        /// <param name="endColumnNumber">end column number (0 if n/a)</param>
-        /// <param name="threadId">thread id</param>
-        /// <returns>The formatted message string.</returns>
-        internal static string FormatEventMessage
-        (
-            string category,
-            string subcategory,
-            string message,
-            string code,
-            string file,
-            int lineNumber,
-            int endLineNumber,
-            int columnNumber,
-            int endColumnNumber,
-            int threadId
-        ) => FormatEventMessage(category, subcategory, message, code, file, null, lineNumber, endLineNumber, columnNumber, endColumnNumber, threadId);
+    /// <summary>
+    /// Format the event message and all the other event data into a
+    /// single string.
+    /// </summary>
+    /// <param name="category">category ("error" or "warning")</param>
+    /// <param name="subcategory">subcategory</param>
+    /// <param name="message">event message</param>
+    /// <param name="code">error or warning code number</param>
+    /// <param name="file">file name</param>
+    /// <param name="projectFile">the project file name</param>
+    /// <param name="lineNumber">line number (0 if n/a)</param>
+    /// <param name="endLineNumber">end line number (0 if n/a)</param>
+    /// <param name="columnNumber">column number (0 if n/a)</param>
+    /// <param name="endColumnNumber">end column number (0 if n/a)</param>
+    /// <param name="threadId">thread id</param>
+    /// <returns>The formatted message string.</returns>
+    internal static string FormatEventMessage
+    (
+        string category,
+        string subcategory,
+        string message,
+        string code,
+        string file,
+        string projectFile,
+        int lineNumber,
+        int endLineNumber,
+        int columnNumber,
+        int endColumnNumber,
+        int threadId
+    )
+    {
+        var format = new StringBuilder();
 
-        /// <summary>
-        /// Format the event message and all the other event data into a
-        /// single string.
-        /// </summary>
-        /// <param name="category">category ("error" or "warning")</param>
-        /// <param name="subcategory">subcategory</param>
-        /// <param name="message">event message</param>
-        /// <param name="code">error or warning code number</param>
-        /// <param name="file">file name</param>
-        /// <param name="projectFile">the project file name</param>
-        /// <param name="lineNumber">line number (0 if n/a)</param>
-        /// <param name="endLineNumber">end line number (0 if n/a)</param>
-        /// <param name="columnNumber">column number (0 if n/a)</param>
-        /// <param name="endColumnNumber">end column number (0 if n/a)</param>
-        /// <param name="threadId">thread id</param>
-        /// <returns>The formatted message string.</returns>
-        internal static string FormatEventMessage
-        (
-            string category,
-            string subcategory,
-            string message,
-            string code,
-            string file,
-            string projectFile,
-            int lineNumber,
-            int endLineNumber,
-            int columnNumber,
-            int endColumnNumber,
-            int threadId
-        )
+        // Uncomment these lines to show show the processor, if present.
+        /*
+        if (threadId != 0)
         {
-            var format = new StringBuilder();
+            format.Append("{0}>");
+        }
+        */
 
-            // Uncomment these lines to show show the processor, if present.
-            /*
-            if (threadId != 0)
-            {
-                format.Append("{0}>");
-            }
-            */
+        if ((file == null) || (file.Length == 0))
+        {
+            format.Append("MSBUILD : ");    // Should not be localized.
+        }
+        else
+        {
+            format.Append("{1}");
 
-            if ((file == null) || (file.Length == 0))
+            if (lineNumber == 0)
             {
-                format.Append("MSBUILD : ");    // Should not be localized.
+                format.Append(" : ");
             }
             else
             {
-                format.Append("{1}");
-
-                if (lineNumber == 0)
+                if (columnNumber == 0)
                 {
-                    format.Append(" : ");
+                    if (endLineNumber == 0)
+                    {
+                        format.Append("({2}): ");
+                    }
+                    else
+                    {
+                        format.Append("({2}-{7}): ");
+                    }
                 }
                 else
                 {
-                    if (columnNumber == 0)
+                    if (endLineNumber == 0)
                     {
-                        if (endLineNumber == 0)
+                        if (endColumnNumber == 0)
                         {
-                            format.Append("({2}): ");
+                            format.Append("({2},{3}): ");
                         }
                         else
                         {
-                            format.Append("({2}-{7}): ");
+                            format.Append("({2},{3}-{8}): ");
                         }
                     }
                     else
                     {
-                        if (endLineNumber == 0)
+                        if (endColumnNumber == 0)
                         {
-                            if (endColumnNumber == 0)
-                            {
-                                format.Append("({2},{3}): ");
-                            }
-                            else
-                            {
-                                format.Append("({2},{3}-{8}): ");
-                            }
+                            format.Append("({2}-{7},{3}): ");
                         }
                         else
                         {
-                            if (endColumnNumber == 0)
-                            {
-                                format.Append("({2}-{7},{3}): ");
-                            }
-                            else
-                            {
-                                format.Append("({2},{3},{7},{8}): ");
-                            }
+                            format.Append("({2},{3},{7},{8}): ");
                         }
                     }
                 }
             }
+        }
 
-            if ((subcategory != null) && (subcategory.Length != 0))
-            {
-                format.Append("{9} ");
-            }
+        if ((subcategory != null) && (subcategory.Length != 0))
+        {
+            format.Append("{9} ");
+        }
 
-            // The category as a string (should not be localized)
-            format.Append("{4} ");
+        // The category as a string (should not be localized)
+        format.Append("{4} ");
 
-            // Put a code in, if available and necessary.
-            if (code == null)
-            {
-                format.Append(": ");
-            }
-            else
-            {
-                format.Append("{5}: ");
-            }
+        // Put a code in, if available and necessary.
+        if (code == null)
+        {
+            format.Append(": ");
+        }
+        else
+        {
+            format.Append("{5}: ");
+        }
 
-            // Put the message in, if available.
-            if (message != null)
-            {
-                format.Append("{6}");
-            }
+        // Put the message in, if available.
+        if (message != null)
+        {
+            format.Append("{6}");
+        }
 
-            // If the project file was specified, tack that onto the very end.
-            if (projectFile != null && !string.Equals(projectFile, file))
-            {
-                format.Append(" [{10}]");
-            }
+        // If the project file was specified, tack that onto the very end.
+        if (projectFile != null && !string.Equals(projectFile, file))
+        {
+            format.Append(" [{10}]");
+        }
 
-            // A null message is allowed and is to be treated as a blank line.
-            if (null == message)
-            {
-                message = string.Empty;
-            }
+        // A null message is allowed and is to be treated as a blank line.
+        if (null == message)
+        {
+            message = string.Empty;
+        }
 
-            var finalFormat = format.ToString();
+        var finalFormat = format.ToString();
 
-            // If there are multiple lines, show each line as a separate message.
-            var lines = SplitStringOnNewLines(message);
-            var formattedMessage = new StringBuilder();
+        // If there are multiple lines, show each line as a separate message.
+        var lines = SplitStringOnNewLines(message);
+        var formattedMessage = new StringBuilder();
 
-            for (var i = 0; i < lines.Length; i++)
-            {
-                formattedMessage.Append(string.Format(
-                    CultureInfo.CurrentCulture, finalFormat,
-                    threadId, file,
-                    lineNumber, columnNumber, category, code,
-                    lines[i], endLineNumber, endColumnNumber,
-                    subcategory, projectFile));
+        for (var i = 0; i < lines.Length; i++)
+        {
+            formattedMessage.Append(string.Format(
+                CultureInfo.CurrentCulture, finalFormat,
+                threadId, file,
+                lineNumber, columnNumber, category, code,
+                lines[i], endLineNumber, endColumnNumber,
+                subcategory, projectFile));
 
-                if (i < (lines.Length - 1))
-                {
-                    formattedMessage.AppendLine();
-                }
+            if (i < (lines.Length - 1))
+            {
+                formattedMessage.AppendLine();
             }
-
-            return formattedMessage.ToString();
         }
 
+        return formattedMessage.ToString();
+    }
 
-        /// <summary>
-        /// Splits strings on 'newLines' with tolerance for Everett and Dogfood builds.
-        /// </summary>
-        /// <param name="s">String to split.</param>
-        private static string[] SplitStringOnNewLines(string s)
-        {
-            var subStrings = s.Split(s_newLines, StringSplitOptions.None);
-            return subStrings;
-        }
 
-        /// <summary>
-        /// The kinds of newline breaks we expect.
-        /// </summary>
-        /// <remarks>Currently we're not supporting "\r".</remarks>
-        private static readonly string[] s_newLines = { "\r\n", "\n" };
+    /// <summary>
+    /// Splits strings on 'newLines' with tolerance for Everett and Dogfood builds.
+    /// </summary>
+    /// <param name="s">String to split.</param>
+    private static string[] SplitStringOnNewLines(string s)
+    {
+        var subStrings = s.Split(s_newLines, StringSplitOptions.None);
+        return subStrings;
     }
-}
+
+    /// <summary>
+    /// The kinds of newline breaks we expect.
+    /// </summary>
+    /// <remarks>Currently we're not supporting "\r".</remarks>
+    private static readonly string[] s_newLines = { "\r\n", "\n" };
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild.Tests/Helpers/GitToolsTestingExtensions.cs b/src/GitVersion.MsBuild.Tests/Helpers/GitToolsTestingExtensions.cs
index 13b5d626a4..7a3f2c0b4e 100644
--- a/src/GitVersion.MsBuild.Tests/Helpers/GitToolsTestingExtensions.cs
+++ b/src/GitVersion.MsBuild.Tests/Helpers/GitToolsTestingExtensions.cs
@@ -6,41 +6,40 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion.MsBuild.Tests.Helpers
+namespace GitVersion.MsBuild.Tests.Helpers;
+
+public static class GitToolsTestingExtensions
 {
-    public static class GitToolsTestingExtensions
+    /// <summary>
+    /// Simulates running on build server
+    /// </summary>
+    public static void InitializeRepo(this RemoteRepositoryFixture fixture)
     {
-        /// <summary>
-        /// Simulates running on build server
-        /// </summary>
-        public static void InitializeRepo(this RemoteRepositoryFixture fixture)
+        var gitVersionOptions = new GitVersionOptions
         {
-            var gitVersionOptions = new GitVersionOptions
-            {
-                WorkingDirectory = fixture.LocalRepositoryFixture.RepositoryPath
-            };
-            var options = Options.Create(gitVersionOptions);
+            WorkingDirectory = fixture.LocalRepositoryFixture.RepositoryPath
+        };
+        var options = Options.Create(gitVersionOptions);
 
-            var environment = new TestEnvironment();
-            environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, "true");
+        var environment = new TestEnvironment();
+        environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, "true");
 
-            var serviceProvider = ConfigureServices(services =>
-            {
-                services.AddSingleton(options);
-                services.AddSingleton(environment);
-            });
+        var serviceProvider = ConfigureServices(services =>
+        {
+            services.AddSingleton(options);
+            services.AddSingleton(environment);
+        });
 
-            var gitPreparer = serviceProvider.GetService<IGitPreparer>();
-            gitPreparer.Prepare();
-        }
+        var gitPreparer = serviceProvider.GetService<IGitPreparer>();
+        gitPreparer.Prepare();
+    }
 
-        private static IServiceProvider ConfigureServices(Action<IServiceCollection> servicesOverrides = null)
-        {
-            var services = new ServiceCollection()
-                .AddModule(new GitVersionCoreTestModule());
+    private static IServiceProvider ConfigureServices(Action<IServiceCollection> servicesOverrides = null)
+    {
+        var services = new ServiceCollection()
+            .AddModule(new GitVersionCoreTestModule());
 
-            servicesOverrides?.Invoke(services);
-            return services.BuildServiceProvider();
-        }
+        servicesOverrides?.Invoke(services);
+        return services.BuildServiceProvider();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixture.cs b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixture.cs
index a502f526c7..3b16796130 100644
--- a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixture.cs
+++ b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixture.cs
@@ -11,70 +11,69 @@
 using Microsoft.Build.Utilities.ProjectCreation;
 using StringWriter = System.IO.StringWriter;
 
-namespace GitVersion.MsBuild.Tests.Helpers
+namespace GitVersion.MsBuild.Tests.Helpers;
+
+public class MsBuildExeFixture
 {
-    public class MsBuildExeFixture
-    {
-        private readonly RepositoryFixtureBase fixture;
-        private KeyValuePair<string, string>[] environmentVariables;
+    private readonly RepositoryFixtureBase fixture;
+    private KeyValuePair<string, string>[] environmentVariables;
 
-        public void WithEnv(params KeyValuePair<string, string>[] envs) => this.environmentVariables = envs;
+    public void WithEnv(params KeyValuePair<string, string>[] envs) => this.environmentVariables = envs;
 
-        public const string OutputTarget = "GitVersionOutput";
+    public const string OutputTarget = "GitVersionOutput";
 
-        private readonly AnalyzerManager manager = new();
-        private readonly string ProjectPath;
+    private readonly AnalyzerManager manager = new();
+    private readonly string ProjectPath;
 
-        public MsBuildExeFixture(RepositoryFixtureBase fixture, string workingDirectory = "")
-        {
-            this.fixture = fixture;
-            this.ProjectPath = Path.Combine(workingDirectory, "app.csproj");
+    public MsBuildExeFixture(RepositoryFixtureBase fixture, string workingDirectory = "")
+    {
+        this.fixture = fixture;
+        this.ProjectPath = Path.Combine(workingDirectory, "app.csproj");
 
-            var versionFile = Path.Combine(workingDirectory, "gitversion.json");
+        var versionFile = Path.Combine(workingDirectory, "gitversion.json");
 
-            fixture.WriteVersionVariables(versionFile);
-        }
+        fixture.WriteVersionVariables(versionFile);
+    }
 
-        public MsBuildExeFixtureResult Execute()
-        {
-            var analyzer = this.manager.GetProject(this.ProjectPath);
+    public MsBuildExeFixtureResult Execute()
+    {
+        var analyzer = this.manager.GetProject(this.ProjectPath);
 
-            var output = new StringWriter();
-            analyzer.AddBuildLogger(new ConsoleLogger(LoggerVerbosity.Normal, output.Write, null, null));
+        var output = new StringWriter();
+        analyzer.AddBuildLogger(new ConsoleLogger(LoggerVerbosity.Normal, output.Write, null, null));
 
-            var environmentOptions = new EnvironmentOptions { DesignTime = false };
-            environmentOptions.TargetsToBuild.Clear();
-            environmentOptions.TargetsToBuild.Add(OutputTarget);
+        var environmentOptions = new EnvironmentOptions { DesignTime = false };
+        environmentOptions.TargetsToBuild.Clear();
+        environmentOptions.TargetsToBuild.Add(OutputTarget);
 
-            if (this.environmentVariables != null)
+        if (this.environmentVariables != null)
+        {
+            foreach (var pair in this.environmentVariables)
             {
-                foreach (var pair in this.environmentVariables)
-                {
-                    analyzer.SetEnvironmentVariable(pair.Key, pair.Value);
-                }
+                analyzer.SetEnvironmentVariable(pair.Key, pair.Value);
             }
-
-            var results = analyzer.Build(environmentOptions);
-
-            return new MsBuildExeFixtureResult(this.fixture)
-            {
-                ProjectPath = ProjectPath,
-                Output = output.ToString(),
-                MsBuild = results
-            };
         }
 
-        public void CreateTestProject(Action<ProjectCreator> extendProject)
+        var results = analyzer.Build(environmentOptions);
+
+        return new MsBuildExeFixtureResult(this.fixture)
         {
-            var project = RuntimeHelper.IsCoreClr()
-                ? ProjectCreator.Templates.SdkCsproj(this.ProjectPath)
-                : ProjectCreator.Templates.LegacyCsproj(this.ProjectPath, defaultTargets: null, targetFrameworkVersion: "v4.8", toolsVersion: "15.0");
+            ProjectPath = ProjectPath,
+            Output = output.ToString(),
+            MsBuild = results
+        };
+    }
+
+    public void CreateTestProject(Action<ProjectCreator> extendProject)
+    {
+        var project = RuntimeHelper.IsCoreClr()
+            ? ProjectCreator.Templates.SdkCsproj(this.ProjectPath)
+            : ProjectCreator.Templates.LegacyCsproj(this.ProjectPath, defaultTargets: null, targetFrameworkVersion: "v4.8", toolsVersion: "15.0");
 
-            if (project == null) return;
+        if (project == null) return;
 
-            extendProject(project);
+        extendProject(project);
 
-            project.Save();
-        }
+        project.Save();
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixtureResult.cs b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixtureResult.cs
index 5dc5c02ee3..ccbd5b3b9c 100644
--- a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixtureResult.cs
+++ b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixtureResult.cs
@@ -2,16 +2,15 @@
 using Buildalyzer;
 using GitTools.Testing;
 
-namespace GitVersion.MsBuild.Tests.Helpers
+namespace GitVersion.MsBuild.Tests.Helpers;
+
+public sealed class MsBuildExeFixtureResult : IDisposable
 {
-    public sealed class MsBuildExeFixtureResult : IDisposable
-    {
-        private readonly RepositoryFixtureBase fixture;
+    private readonly RepositoryFixtureBase fixture;
 
-        public MsBuildExeFixtureResult(RepositoryFixtureBase fixture) => this.fixture = fixture;
-        public IAnalyzerResults MsBuild { get; set; }
-        public string Output { get; set; }
-        public string ProjectPath { get; set; }
-        public void Dispose() => this.fixture.Dispose();
-    }
-}
+    public MsBuildExeFixtureResult(RepositoryFixtureBase fixture) => this.fixture = fixture;
+    public IAnalyzerResults MsBuild { get; set; }
+    public string Output { get; set; }
+    public string ProjectPath { get; set; }
+    public void Dispose() => this.fixture.Dispose();
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixture.cs b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixture.cs
index 73338bcfd7..5f7a364b05 100644
--- a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixture.cs
+++ b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixture.cs
@@ -7,80 +7,79 @@
 using GitVersion.Core.Tests;
 using GitVersion.MsBuild.Tests.Mocks;
 
-namespace GitVersion.MsBuild.Tests.Helpers
+namespace GitVersion.MsBuild.Tests.Helpers;
+
+public class MsBuildTaskFixture
 {
-    public class MsBuildTaskFixture
-    {
-        private readonly RepositoryFixtureBase fixture;
-        private KeyValuePair<string, string>[] environmentVariables;
+    private readonly RepositoryFixtureBase fixture;
+    private KeyValuePair<string, string>[] environmentVariables;
 
-        public MsBuildTaskFixture(RepositoryFixtureBase fixture) => this.fixture = fixture;
+    public MsBuildTaskFixture(RepositoryFixtureBase fixture) => this.fixture = fixture;
 
-        public void WithEnv(params KeyValuePair<string, string>[] envs) => this.environmentVariables = envs;
+    public void WithEnv(params KeyValuePair<string, string>[] envs) => this.environmentVariables = envs;
 
-        public MsBuildTaskFixtureResult<T> Execute<T>(T task) where T : GitVersionTaskBase =>
-            UsingEnv(() =>
-            {
-                var buildEngine = new MockEngine();
+    public MsBuildTaskFixtureResult<T> Execute<T>(T task) where T : GitVersionTaskBase =>
+        UsingEnv(() =>
+        {
+            var buildEngine = new MockEngine();
 
-                task.BuildEngine = buildEngine;
+            task.BuildEngine = buildEngine;
 
-                var versionFile = Path.Combine(task.SolutionDirectory, "gitversion.json");
-                this.fixture.WriteVersionVariables(versionFile);
+            var versionFile = Path.Combine(task.SolutionDirectory, "gitversion.json");
+            this.fixture.WriteVersionVariables(versionFile);
 
-                task.VersionFile = versionFile;
+            task.VersionFile = versionFile;
 
-                var result = task.Execute();
+            var result = task.Execute();
 
-                return new MsBuildTaskFixtureResult<T>(this.fixture)
-                {
-                    Success = result,
-                    Task = task,
-                    Errors = buildEngine.Errors,
-                    Warnings = buildEngine.Warnings,
-                    Messages = buildEngine.Messages,
-                    Log = buildEngine.Log,
-                };
-            });
+            return new MsBuildTaskFixtureResult<T>(this.fixture)
+            {
+                Success = result,
+                Task = task,
+                Errors = buildEngine.Errors,
+                Warnings = buildEngine.Warnings,
+                Messages = buildEngine.Messages,
+                Log = buildEngine.Log,
+            };
+        });
 
-        private T UsingEnv<T>(Func<T> func)
+    private T UsingEnv<T>(Func<T> func)
+    {
+        ResetEnvironment();
+        SetEnvironmentVariables(this.environmentVariables);
+
+        try
+        {
+            return func();
+        }
+        finally
         {
             ResetEnvironment();
-            SetEnvironmentVariables(this.environmentVariables);
-
-            try
-            {
-                return func();
-            }
-            finally
-            {
-                ResetEnvironment();
-            }
         }
+    }
 
-        private static void ResetEnvironment()
+    private static void ResetEnvironment()
+    {
+        var environmentalVariables = new Dictionary<string, string>
         {
-            var environmentalVariables = new Dictionary<string, string>
-            {
-                { TeamCity.EnvironmentVariableName, null },
-                { AppVeyor.EnvironmentVariableName, null },
-                { TravisCi.EnvironmentVariableName, null },
-                { Jenkins.EnvironmentVariableName, null },
-                { AzurePipelines.EnvironmentVariableName, null },
-                { GitHubActions.EnvironmentVariableName, null },
-                { SpaceAutomation.EnvironmentVariableName, null },
-            };
+            { TeamCity.EnvironmentVariableName, null },
+            { AppVeyor.EnvironmentVariableName, null },
+            { TravisCi.EnvironmentVariableName, null },
+            { Jenkins.EnvironmentVariableName, null },
+            { AzurePipelines.EnvironmentVariableName, null },
+            { GitHubActions.EnvironmentVariableName, null },
+            { SpaceAutomation.EnvironmentVariableName, null },
+        };
 
-            SetEnvironmentVariables(environmentalVariables.ToArray());
-        }
+        SetEnvironmentVariables(environmentalVariables.ToArray());
+    }
 
-        private static void SetEnvironmentVariables(KeyValuePair<string, string>[] envs)
+    private static void SetEnvironmentVariables(KeyValuePair<string, string>[] envs)
+    {
+        if (envs == null) return;
+        foreach (var env in envs)
         {
-            if (envs == null) return;
-            foreach (var env in envs)
-            {
-                System.Environment.SetEnvironmentVariable(env.Key, env.Value);
-            }
+            System.Environment.SetEnvironmentVariable(env.Key, env.Value);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixtureResult.cs b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixtureResult.cs
index a250a1d1bd..f6a332a405 100644
--- a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixtureResult.cs
+++ b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixtureResult.cs
@@ -2,22 +2,21 @@
 using GitTools.Testing;
 using Microsoft.Build.Framework;
 
-namespace GitVersion.MsBuild.Tests.Helpers
+namespace GitVersion.MsBuild.Tests.Helpers;
+
+public sealed class MsBuildTaskFixtureResult<T> : IDisposable where T : ITask
 {
-    public sealed class MsBuildTaskFixtureResult<T> : IDisposable where T : ITask
-    {
-        private readonly RepositoryFixtureBase fixture;
+    private readonly RepositoryFixtureBase fixture;
 
-        public MsBuildTaskFixtureResult(RepositoryFixtureBase fixture) => this.fixture = fixture;
-        public bool Success { get; set; }
+    public MsBuildTaskFixtureResult(RepositoryFixtureBase fixture) => this.fixture = fixture;
+    public bool Success { get; set; }
 
-        public T Task { get; set; }
+    public T Task { get; set; }
 
-        public int Errors { get; set; }
-        public int Warnings { get; set; }
-        public int Messages { get; set; }
-        public string Log { get; set; }
+    public int Errors { get; set; }
+    public int Warnings { get; set; }
+    public int Messages { get; set; }
+    public string Log { get; set; }
 
-        public void Dispose() => this.fixture.Dispose();
-    }
-}
+    public void Dispose() => this.fixture.Dispose();
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild.Tests/InvalidFileCheckerTests.cs b/src/GitVersion.MsBuild.Tests/InvalidFileCheckerTests.cs
index d4c38d5134..b0a20b5438 100644
--- a/src/GitVersion.MsBuild.Tests/InvalidFileCheckerTests.cs
+++ b/src/GitVersion.MsBuild.Tests/InvalidFileCheckerTests.cs
@@ -5,116 +5,116 @@
 using Microsoft.Build.Framework;
 using NUnit.Framework;
 
-namespace GitVersion.MsBuild.Tests
+namespace GitVersion.MsBuild.Tests;
+
+[TestFixture]
+public class InvalidFileCheckerTests : TestBase
 {
-    [TestFixture]
-    public class InvalidFileCheckerTests : TestBase
-    {
-        private string projectDirectory;
-        private string projectFile;
+    private string projectDirectory;
+    private string projectFile;
 
-        [SetUp]
-        public void CreateTemporaryProject()
-        {
-            this.projectDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
-            this.projectFile = Path.Combine(this.projectDirectory, "Fake.csproj");
+    [SetUp]
+    public void CreateTemporaryProject()
+    {
+        this.projectDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+        this.projectFile = Path.Combine(this.projectDirectory, "Fake.csproj");
 
-            Directory.CreateDirectory(this.projectDirectory);
+        Directory.CreateDirectory(this.projectDirectory);
 
-            File.Create(this.projectFile).Close();
-        }
+        File.Create(this.projectFile).Close();
+    }
 
-        [TearDown]
-        public void Cleanup() => Directory.Delete(this.projectDirectory, true);
+    [TearDown]
+    public void Cleanup() => Directory.Delete(this.projectDirectory, true);
 
-        [Test]
-        public void VerifyIgnoreNonAssemblyInfoFile()
+    [Test]
+    public void VerifyIgnoreNonAssemblyInfoFile()
+    {
+        using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "SomeOtherFile.cs")))
         {
-            using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "SomeOtherFile.cs")))
-            {
-                writer.Write(@"
+            writer.Write(@"
 using System;
 using System.Reflection;
 
 [assembly: AssemblyVersion(""1.0.0.0"")]
 ");
-            }
-
-            FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "SomeOtherFile.cs" } }, this.projectFile);
         }
 
-        [Test]
-        public void VerifyAttributeFoundCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System.Reflection.AssemblyVersion")] string attribute)
+        FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "SomeOtherFile.cs" } }, this.projectFile);
+    }
+
+    [Test]
+    public void VerifyAttributeFoundCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System.Reflection.AssemblyVersion")] string attribute)
+    {
+        using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.cs")))
         {
-            using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.cs")))
-            {
-                writer.Write(@"
+            writer.Write(@"
 using System;
 using System.Reflection;
 
 [assembly:{0}(""1.0.0.0"")]
 ", attribute);
-            }
-
-            var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, this.projectFile), attribute);
-            Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.cs"));
         }
 
-        [Test]
-        public void VerifyUnformattedAttributeFoundCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System . Reflection   .   AssemblyVersion")] string attribute)
+        var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, this.projectFile), attribute);
+        Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.cs"));
+    }
+
+    [Test]
+    public void VerifyUnformattedAttributeFoundCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System . Reflection   .   AssemblyVersion")] string attribute)
+    {
+        using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.cs")))
         {
-            using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.cs")))
-            {
-                writer.Write(@"
+            writer.Write(@"
 using System;
 using System.Reflection;
 
 [  assembly   :
 {0}     ( ""1.0.0.0"")]
 ", attribute);
-            }
-
-            var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, this.projectFile), attribute);
-            Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.cs"));
         }
 
-        [Test]
-        public void VerifyCommentWorksCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+        var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, this.projectFile), attribute);
+        Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.cs"));
+    }
+
+    [Test]
+    public void VerifyCommentWorksCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+    {
+        using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.cs")))
         {
-            using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.cs")))
-            {
-                writer.Write(@"
+            writer.Write(@"
 using System;
 using System.Reflection;
 
 //[assembly: {0}(""1.0.0.0"")]
 ", attribute);
-            }
-
-            FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, this.projectFile);
         }
 
-        [Test]
-        public void VerifyCommentWithNoNewLineAtEndWorksCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+        FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, this.projectFile);
+    }
+
+    [Test]
+    public void VerifyCommentWithNoNewLineAtEndWorksCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+    {
+        using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.cs")))
         {
-            using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.cs")))
-            {
-                writer.Write(@"
+            writer.Write(@"
 using System;
 using System.Reflection;
 
 //[assembly: {0}(""1.0.0.0"")]", attribute);
-            }
-
-            FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, this.projectFile);
         }
 
-        [Test]
-        public void VerifyStringWorksCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+        FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, this.projectFile);
+    }
+
+    [Test]
+    public void VerifyStringWorksCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+    {
+        using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.cs")))
         {
-            using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.cs")))
-            {
-                writer.Write(@"
+            writer.Write(@"
 using System;
 using System.Reflection;
 
@@ -123,17 +123,17 @@ public class Temp
     static const string Foo = ""[assembly: {0}(""""1.0.0.0"""")]"";
 }}
 ", attribute);
-            }
-
-            FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, this.projectFile);
         }
 
-        [Test]
-        public void VerifyIdentifierWorksCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+        FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, this.projectFile);
+    }
+
+    [Test]
+    public void VerifyIdentifierWorksCSharp([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+    {
+        using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.cs")))
         {
-            using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.cs")))
-            {
-                writer.Write(@"
+            writer.Write(@"
 using System;
 using System.Reflection;
 
@@ -141,83 +141,83 @@ public class {0}
 {{
 }}
 ", attribute);
-            }
-
-            FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, this.projectFile);
         }
 
-        [Test]
-        public void VerifyAttributeFoundVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System.Reflection.AssemblyVersion")] string attribute)
+        FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, this.projectFile);
+    }
+
+    [Test]
+    public void VerifyAttributeFoundVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System.Reflection.AssemblyVersion")] string attribute)
+    {
+        using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.vb")))
         {
-            using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.vb")))
-            {
-                writer.Write(@"
+            writer.Write(@"
 Imports System
 Imports System.Reflection
 
 <Assembly:{0}(""1.0.0.0"")>
 ", attribute);
-            }
-
-            var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, this.projectFile), attribute);
-            Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.vb"));
         }
 
-        [Test]
-        public void VerifyUnformattedAttributeFoundVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System . Reflection   .   AssemblyVersion")] string attribute)
+        var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, this.projectFile), attribute);
+        Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.vb"));
+    }
+
+    [Test]
+    public void VerifyUnformattedAttributeFoundVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion", "System . Reflection   .   AssemblyVersion")] string attribute)
+    {
+        using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.vb")))
         {
-            using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.vb")))
-            {
-                writer.Write(@"
+            writer.Write(@"
 Imports System
 Imports System.Reflection
 
 <  Assembly   :
 {0}     ( ""1.0.0.0"")>
 ", attribute);
-            }
-
-            var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, this.projectFile), attribute);
-            Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.vb"));
         }
 
-        [Test]
-        public void VerifyCommentWorksVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+        var ex = Assert.Throws<WarningException>(() => FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, this.projectFile), attribute);
+        Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.vb"));
+    }
+
+    [Test]
+    public void VerifyCommentWorksVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+    {
+        using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.vb")))
         {
-            using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.vb")))
-            {
-                writer.Write(@"
+            writer.Write(@"
 Imports System
 Imports System.Reflection
 
 '<Assembly: {0}(""1.0.0.0"")>
 ", attribute);
-            }
-
-            FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, this.projectFile);
         }
 
-        [Test]
-        public void VerifyCommentWithNoNewLineAtEndWorksVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+        FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, this.projectFile);
+    }
+
+    [Test]
+    public void VerifyCommentWithNoNewLineAtEndWorksVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+    {
+        using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.vb")))
         {
-            using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.vb")))
-            {
-                writer.Write(@"
+            writer.Write(@"
 Imports System
 Imports System.Reflection
 
 '<Assembly: {0}(""1.0.0.0"")>", attribute);
-            }
-
-            FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, this.projectFile);
         }
 
-        [Test]
-        public void VerifyStringWorksVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+        FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, this.projectFile);
+    }
+
+    [Test]
+    public void VerifyStringWorksVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+    {
+        using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.vb")))
         {
-            using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.vb")))
-            {
-                writer.Write(@"
+            writer.Write(@"
 Imports System
 Imports System.Reflection
 
@@ -225,26 +225,25 @@ Public Class Temp
     static const string Foo = ""<Assembly: {0}(""""1.0.0.0"""")>"";
 End Class
 ", attribute);
-            }
-
-            FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, this.projectFile);
         }
 
-        [Test]
-        public void VerifyIdentifierWorksVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+        FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, this.projectFile);
+    }
+
+    [Test]
+    public void VerifyIdentifierWorksVisualBasic([Values("AssemblyVersion", "AssemblyFileVersion", "AssemblyInformationalVersion")] string attribute)
+    {
+        using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.vb")))
         {
-            using (var writer = File.CreateText(Path.Combine(this.projectDirectory, "AssemblyInfo.vb")))
-            {
-                writer.Write(@"
+            writer.Write(@"
 Imports System
 Imports System.Reflection
 
 Public Class {0}
 End Class
 ", attribute);
-            }
-
-            FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, this.projectFile);
         }
+
+        FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, this.projectFile);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild.Tests/Mocks/MockEngine.cs b/src/GitVersion.MsBuild.Tests/Mocks/MockEngine.cs
index 337ec661c2..f4f01c73da 100644
--- a/src/GitVersion.MsBuild.Tests/Mocks/MockEngine.cs
+++ b/src/GitVersion.MsBuild.Tests/Mocks/MockEngine.cs
@@ -7,123 +7,122 @@
 using Microsoft.Build.Framework;
 using Shouldly;
 
-namespace GitVersion.MsBuild.Tests.Mocks
+namespace GitVersion.MsBuild.Tests.Mocks;
+
+internal sealed class MockEngine : IBuildEngine4
 {
-    internal sealed class MockEngine : IBuildEngine4
-    {
-        private readonly ConcurrentDictionary<object, object> objectCache = new();
-        private StringBuilder log = new();
+    private readonly ConcurrentDictionary<object, object> objectCache = new();
+    private StringBuilder log = new();
 
-        internal MessageImportance MinimumMessageImportance { get; set; } = MessageImportance.Low;
+    internal MessageImportance MinimumMessageImportance { get; set; } = MessageImportance.Low;
 
-        internal int Messages { set; get; }
+    internal int Messages { set; get; }
 
-        internal int Warnings { set; get; }
+    internal int Warnings { set; get; }
 
-        internal int Errors { set; get; }
+    internal int Errors { set; get; }
 
-        public bool IsRunningMultipleNodes { get; set; }
+    public bool IsRunningMultipleNodes { get; set; }
 
-        public void LogErrorEvent(BuildErrorEventArgs e)
-        {
-            Console.WriteLine(EventArgsFormatting.FormatEventMessage(e));
-            this.log.AppendLine(EventArgsFormatting.FormatEventMessage(e));
-            ++Errors;
-        }
+    public void LogErrorEvent(BuildErrorEventArgs e)
+    {
+        Console.WriteLine(EventArgsFormatting.FormatEventMessage(e));
+        this.log.AppendLine(EventArgsFormatting.FormatEventMessage(e));
+        ++Errors;
+    }
 
-        public void LogWarningEvent(BuildWarningEventArgs e)
-        {
-            Console.WriteLine(EventArgsFormatting.FormatEventMessage(e));
-            this.log.AppendLine(EventArgsFormatting.FormatEventMessage(e));
-            ++Warnings;
-        }
+    public void LogWarningEvent(BuildWarningEventArgs e)
+    {
+        Console.WriteLine(EventArgsFormatting.FormatEventMessage(e));
+        this.log.AppendLine(EventArgsFormatting.FormatEventMessage(e));
+        ++Warnings;
+    }
 
-        public void LogCustomEvent(CustomBuildEventArgs e)
+    public void LogCustomEvent(CustomBuildEventArgs e)
+    {
+        Console.WriteLine(e.Message);
+        this.log.AppendLine(e.Message);
+    }
+
+    public void LogMessageEvent(BuildMessageEventArgs e)
+    {
+        // Only if the message is above the minimum importance should we record the log message
+        if (e.Importance <= MinimumMessageImportance)
         {
             Console.WriteLine(e.Message);
             this.log.AppendLine(e.Message);
+            ++Messages;
         }
+    }
 
-        public void LogMessageEvent(BuildMessageEventArgs e)
-        {
-            // Only if the message is above the minimum importance should we record the log message
-            if (e.Importance <= MinimumMessageImportance)
-            {
-                Console.WriteLine(e.Message);
-                this.log.AppendLine(e.Message);
-                ++Messages;
-            }
-        }
-
-        public bool ContinueOnError => false;
+    public bool ContinueOnError => false;
 
-        public string ProjectFileOfTaskNode => string.Empty;
+    public string ProjectFileOfTaskNode => string.Empty;
 
-        public int LineNumberOfTaskNode => 0;
+    public int LineNumberOfTaskNode => 0;
 
-        public int ColumnNumberOfTaskNode => 0;
+    public int ColumnNumberOfTaskNode => 0;
 
-        public string Log
-        {
-            set => this.log = new StringBuilder(value);
-            get => this.log.ToString();
-        }
+    public string Log
+    {
+        set => this.log = new StringBuilder(value);
+        get => this.log.ToString();
+    }
 
-        public bool BuildProjectFile(string projectFileName, string[] targetNames, IDictionary globalProperties, IDictionary targetOutputs) => false;
-
-        public bool BuildProjectFile(string projectFileName, string[] targetNames, IDictionary globalProperties, IDictionary targetOutputs, string toolsVersion) => false;
-
-        /// <summary>
-        /// Assert that the log file contains the given string.
-        /// Case insensitive.
-        /// </summary>
-        /// <param name="contains"></param>
-        internal void AssertLogContains(string contains) => Log.ShouldContain(contains, Case.Insensitive);
-
-        /// <summary>
-        /// Assert that the log doesn't contain the given string.
-        /// </summary>
-        /// <param name="contains"></param>
-        internal void AssertLogDoesntContain(string contains) => Log.ShouldNotContain(contains, Case.Insensitive);
-
-        public bool BuildProjectFilesInParallel(
-            string[] projectFileNames,
-            string[] targetNames,
-            IDictionary[] globalProperties,
-            IDictionary[] targetOutputsPerProject,
-            string[] toolsVersion,
-            bool useResultsCache,
-            bool unloadProjectsOnCompletion) => false;
-
-
-        public BuildEngineResult BuildProjectFilesInParallel(
-            string[] projectFileNames,
-            string[] targetNames,
-            IDictionary[] globalProperties,
-            IList<string>[] removeGlobalProperties,
-            string[] toolsVersion,
-            bool returnTargetOutputs) => new(false, null);
-
-        public void Yield()
-        {
-        }
+    public bool BuildProjectFile(string projectFileName, string[] targetNames, IDictionary globalProperties, IDictionary targetOutputs) => false;
+
+    public bool BuildProjectFile(string projectFileName, string[] targetNames, IDictionary globalProperties, IDictionary targetOutputs, string toolsVersion) => false;
+
+    /// <summary>
+    /// Assert that the log file contains the given string.
+    /// Case insensitive.
+    /// </summary>
+    /// <param name="contains"></param>
+    internal void AssertLogContains(string contains) => Log.ShouldContain(contains, Case.Insensitive);
+
+    /// <summary>
+    /// Assert that the log doesn't contain the given string.
+    /// </summary>
+    /// <param name="contains"></param>
+    internal void AssertLogDoesntContain(string contains) => Log.ShouldNotContain(contains, Case.Insensitive);
+
+    public bool BuildProjectFilesInParallel(
+        string[] projectFileNames,
+        string[] targetNames,
+        IDictionary[] globalProperties,
+        IDictionary[] targetOutputsPerProject,
+        string[] toolsVersion,
+        bool useResultsCache,
+        bool unloadProjectsOnCompletion) => false;
+
+
+    public BuildEngineResult BuildProjectFilesInParallel(
+        string[] projectFileNames,
+        string[] targetNames,
+        IDictionary[] globalProperties,
+        IList<string>[] removeGlobalProperties,
+        string[] toolsVersion,
+        bool returnTargetOutputs) => new(false, null);
+
+    public void Yield()
+    {
+    }
 
-        public void Reacquire()
-        {
-        }
+    public void Reacquire()
+    {
+    }
 
-        public object GetRegisteredTaskObject(object key, RegisteredTaskObjectLifetime lifetime)
-        {
-            this.objectCache.TryGetValue(key, out var obj);
-            return obj;
-        }
+    public object GetRegisteredTaskObject(object key, RegisteredTaskObjectLifetime lifetime)
+    {
+        this.objectCache.TryGetValue(key, out var obj);
+        return obj;
+    }
 
-        public void RegisterTaskObject(object key, object obj, RegisteredTaskObjectLifetime lifetime, bool allowEarlyCollection) => this.objectCache[key] = obj;
+    public void RegisterTaskObject(object key, object obj, RegisteredTaskObjectLifetime lifetime, bool allowEarlyCollection) => this.objectCache[key] = obj;
 
-        public object UnregisterTaskObject(object key, RegisteredTaskObjectLifetime lifetime)
-        {
-            this.objectCache.TryRemove(key, out var obj);
-            return obj;
-        }
+    public object UnregisterTaskObject(object key, RegisteredTaskObjectLifetime lifetime)
+    {
+        this.objectCache.TryRemove(key, out var obj);
+        return obj;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild.Tests/Mocks/MockTaskItem.cs b/src/GitVersion.MsBuild.Tests/Mocks/MockTaskItem.cs
index ea1102bbdb..43a033f0a5 100644
--- a/src/GitVersion.MsBuild.Tests/Mocks/MockTaskItem.cs
+++ b/src/GitVersion.MsBuild.Tests/Mocks/MockTaskItem.cs
@@ -2,24 +2,23 @@
 using System.Collections;
 using Microsoft.Build.Framework;
 
-namespace GitVersion.MsBuild.Tests.Mocks
+namespace GitVersion.MsBuild.Tests.Mocks;
+
+internal class MockTaskItem : ITaskItem
 {
-    internal class MockTaskItem : ITaskItem
-    {
-        public string ItemSpec { get; set; }
+    public string ItemSpec { get; set; }
 
-        public int MetadataCount { get; private set; }
+    public int MetadataCount { get; private set; }
 
-        public ICollection MetadataNames { get; private set; }
+    public ICollection MetadataNames { get; private set; }
 
-        public IDictionary CloneCustomMetadata() => throw new NotImplementedException();
+    public IDictionary CloneCustomMetadata() => throw new NotImplementedException();
 
-        public void CopyMetadataTo(ITaskItem destinationItem) => throw new NotImplementedException();
+    public void CopyMetadataTo(ITaskItem destinationItem) => throw new NotImplementedException();
 
-        public string GetMetadata(string metadataName) => throw new NotImplementedException();
+    public string GetMetadata(string metadataName) => throw new NotImplementedException();
 
-        public void RemoveMetadata(string metadataName) => throw new NotImplementedException();
+    public void RemoveMetadata(string metadataName) => throw new NotImplementedException();
 
-        public void SetMetadata(string metadataName, string metadataValue) => throw new NotImplementedException();
-    }
-}
+    public void SetMetadata(string metadataName, string metadataValue) => throw new NotImplementedException();
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild.Tests/Tasks/GenerateGitVersionInformationTest.cs b/src/GitVersion.MsBuild.Tests/Tasks/GenerateGitVersionInformationTest.cs
index 1887d5b47c..7444c60d57 100644
--- a/src/GitVersion.MsBuild.Tests/Tasks/GenerateGitVersionInformationTest.cs
+++ b/src/GitVersion.MsBuild.Tests/Tasks/GenerateGitVersionInformationTest.cs
@@ -8,124 +8,123 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.MsBuild.Tests.Tasks
+namespace GitVersion.MsBuild.Tests.Tasks;
+
+[TestFixture]
+public class GenerateGitVersionInformationTest : TestTaskBase
 {
-    [TestFixture]
-    public class GenerateGitVersionInformationTest : TestTaskBase
+    [Test]
+    public void GenerateGitVersionInformationTaskShouldCreateFile()
+    {
+        var task = new GenerateGitVersionInformation();
+
+        using var result = ExecuteMsBuildTask(task);
+
+        result.Success.ShouldBe(true);
+        result.Errors.ShouldBe(0);
+        result.Task.GitVersionInformationFilePath.ShouldNotBeNull();
+
+        var fileContent = File.ReadAllText(result.Task.GitVersionInformationFilePath);
+        fileContent.ShouldContain($@"{nameof(VersionVariables.Major)} = ""1""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.Minor)} = ""2""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.Patch)} = ""4""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.MajorMinorPatch)} = ""1.2.4""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.FullSemVer)} = ""1.2.4+1""");
+    }
+
+    [Test]
+    public void GenerateGitVersionInformationTaskShouldCreateFileInBuildServer()
+    {
+        var task = new GenerateGitVersionInformation();
+
+        using var result = ExecuteMsBuildTaskInAzurePipeline(task);
+
+        result.Success.ShouldBe(true);
+        result.Errors.ShouldBe(0);
+        result.Task.GitVersionInformationFilePath.ShouldNotBeNull();
+
+        var fileContent = File.ReadAllText(result.Task.GitVersionInformationFilePath);
+        fileContent.ShouldContain($@"{nameof(VersionVariables.Major)} = ""1""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.Minor)} = ""0""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.Patch)} = ""1""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.MajorMinorPatch)} = ""1.0.1""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.FullSemVer)} = ""1.0.1+1""");
+    }
+
+    [Test]
+    [Category(NoNet48)]
+    [Category(NoMono)]
+    public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuild()
+    {
+        const string taskName = nameof(GenerateGitVersionInformation);
+        const string outputProperty = nameof(GenerateGitVersionInformation.GitVersionInformationFilePath);
+
+        using var result = ExecuteMsBuildExe(project => AddGenerateGitVersionInformationTask(project, taskName, taskName, outputProperty));
+
+        result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
+        result.MsBuild.Count.ShouldBeGreaterThan(0);
+        result.MsBuild.OverallSuccess.ShouldBe(true);
+        result.MsBuild.ShouldAllBe(x => x.Succeeded);
+        result.Output.ShouldNotBeNullOrWhiteSpace();
+
+        var generatedFilePath = Path.Combine(Path.GetDirectoryName(result.ProjectPath), "GitVersionInformation.g.cs");
+        result.Output.ShouldContain($"{outputProperty}: {generatedFilePath}");
+
+        var fileContent = File.ReadAllText(generatedFilePath);
+        fileContent.ShouldContain($@"{nameof(VersionVariables.Major)} = ""1""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.Minor)} = ""2""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.Patch)} = ""4""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.MajorMinorPatch)} = ""1.2.4""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.FullSemVer)} = ""1.2.4+1""");
+    }
+
+    [Test]
+    [Category(NoNet48)]
+    [Category(NoMono)]
+    public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuildInBuildServer()
+    {
+        const string taskName = nameof(GenerateGitVersionInformation);
+        const string outputProperty = nameof(GenerateGitVersionInformation.GitVersionInformationFilePath);
+
+        using var result = ExecuteMsBuildExeInAzurePipeline(project => AddGenerateGitVersionInformationTask(project, taskName, taskName, outputProperty));
+
+        result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
+        result.MsBuild.Count.ShouldBeGreaterThan(0);
+        result.MsBuild.OverallSuccess.ShouldBe(true);
+        result.MsBuild.ShouldAllBe(x => x.Succeeded);
+        result.Output.ShouldNotBeNullOrWhiteSpace();
+
+        var generatedFilePath = Path.Combine(Path.GetDirectoryName(result.ProjectPath), "GitVersionInformation.g.cs");
+        result.Output.ShouldContain($"{outputProperty}: {generatedFilePath}");
+
+        var fileContent = File.ReadAllText(generatedFilePath);
+        fileContent.ShouldContain($@"{nameof(VersionVariables.Major)} = ""1""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.Minor)} = ""0""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.Patch)} = ""1""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.MajorMinorPatch)} = ""1.0.1""");
+        fileContent.ShouldContain($@"{nameof(VersionVariables.FullSemVer)} = ""1.0.1+1""");
+    }
+
+    private static void AddGenerateGitVersionInformationTask(ProjectCreator project, string targetToRun, string taskName, string outputProperty)
     {
-        [Test]
-        public void GenerateGitVersionInformationTaskShouldCreateFile()
-        {
-            var task = new GenerateGitVersionInformation();
-
-            using var result = ExecuteMsBuildTask(task);
-
-            result.Success.ShouldBe(true);
-            result.Errors.ShouldBe(0);
-            result.Task.GitVersionInformationFilePath.ShouldNotBeNull();
-
-            var fileContent = File.ReadAllText(result.Task.GitVersionInformationFilePath);
-            fileContent.ShouldContain($@"{nameof(VersionVariables.Major)} = ""1""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.Minor)} = ""2""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.Patch)} = ""4""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.MajorMinorPatch)} = ""1.2.4""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.FullSemVer)} = ""1.2.4+1""");
-        }
-
-        [Test]
-        public void GenerateGitVersionInformationTaskShouldCreateFileInBuildServer()
-        {
-            var task = new GenerateGitVersionInformation();
-
-            using var result = ExecuteMsBuildTaskInAzurePipeline(task);
-
-            result.Success.ShouldBe(true);
-            result.Errors.ShouldBe(0);
-            result.Task.GitVersionInformationFilePath.ShouldNotBeNull();
-
-            var fileContent = File.ReadAllText(result.Task.GitVersionInformationFilePath);
-            fileContent.ShouldContain($@"{nameof(VersionVariables.Major)} = ""1""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.Minor)} = ""0""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.Patch)} = ""1""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.MajorMinorPatch)} = ""1.0.1""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.FullSemVer)} = ""1.0.1+1""");
-        }
-
-        [Test]
-        [Category(NoNet48)]
-        [Category(NoMono)]
-        public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuild()
-        {
-            const string taskName = nameof(GenerateGitVersionInformation);
-            const string outputProperty = nameof(GenerateGitVersionInformation.GitVersionInformationFilePath);
-
-            using var result = ExecuteMsBuildExe(project => AddGenerateGitVersionInformationTask(project, taskName, taskName, outputProperty));
-
-            result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
-            result.MsBuild.Count.ShouldBeGreaterThan(0);
-            result.MsBuild.OverallSuccess.ShouldBe(true);
-            result.MsBuild.ShouldAllBe(x => x.Succeeded);
-            result.Output.ShouldNotBeNullOrWhiteSpace();
-
-            var generatedFilePath = Path.Combine(Path.GetDirectoryName(result.ProjectPath), "GitVersionInformation.g.cs");
-            result.Output.ShouldContain($"{outputProperty}: {generatedFilePath}");
-
-            var fileContent = File.ReadAllText(generatedFilePath);
-            fileContent.ShouldContain($@"{nameof(VersionVariables.Major)} = ""1""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.Minor)} = ""2""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.Patch)} = ""4""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.MajorMinorPatch)} = ""1.2.4""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.FullSemVer)} = ""1.2.4+1""");
-        }
-
-        [Test]
-        [Category(NoNet48)]
-        [Category(NoMono)]
-        public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuildInBuildServer()
-        {
-            const string taskName = nameof(GenerateGitVersionInformation);
-            const string outputProperty = nameof(GenerateGitVersionInformation.GitVersionInformationFilePath);
-
-            using var result = ExecuteMsBuildExeInAzurePipeline(project => AddGenerateGitVersionInformationTask(project, taskName, taskName, outputProperty));
-
-            result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
-            result.MsBuild.Count.ShouldBeGreaterThan(0);
-            result.MsBuild.OverallSuccess.ShouldBe(true);
-            result.MsBuild.ShouldAllBe(x => x.Succeeded);
-            result.Output.ShouldNotBeNullOrWhiteSpace();
-
-            var generatedFilePath = Path.Combine(Path.GetDirectoryName(result.ProjectPath), "GitVersionInformation.g.cs");
-            result.Output.ShouldContain($"{outputProperty}: {generatedFilePath}");
-
-            var fileContent = File.ReadAllText(generatedFilePath);
-            fileContent.ShouldContain($@"{nameof(VersionVariables.Major)} = ""1""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.Minor)} = ""0""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.Patch)} = ""1""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.MajorMinorPatch)} = ""1.0.1""");
-            fileContent.ShouldContain($@"{nameof(VersionVariables.FullSemVer)} = ""1.0.1+1""");
-        }
-
-        private static void AddGenerateGitVersionInformationTask(ProjectCreator project, string targetToRun, string taskName, string outputProperty)
-        {
-            var assemblyFileLocation = typeof(GitVersionTaskBase).Assembly.Location;
-            project.UsingTaskAssemblyFile(taskName, assemblyFileLocation)
-                .Property("GenerateAssemblyInfo", "false")
-                .Target(targetToRun, beforeTargets: "CoreCompile;GetAssemblyVersion;GenerateNuspec")
-                    .Task(taskName, parameters: new Dictionary<string, string>
-                    {
-                        { "SolutionDirectory", "$(MSBuildProjectDirectory)" },
-                        { "VersionFile", "$(MSBuildProjectDirectory)/gitversion.json" },
-                        { "ProjectFile", "$(MSBuildProjectFullPath)" },
-                        { "IntermediateOutputPath", "$(MSBuildProjectDirectory)" },
-                        { "Language", "$(Language)" },
-                    })
-                        .TaskOutputProperty(outputProperty, outputProperty)
-                    .ItemGroup()
-                        .ItemCompile($"$({outputProperty})")
-                        .ItemInclude("FileWrites", $"$({outputProperty})")
-                        .ItemInclude("_GeneratedCodeFiles", $"$({outputProperty})")
-                .Target(MsBuildExeFixture.OutputTarget, dependsOnTargets: targetToRun)
-                    .TaskMessage($"{outputProperty}: $({outputProperty})", MessageImportance.High);
-        }
+        var assemblyFileLocation = typeof(GitVersionTaskBase).Assembly.Location;
+        project.UsingTaskAssemblyFile(taskName, assemblyFileLocation)
+            .Property("GenerateAssemblyInfo", "false")
+            .Target(targetToRun, beforeTargets: "CoreCompile;GetAssemblyVersion;GenerateNuspec")
+            .Task(taskName, parameters: new Dictionary<string, string>
+            {
+                { "SolutionDirectory", "$(MSBuildProjectDirectory)" },
+                { "VersionFile", "$(MSBuildProjectDirectory)/gitversion.json" },
+                { "ProjectFile", "$(MSBuildProjectFullPath)" },
+                { "IntermediateOutputPath", "$(MSBuildProjectDirectory)" },
+                { "Language", "$(Language)" },
+            })
+            .TaskOutputProperty(outputProperty, outputProperty)
+            .ItemGroup()
+            .ItemCompile($"$({outputProperty})")
+            .ItemInclude("FileWrites", $"$({outputProperty})")
+            .ItemInclude("_GeneratedCodeFiles", $"$({outputProperty})")
+            .Target(MsBuildExeFixture.OutputTarget, dependsOnTargets: targetToRun)
+            .TaskMessage($"{outputProperty}: $({outputProperty})", MessageImportance.High);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild.Tests/Tasks/GetVersionTaskTests.cs b/src/GitVersion.MsBuild.Tests/Tasks/GetVersionTaskTests.cs
index 3f56366489..bf5946e0d6 100644
--- a/src/GitVersion.MsBuild.Tests/Tasks/GetVersionTaskTests.cs
+++ b/src/GitVersion.MsBuild.Tests/Tasks/GetVersionTaskTests.cs
@@ -8,112 +8,111 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.MsBuild.Tests.Tasks
+namespace GitVersion.MsBuild.Tests.Tasks;
+
+[TestFixture]
+public class GetVersionTaskTests : TestTaskBase
 {
-    [TestFixture]
-    public class GetVersionTaskTests : TestTaskBase
+    [Test]
+    public void OutputsShouldMatchVariableProvider()
+    {
+        var taskProperties = typeof(GetVersion)
+            .GetProperties()
+            .Where(p => p.GetCustomAttributes(typeof(OutputAttribute), false).Any())
+            .Select(p => p.Name);
+
+        var variablesProperties = VersionVariables.AvailableVariables;
+
+        taskProperties.ShouldBe(variablesProperties, ignoreOrder: true);
+    }
+
+    [Test]
+    public void GetVersionTaskShouldReturnVersionOutputVariables()
+    {
+        var task = new GetVersion();
+
+        using var result = ExecuteMsBuildTask(task);
+
+        result.Success.ShouldBe(true);
+        result.Errors.ShouldBe(0);
+        result.Task.Major.ShouldBe("1");
+        result.Task.Minor.ShouldBe("2");
+        result.Task.Patch.ShouldBe("4");
+        result.Task.MajorMinorPatch.ShouldBe("1.2.4");
+        result.Task.FullSemVer.ShouldBe("1.2.4+1");
+    }
+
+    [Test]
+    public void GetVersionTaskShouldReturnVersionOutputVariablesForBuildServer()
+    {
+        var task = new GetVersion();
+
+        using var result = ExecuteMsBuildTaskInAzurePipeline(task);
+
+        result.Success.ShouldBe(true);
+        result.Errors.ShouldBe(0);
+        result.Task.Major.ShouldBe("1");
+        result.Task.Minor.ShouldBe("0");
+        result.Task.Patch.ShouldBe("1");
+        result.Task.MajorMinorPatch.ShouldBe("1.0.1");
+        result.Task.FullSemVer.ShouldBe("1.0.1+1");
+    }
+
+    [TestCase(nameof(VersionVariables.Major), "1")]
+    [TestCase(nameof(VersionVariables.Minor), "2")]
+    [TestCase(nameof(VersionVariables.Patch), "4")]
+    [TestCase(nameof(VersionVariables.MajorMinorPatch), "1.2.4")]
+    [TestCase(nameof(VersionVariables.FullSemVer), "1.2.4+1")]
+    [Category(NoNet48)]
+    [Category(NoMono)]
+    public void GetVersionTaskShouldReturnVersionOutputVariablesWhenRunWithMsBuild(string outputProperty, string version)
+    {
+        const string taskName = nameof(GetVersion);
+
+        using var result = ExecuteMsBuildExe(project => AddGetVersionTask(project, taskName, taskName, outputProperty));
+
+        result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
+        result.MsBuild.Count.ShouldBeGreaterThan(0);
+        result.MsBuild.OverallSuccess.ShouldBe(true);
+        result.MsBuild.ShouldAllBe(x => x.Succeeded);
+        result.Output.ShouldNotBeNullOrWhiteSpace();
+        result.Output.ShouldContain($"GitVersion_{outputProperty}: {version}");
+    }
+
+    [TestCase(nameof(VersionVariables.Major), "1")]
+    [TestCase(nameof(VersionVariables.Minor), "0")]
+    [TestCase(nameof(VersionVariables.Patch), "1")]
+    [TestCase(nameof(VersionVariables.MajorMinorPatch), "1.0.1")]
+    [TestCase(nameof(VersionVariables.FullSemVer), "1.0.1+1")]
+    [Category(NoNet48)]
+    [Category(NoMono)]
+    public void GetVersionTaskShouldReturnVersionOutputVariablesWhenRunWithMsBuildInBuildServer(string outputProperty, string version)
+    {
+        const string taskName = nameof(GetVersion);
+
+        using var result = ExecuteMsBuildExeInAzurePipeline(project => AddGetVersionTask(project, taskName, taskName, outputProperty));
+
+        result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
+        result.MsBuild.Count.ShouldBeGreaterThan(0);
+        result.MsBuild.OverallSuccess.ShouldBe(true);
+        result.MsBuild.ShouldAllBe(x => x.Succeeded);
+        result.Output.ShouldNotBeNullOrWhiteSpace();
+        result.Output.ShouldContain($"GitVersion_{outputProperty}: {version}");
+    }
+
+    private static void AddGetVersionTask(ProjectCreator project, string targetToRun, string taskName, string outputProperty)
     {
-        [Test]
-        public void OutputsShouldMatchVariableProvider()
-        {
-            var taskProperties = typeof(GetVersion)
-                .GetProperties()
-                .Where(p => p.GetCustomAttributes(typeof(OutputAttribute), false).Any())
-                .Select(p => p.Name);
-
-            var variablesProperties = VersionVariables.AvailableVariables;
-
-            taskProperties.ShouldBe(variablesProperties, ignoreOrder: true);
-        }
-
-        [Test]
-        public void GetVersionTaskShouldReturnVersionOutputVariables()
-        {
-            var task = new GetVersion();
-
-            using var result = ExecuteMsBuildTask(task);
-
-            result.Success.ShouldBe(true);
-            result.Errors.ShouldBe(0);
-            result.Task.Major.ShouldBe("1");
-            result.Task.Minor.ShouldBe("2");
-            result.Task.Patch.ShouldBe("4");
-            result.Task.MajorMinorPatch.ShouldBe("1.2.4");
-            result.Task.FullSemVer.ShouldBe("1.2.4+1");
-        }
-
-        [Test]
-        public void GetVersionTaskShouldReturnVersionOutputVariablesForBuildServer()
-        {
-            var task = new GetVersion();
-
-            using var result = ExecuteMsBuildTaskInAzurePipeline(task);
-
-            result.Success.ShouldBe(true);
-            result.Errors.ShouldBe(0);
-            result.Task.Major.ShouldBe("1");
-            result.Task.Minor.ShouldBe("0");
-            result.Task.Patch.ShouldBe("1");
-            result.Task.MajorMinorPatch.ShouldBe("1.0.1");
-            result.Task.FullSemVer.ShouldBe("1.0.1+1");
-        }
-
-        [TestCase(nameof(VersionVariables.Major), "1")]
-        [TestCase(nameof(VersionVariables.Minor), "2")]
-        [TestCase(nameof(VersionVariables.Patch), "4")]
-        [TestCase(nameof(VersionVariables.MajorMinorPatch), "1.2.4")]
-        [TestCase(nameof(VersionVariables.FullSemVer), "1.2.4+1")]
-        [Category(NoNet48)]
-        [Category(NoMono)]
-        public void GetVersionTaskShouldReturnVersionOutputVariablesWhenRunWithMsBuild(string outputProperty, string version)
-        {
-            const string taskName = nameof(GetVersion);
-
-            using var result = ExecuteMsBuildExe(project => AddGetVersionTask(project, taskName, taskName, outputProperty));
-
-            result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
-            result.MsBuild.Count.ShouldBeGreaterThan(0);
-            result.MsBuild.OverallSuccess.ShouldBe(true);
-            result.MsBuild.ShouldAllBe(x => x.Succeeded);
-            result.Output.ShouldNotBeNullOrWhiteSpace();
-            result.Output.ShouldContain($"GitVersion_{outputProperty}: {version}");
-        }
-
-        [TestCase(nameof(VersionVariables.Major), "1")]
-        [TestCase(nameof(VersionVariables.Minor), "0")]
-        [TestCase(nameof(VersionVariables.Patch), "1")]
-        [TestCase(nameof(VersionVariables.MajorMinorPatch), "1.0.1")]
-        [TestCase(nameof(VersionVariables.FullSemVer), "1.0.1+1")]
-        [Category(NoNet48)]
-        [Category(NoMono)]
-        public void GetVersionTaskShouldReturnVersionOutputVariablesWhenRunWithMsBuildInBuildServer(string outputProperty, string version)
-        {
-            const string taskName = nameof(GetVersion);
-
-            using var result = ExecuteMsBuildExeInAzurePipeline(project => AddGetVersionTask(project, taskName, taskName, outputProperty));
-
-            result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
-            result.MsBuild.Count.ShouldBeGreaterThan(0);
-            result.MsBuild.OverallSuccess.ShouldBe(true);
-            result.MsBuild.ShouldAllBe(x => x.Succeeded);
-            result.Output.ShouldNotBeNullOrWhiteSpace();
-            result.Output.ShouldContain($"GitVersion_{outputProperty}: {version}");
-        }
-
-        private static void AddGetVersionTask(ProjectCreator project, string targetToRun, string taskName, string outputProperty)
-        {
-            var assemblyFileLocation = typeof(GitVersionTaskBase).Assembly.Location;
-            project.UsingTaskAssemblyFile(taskName, assemblyFileLocation)
-                .Property("GenerateAssemblyInfo", "false")
-                .Target(targetToRun, beforeTargets: "CoreCompile;GetAssemblyVersion;GenerateNuspec")
-                    .Task(taskName, parameters: new Dictionary<string, string>
-                    {
-                        { "SolutionDirectory", "$(MSBuildProjectDirectory)" },
-                        { "VersionFile", "$(MSBuildProjectDirectory)/gitversion.json" }
-                    })
-                    .TaskOutputProperty(outputProperty, $"GitVersion_{outputProperty}")
-                .Target(MsBuildExeFixture.OutputTarget, dependsOnTargets: targetToRun)
-                    .TaskMessage($"GitVersion_{outputProperty}: $(GitVersion_{outputProperty})", MessageImportance.High);
-        }
+        var assemblyFileLocation = typeof(GitVersionTaskBase).Assembly.Location;
+        project.UsingTaskAssemblyFile(taskName, assemblyFileLocation)
+            .Property("GenerateAssemblyInfo", "false")
+            .Target(targetToRun, beforeTargets: "CoreCompile;GetAssemblyVersion;GenerateNuspec")
+            .Task(taskName, parameters: new Dictionary<string, string>
+            {
+                { "SolutionDirectory", "$(MSBuildProjectDirectory)" },
+                { "VersionFile", "$(MSBuildProjectDirectory)/gitversion.json" }
+            })
+            .TaskOutputProperty(outputProperty, $"GitVersion_{outputProperty}")
+            .Target(MsBuildExeFixture.OutputTarget, dependsOnTargets: targetToRun)
+            .TaskMessage($"GitVersion_{outputProperty}: $(GitVersion_{outputProperty})", MessageImportance.High);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs b/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs
index 7c56773981..fb8e1c155f 100644
--- a/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs
+++ b/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs
@@ -9,119 +9,118 @@
 using LibGit2Sharp;
 using Microsoft.Build.Utilities.ProjectCreation;
 
-namespace GitVersion.MsBuild.Tests.Tasks
+namespace GitVersion.MsBuild.Tests.Tasks;
+
+public class TestTaskBase : TestBase
 {
-    public class TestTaskBase : TestBase
+    private static readonly IDictionary<string, string> env = new Dictionary<string, string>
     {
-        private static readonly IDictionary<string, string> env = new Dictionary<string, string>
-        {
-            { AzurePipelines.EnvironmentVariableName, "true" },
-            { "BUILD_SOURCEBRANCH", null }
-        };
+        { AzurePipelines.EnvironmentVariableName, "true" },
+        { "BUILD_SOURCEBRANCH", null }
+    };
 
-        protected static MsBuildTaskFixtureResult<T> ExecuteMsBuildTask<T>(T task) where T : GitVersionTaskBase
-        {
-            var fixture = CreateLocalRepositoryFixture();
-            task.SolutionDirectory = fixture.RepositoryPath;
+    protected static MsBuildTaskFixtureResult<T> ExecuteMsBuildTask<T>(T task) where T : GitVersionTaskBase
+    {
+        var fixture = CreateLocalRepositoryFixture();
+        task.SolutionDirectory = fixture.RepositoryPath;
 
-            var msbuildFixture = new MsBuildTaskFixture(fixture);
-            var result = msbuildFixture.Execute(task);
-            if (result.Success == false) Console.WriteLine(result.Log);
-            return result;
-        }
+        var msbuildFixture = new MsBuildTaskFixture(fixture);
+        var result = msbuildFixture.Execute(task);
+        if (result.Success == false) Console.WriteLine(result.Log);
+        return result;
+    }
 
-        protected static MsBuildExeFixtureResult ExecuteMsBuildExe(Action<ProjectCreator> extendProject)
-        {
-            var fixture = CreateLocalRepositoryFixture();
+    protected static MsBuildExeFixtureResult ExecuteMsBuildExe(Action<ProjectCreator> extendProject)
+    {
+        var fixture = CreateLocalRepositoryFixture();
 
-            var msbuildFixture = new MsBuildExeFixture(fixture, fixture.RepositoryPath);
+        var msbuildFixture = new MsBuildExeFixture(fixture, fixture.RepositoryPath);
 
-            msbuildFixture.CreateTestProject(extendProject);
+        msbuildFixture.CreateTestProject(extendProject);
 
-            var result = msbuildFixture.Execute();
-            if (result.MsBuild.OverallSuccess == false) Console.WriteLine(result.Output);
-            return result;
-        }
+        var result = msbuildFixture.Execute();
+        if (result.MsBuild.OverallSuccess == false) Console.WriteLine(result.Output);
+        return result;
+    }
 
-        protected static MsBuildTaskFixtureResult<T> ExecuteMsBuildTaskInAzurePipeline<T>(T task, string buildNumber = null, string configurationText = null) where T : GitVersionTaskBase
+    protected static MsBuildTaskFixtureResult<T> ExecuteMsBuildTaskInAzurePipeline<T>(T task, string buildNumber = null, string configurationText = null) where T : GitVersionTaskBase
+    {
+        var fixture = CreateRemoteRepositoryFixture();
+        task.SolutionDirectory = fixture.LocalRepositoryFixture.RepositoryPath;
+        var msbuildFixture = new MsBuildTaskFixture(fixture);
+        var environmentVariables = new List<KeyValuePair<string, string>>(env.ToArray());
+        if (buildNumber != null)
         {
-            var fixture = CreateRemoteRepositoryFixture();
-            task.SolutionDirectory = fixture.LocalRepositoryFixture.RepositoryPath;
-            var msbuildFixture = new MsBuildTaskFixture(fixture);
-            var environmentVariables = new List<KeyValuePair<string, string>>(env.ToArray());
-            if (buildNumber != null)
-            {
-                environmentVariables.Add(new KeyValuePair<string, string>("BUILD_BUILDNUMBER", buildNumber));
-            }
-            msbuildFixture.WithEnv(environmentVariables.ToArray());
-            if (configurationText != null)
-            {
-                CreateConfiguration(task.SolutionDirectory, configurationText);
-            }
-
-            var result = msbuildFixture.Execute(task);
-
-            if (result.Success == false) Console.WriteLine(result.Log);
-            return result;
+            environmentVariables.Add(new KeyValuePair<string, string>("BUILD_BUILDNUMBER", buildNumber));
         }
-
-        protected static MsBuildTaskFixtureResult<T> ExecuteMsBuildTaskInGitHubActions<T>(T task, string envFilePath) where T : GitVersionTaskBase
+        msbuildFixture.WithEnv(environmentVariables.ToArray());
+        if (configurationText != null)
         {
-            var fixture = CreateRemoteRepositoryFixture();
-            task.SolutionDirectory = fixture.LocalRepositoryFixture.RepositoryPath;
-            var msbuildFixture = new MsBuildTaskFixture(fixture);
-            msbuildFixture.WithEnv(
-                new KeyValuePair<string, string>("GITHUB_ACTIONS", "true"),
-                new KeyValuePair<string, string>("GITHUB_ENV", envFilePath)
-            );
-            var result = msbuildFixture.Execute(task);
-            if (result.Success == false)
-                Console.WriteLine(result.Log);
-            return result;
+            CreateConfiguration(task.SolutionDirectory, configurationText);
         }
 
-        protected static MsBuildExeFixtureResult ExecuteMsBuildExeInAzurePipeline(Action<ProjectCreator> extendProject)
-        {
-            var fixture = CreateRemoteRepositoryFixture();
+        var result = msbuildFixture.Execute(task);
 
-            var msbuildFixture = new MsBuildExeFixture(fixture, fixture.LocalRepositoryFixture.RepositoryPath);
+        if (result.Success == false) Console.WriteLine(result.Log);
+        return result;
+    }
 
-            msbuildFixture.CreateTestProject(extendProject);
-            msbuildFixture.WithEnv(env.ToArray());
+    protected static MsBuildTaskFixtureResult<T> ExecuteMsBuildTaskInGitHubActions<T>(T task, string envFilePath) where T : GitVersionTaskBase
+    {
+        var fixture = CreateRemoteRepositoryFixture();
+        task.SolutionDirectory = fixture.LocalRepositoryFixture.RepositoryPath;
+        var msbuildFixture = new MsBuildTaskFixture(fixture);
+        msbuildFixture.WithEnv(
+            new KeyValuePair<string, string>("GITHUB_ACTIONS", "true"),
+            new KeyValuePair<string, string>("GITHUB_ENV", envFilePath)
+        );
+        var result = msbuildFixture.Execute(task);
+        if (result.Success == false)
+            Console.WriteLine(result.Log);
+        return result;
+    }
 
-            var result = msbuildFixture.Execute();
-            if (result.MsBuild.OverallSuccess == false) Console.WriteLine(result.Output);
-            return result;
-        }
+    protected static MsBuildExeFixtureResult ExecuteMsBuildExeInAzurePipeline(Action<ProjectCreator> extendProject)
+    {
+        var fixture = CreateRemoteRepositoryFixture();
 
-        private static EmptyRepositoryFixture CreateLocalRepositoryFixture()
-        {
-            var fixture = new EmptyRepositoryFixture();
-            fixture.MakeATaggedCommit("1.2.3");
-            fixture.MakeACommit();
+        var msbuildFixture = new MsBuildExeFixture(fixture, fixture.LocalRepositoryFixture.RepositoryPath);
 
-            return fixture;
-        }
+        msbuildFixture.CreateTestProject(extendProject);
+        msbuildFixture.WithEnv(env.ToArray());
 
-        private static RemoteRepositoryFixture CreateRemoteRepositoryFixture()
-        {
-            var fixture = new RemoteRepositoryFixture();
-            fixture.Repository.MakeACommit();
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.MakeACommit();
-            fixture.Repository.CreateBranch("develop");
-
-            Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, Array.Empty<string>(), new FetchOptions(), null);
-            Commands.Checkout(fixture.LocalRepositoryFixture.Repository, fixture.Repository.Head.Tip);
-            fixture.LocalRepositoryFixture.Repository.Branches.Remove(MainBranch);
-            fixture.InitializeRepo();
-            return fixture;
-        }
+        var result = msbuildFixture.Execute();
+        if (result.MsBuild.OverallSuccess == false) Console.WriteLine(result.Output);
+        return result;
+    }
 
-        private static void CreateConfiguration(string repoFolder, string content)
-        {
-            var configFilePath = Path.Combine(repoFolder, Configuration.ConfigFileLocator.DefaultFileName);
-            File.WriteAllText(configFilePath, content);
-        }
+    private static EmptyRepositoryFixture CreateLocalRepositoryFixture()
+    {
+        var fixture = new EmptyRepositoryFixture();
+        fixture.MakeATaggedCommit("1.2.3");
+        fixture.MakeACommit();
+
+        return fixture;
+    }
+
+    private static RemoteRepositoryFixture CreateRemoteRepositoryFixture()
+    {
+        var fixture = new RemoteRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.MakeACommit();
+        fixture.Repository.CreateBranch("develop");
+
+        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, Array.Empty<string>(), new FetchOptions(), null);
+        Commands.Checkout(fixture.LocalRepositoryFixture.Repository, fixture.Repository.Head.Tip);
+        fixture.LocalRepositoryFixture.Repository.Branches.Remove(MainBranch);
+        fixture.InitializeRepo();
+        return fixture;
+    }
+
+    private static void CreateConfiguration(string repoFolder, string content)
+    {
+        var configFilePath = Path.Combine(repoFolder, Configuration.ConfigFileLocator.DefaultFileName);
+        File.WriteAllText(configFilePath, content);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild.Tests/Tasks/UpdateAssemblyInfoTaskTest.cs b/src/GitVersion.MsBuild.Tests/Tasks/UpdateAssemblyInfoTaskTest.cs
index 74310fd7ae..a7cfe8cc7b 100644
--- a/src/GitVersion.MsBuild.Tests/Tasks/UpdateAssemblyInfoTaskTest.cs
+++ b/src/GitVersion.MsBuild.Tests/Tasks/UpdateAssemblyInfoTaskTest.cs
@@ -7,109 +7,108 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.MsBuild.Tests.Tasks
+namespace GitVersion.MsBuild.Tests.Tasks;
+
+[TestFixture]
+public class UpdateAssemblyInfoTaskTest : TestTaskBase
 {
-    [TestFixture]
-    public class UpdateAssemblyInfoTaskTest : TestTaskBase
+    [Test]
+    public void UpdateAssemblyInfoTaskShouldCreateFile()
+    {
+        var task = new UpdateAssemblyInfo();
+
+        using var result = ExecuteMsBuildTask(task);
+
+        result.Success.ShouldBe(true);
+        result.Errors.ShouldBe(0);
+        result.Task.AssemblyInfoTempFilePath.ShouldNotBeNull();
+
+        var fileContent = File.ReadAllText(result.Task.AssemblyInfoTempFilePath);
+        fileContent.ShouldContain(@"[assembly: AssemblyVersion(""1.2.4.0"")]");
+    }
+
+    [Test]
+    public void UpdateAssemblyInfoTaskShouldCreateFileInBuildServer()
+    {
+        var task = new UpdateAssemblyInfo();
+
+        using var result = ExecuteMsBuildTaskInAzurePipeline(task);
+
+        result.Success.ShouldBe(true);
+        result.Errors.ShouldBe(0);
+        result.Task.AssemblyInfoTempFilePath.ShouldNotBeNull();
+
+        var fileContent = File.ReadAllText(result.Task.AssemblyInfoTempFilePath);
+        fileContent.ShouldContain(@"[assembly: AssemblyVersion(""1.0.1.0"")]");
+    }
+
+    [Test]
+    [Category(NoNet48)]
+    [Category(NoMono)]
+    public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunWithMsBuild()
+    {
+        const string taskName = nameof(UpdateAssemblyInfo);
+        const string outputProperty = nameof(UpdateAssemblyInfo.AssemblyInfoTempFilePath);
+
+        using var result = ExecuteMsBuildExe(project => AddUpdateAssemblyInfoTask(project, taskName, taskName, outputProperty));
+
+        result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
+        result.MsBuild.Count.ShouldBeGreaterThan(0);
+        result.MsBuild.OverallSuccess.ShouldBe(true);
+        result.MsBuild.ShouldAllBe(x => x.Succeeded);
+        result.Output.ShouldNotBeNullOrWhiteSpace();
+
+        var generatedFilePath = Path.Combine(Path.GetDirectoryName(result.ProjectPath), "AssemblyInfo.g.cs");
+        result.Output.ShouldContain($"{outputProperty}: {generatedFilePath}");
+
+        var fileContent = File.ReadAllText(generatedFilePath);
+        fileContent.ShouldContain(@"[assembly: AssemblyVersion(""1.2.4.0"")]");
+    }
+
+    [Test]
+    [Category(NoNet48)]
+    [Category(NoMono)]
+    public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunWithMsBuildInBuildServer()
+    {
+        const string taskName = nameof(UpdateAssemblyInfo);
+        const string outputProperty = nameof(UpdateAssemblyInfo.AssemblyInfoTempFilePath);
+
+        using var result = ExecuteMsBuildExeInAzurePipeline(project => AddUpdateAssemblyInfoTask(project, taskName, taskName, outputProperty));
+
+        result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
+        result.MsBuild.Count.ShouldBeGreaterThan(0);
+        result.MsBuild.OverallSuccess.ShouldBe(true);
+        result.MsBuild.ShouldAllBe(x => x.Succeeded);
+        result.Output.ShouldNotBeNullOrWhiteSpace();
+
+        var generatedFilePath = Path.Combine(Path.GetDirectoryName(result.ProjectPath), "AssemblyInfo.g.cs");
+        result.Output.ShouldContain($"{outputProperty}: {generatedFilePath}");
+
+        var fileContent = File.ReadAllText(generatedFilePath);
+        fileContent.ShouldContain(@"[assembly: AssemblyVersion(""1.0.1.0"")]");
+    }
+
+    private static void AddUpdateAssemblyInfoTask(ProjectCreator project, string targetToRun, string taskName, string outputProperty)
     {
-        [Test]
-        public void UpdateAssemblyInfoTaskShouldCreateFile()
-        {
-            var task = new UpdateAssemblyInfo();
-
-            using var result = ExecuteMsBuildTask(task);
-
-            result.Success.ShouldBe(true);
-            result.Errors.ShouldBe(0);
-            result.Task.AssemblyInfoTempFilePath.ShouldNotBeNull();
-
-            var fileContent = File.ReadAllText(result.Task.AssemblyInfoTempFilePath);
-            fileContent.ShouldContain(@"[assembly: AssemblyVersion(""1.2.4.0"")]");
-        }
-
-        [Test]
-        public void UpdateAssemblyInfoTaskShouldCreateFileInBuildServer()
-        {
-            var task = new UpdateAssemblyInfo();
-
-            using var result = ExecuteMsBuildTaskInAzurePipeline(task);
-
-            result.Success.ShouldBe(true);
-            result.Errors.ShouldBe(0);
-            result.Task.AssemblyInfoTempFilePath.ShouldNotBeNull();
-
-            var fileContent = File.ReadAllText(result.Task.AssemblyInfoTempFilePath);
-            fileContent.ShouldContain(@"[assembly: AssemblyVersion(""1.0.1.0"")]");
-        }
-
-        [Test]
-        [Category(NoNet48)]
-        [Category(NoMono)]
-        public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunWithMsBuild()
-        {
-            const string taskName = nameof(UpdateAssemblyInfo);
-            const string outputProperty = nameof(UpdateAssemblyInfo.AssemblyInfoTempFilePath);
-
-            using var result = ExecuteMsBuildExe(project => AddUpdateAssemblyInfoTask(project, taskName, taskName, outputProperty));
-
-            result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
-            result.MsBuild.Count.ShouldBeGreaterThan(0);
-            result.MsBuild.OverallSuccess.ShouldBe(true);
-            result.MsBuild.ShouldAllBe(x => x.Succeeded);
-            result.Output.ShouldNotBeNullOrWhiteSpace();
-
-            var generatedFilePath = Path.Combine(Path.GetDirectoryName(result.ProjectPath), "AssemblyInfo.g.cs");
-            result.Output.ShouldContain($"{outputProperty}: {generatedFilePath}");
-
-            var fileContent = File.ReadAllText(generatedFilePath);
-            fileContent.ShouldContain(@"[assembly: AssemblyVersion(""1.2.4.0"")]");
-        }
-
-        [Test]
-        [Category(NoNet48)]
-        [Category(NoMono)]
-        public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunWithMsBuildInBuildServer()
-        {
-            const string taskName = nameof(UpdateAssemblyInfo);
-            const string outputProperty = nameof(UpdateAssemblyInfo.AssemblyInfoTempFilePath);
-
-            using var result = ExecuteMsBuildExeInAzurePipeline(project => AddUpdateAssemblyInfoTask(project, taskName, taskName, outputProperty));
-
-            result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
-            result.MsBuild.Count.ShouldBeGreaterThan(0);
-            result.MsBuild.OverallSuccess.ShouldBe(true);
-            result.MsBuild.ShouldAllBe(x => x.Succeeded);
-            result.Output.ShouldNotBeNullOrWhiteSpace();
-
-            var generatedFilePath = Path.Combine(Path.GetDirectoryName(result.ProjectPath), "AssemblyInfo.g.cs");
-            result.Output.ShouldContain($"{outputProperty}: {generatedFilePath}");
-
-            var fileContent = File.ReadAllText(generatedFilePath);
-            fileContent.ShouldContain(@"[assembly: AssemblyVersion(""1.0.1.0"")]");
-        }
-
-        private static void AddUpdateAssemblyInfoTask(ProjectCreator project, string targetToRun, string taskName, string outputProperty)
-        {
-            var assemblyFileLocation = typeof(GitVersionTaskBase).Assembly.Location;
-            project.UsingTaskAssemblyFile(taskName, assemblyFileLocation)
-                .Property("GenerateAssemblyInfo", "false")
-                .Target(targetToRun, beforeTargets: "CoreCompile;GetAssemblyVersion;GenerateNuspec")
-                    .Task(taskName, parameters: new Dictionary<string, string>
-                    {
-                        { "SolutionDirectory", "$(MSBuildProjectDirectory)" },
-                        { "VersionFile", "$(MSBuildProjectDirectory)/gitversion.json" },
-                        { "ProjectFile", "$(MSBuildProjectFullPath)" },
-                        { "IntermediateOutputPath", "$(MSBuildProjectDirectory)" },
-                        { "Language", "$(Language)" },
-                        { "CompileFiles", "@(Compile)" },
-                    })
-                        .TaskOutputProperty(outputProperty, outputProperty)
-                    .ItemGroup()
-                        .ItemCompile($"$({outputProperty})")
-                        .ItemInclude("FileWrites", $"$({outputProperty})")
-                        .ItemInclude("_GeneratedCodeFiles", $"$({outputProperty})")
-                .Target(MsBuildExeFixture.OutputTarget, dependsOnTargets: targetToRun)
-                    .TaskMessage($"{outputProperty}: $({outputProperty})", MessageImportance.High);
-        }
+        var assemblyFileLocation = typeof(GitVersionTaskBase).Assembly.Location;
+        project.UsingTaskAssemblyFile(taskName, assemblyFileLocation)
+            .Property("GenerateAssemblyInfo", "false")
+            .Target(targetToRun, beforeTargets: "CoreCompile;GetAssemblyVersion;GenerateNuspec")
+            .Task(taskName, parameters: new Dictionary<string, string>
+            {
+                { "SolutionDirectory", "$(MSBuildProjectDirectory)" },
+                { "VersionFile", "$(MSBuildProjectDirectory)/gitversion.json" },
+                { "ProjectFile", "$(MSBuildProjectFullPath)" },
+                { "IntermediateOutputPath", "$(MSBuildProjectDirectory)" },
+                { "Language", "$(Language)" },
+                { "CompileFiles", "@(Compile)" },
+            })
+            .TaskOutputProperty(outputProperty, outputProperty)
+            .ItemGroup()
+            .ItemCompile($"$({outputProperty})")
+            .ItemInclude("FileWrites", $"$({outputProperty})")
+            .ItemInclude("_GeneratedCodeFiles", $"$({outputProperty})")
+            .Target(MsBuildExeFixture.OutputTarget, dependsOnTargets: targetToRun)
+            .TaskMessage($"{outputProperty}: $({outputProperty})", MessageImportance.High);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild.Tests/Tasks/WriteVersionInfoTest.cs b/src/GitVersion.MsBuild.Tests/Tasks/WriteVersionInfoTest.cs
index b330f8ec79..0af1aae6d9 100644
--- a/src/GitVersion.MsBuild.Tests/Tasks/WriteVersionInfoTest.cs
+++ b/src/GitVersion.MsBuild.Tests/Tasks/WriteVersionInfoTest.cs
@@ -5,140 +5,139 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace GitVersion.MsBuild.Tests.Tasks
+namespace GitVersion.MsBuild.Tests.Tasks;
+
+[TestFixture]
+public class WriteVersionInfoTest : TestTaskBase
 {
-    [TestFixture]
-    public class WriteVersionInfoTest : TestTaskBase
-    {
-        protected string GitHubEnvFilePath { get; set; }
+    protected string GitHubEnvFilePath { get; set; }
 
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => GitHubEnvFilePath = System.IO.Path.GetTempFileName();
+    [OneTimeSetUp]
+    public void OneTimeSetUp() => GitHubEnvFilePath = System.IO.Path.GetTempFileName();
 
-        [OneTimeTearDown]
-        public void OneTimeTearDown()
+    [OneTimeTearDown]
+    public void OneTimeTearDown()
+    {
+        if (System.IO.File.Exists(GitHubEnvFilePath))
         {
-            if (System.IO.File.Exists(GitHubEnvFilePath))
-            {
-                System.IO.File.Delete(GitHubEnvFilePath);
-            }
+            System.IO.File.Delete(GitHubEnvFilePath);
         }
+    }
 
-        [Test]
-        public void WriteVersionInfoTaskShouldNotLogOutputVariablesToBuildOutput()
-        {
-            var task = new WriteVersionInfoToBuildLog();
+    [Test]
+    public void WriteVersionInfoTaskShouldNotLogOutputVariablesToBuildOutput()
+    {
+        var task = new WriteVersionInfoToBuildLog();
 
-            using var result = ExecuteMsBuildTask(task);
+        using var result = ExecuteMsBuildTask(task);
 
-            result.Success.ShouldBe(true);
-            result.Errors.ShouldBe(0);
-            result.Log.ShouldNotContain("##vso[task.setvariable variable=GitVersion.FullSemVer]");
-        }
+        result.Success.ShouldBe(true);
+        result.Errors.ShouldBe(0);
+        result.Log.ShouldNotContain("##vso[task.setvariable variable=GitVersion.FullSemVer]");
+    }
 
-        [Test]
-        public void WriteVersionInfoTaskShouldLogOutputVariablesToBuildOutputInAzurePipeline()
-        {
-            var task = new WriteVersionInfoToBuildLog();
+    [Test]
+    public void WriteVersionInfoTaskShouldLogOutputVariablesToBuildOutputInAzurePipeline()
+    {
+        var task = new WriteVersionInfoToBuildLog();
 
-            using var result = ExecuteMsBuildTaskInAzurePipeline(task);
+        using var result = ExecuteMsBuildTaskInAzurePipeline(task);
 
-            result.Success.ShouldBe(true);
-            result.Errors.ShouldBe(0);
-            result.Log.ShouldContain("##vso[task.setvariable variable=GitVersion.FullSemVer]1.0.1+1");
-        }
+        result.Success.ShouldBe(true);
+        result.Errors.ShouldBe(0);
+        result.Log.ShouldContain("##vso[task.setvariable variable=GitVersion.FullSemVer]1.0.1+1");
+    }
 
 
-        [TestCase("2021-02-14.1")]
-        public void WriteVersionInfoTaskShouldNotUpdateBuildNumberInAzurePipeline(string buildNumber)
-        {
-            var task = new WriteVersionInfoToBuildLog();
-            var content = @"update-build-number: false";
+    [TestCase("2021-02-14.1")]
+    public void WriteVersionInfoTaskShouldNotUpdateBuildNumberInAzurePipeline(string buildNumber)
+    {
+        var task = new WriteVersionInfoToBuildLog();
+        var content = @"update-build-number: false";
 
-            using var result = ExecuteMsBuildTaskInAzurePipeline(task, buildNumber: buildNumber, configurationText: content);
+        using var result = ExecuteMsBuildTaskInAzurePipeline(task, buildNumber: buildNumber, configurationText: content);
 
-            result.Success.ShouldBe(true);
-            result.Errors.ShouldBe(0);
-            result.Log.ShouldNotContain($"##vso[build.updatebuildnumber]");
-        }
+        result.Success.ShouldBe(true);
+        result.Errors.ShouldBe(0);
+        result.Log.ShouldNotContain($"##vso[build.updatebuildnumber]");
+    }
 
 
-        [TestCase("2021-02-14.1-$(GITVERSION.FullSemVer)", "2021-02-14.1-1.0.1+1", Ignore = "#2552 - GitVersion.MsBuild does not set Azure DevOps build number")]
-        [TestCase("2021-02-14.1-$(GITVERSION.SemVer)", "2021-02-14.1-1.0.1", Ignore = "#2552 - GitVersion.MsBuild does not set Azure DevOps build number")]
-        [TestCase("2021-02-14.1-$(GITVERSION.minor)", "2021-02-14.1-0", Ignore = "#2552 - GitVersion.MsBuild does not set Azure DevOps build number")]
-        [TestCase("2021-02-14.1-$(GITVERSION_MAJOR)", "2021-02-14.1-1", Ignore = "#2552 - GitVersion.MsBuild does not set Azure DevOps build number")]
-        [TestCase("2021-02-14.1", "1.0.1+1", Ignore = "#2552 - GitVersion.MsBuild does not set Azure DevOps build number")]
-        public void WriteVersionInfoTaskShouldUpdateBuildNumberInAzurePipeline(string buildNumber, string expected)
-        {
-            var task = new WriteVersionInfoToBuildLog();
+    [TestCase("2021-02-14.1-$(GITVERSION.FullSemVer)", "2021-02-14.1-1.0.1+1", Ignore = "#2552 - GitVersion.MsBuild does not set Azure DevOps build number")]
+    [TestCase("2021-02-14.1-$(GITVERSION.SemVer)", "2021-02-14.1-1.0.1", Ignore = "#2552 - GitVersion.MsBuild does not set Azure DevOps build number")]
+    [TestCase("2021-02-14.1-$(GITVERSION.minor)", "2021-02-14.1-0", Ignore = "#2552 - GitVersion.MsBuild does not set Azure DevOps build number")]
+    [TestCase("2021-02-14.1-$(GITVERSION_MAJOR)", "2021-02-14.1-1", Ignore = "#2552 - GitVersion.MsBuild does not set Azure DevOps build number")]
+    [TestCase("2021-02-14.1", "1.0.1+1", Ignore = "#2552 - GitVersion.MsBuild does not set Azure DevOps build number")]
+    public void WriteVersionInfoTaskShouldUpdateBuildNumberInAzurePipeline(string buildNumber, string expected)
+    {
+        var task = new WriteVersionInfoToBuildLog();
 
-            using var result = ExecuteMsBuildTaskInAzurePipeline(task, buildNumber);
+        using var result = ExecuteMsBuildTaskInAzurePipeline(task, buildNumber);
 
-            result.Success.ShouldBe(true);
-            result.Errors.ShouldBe(0);
-            result.Log.ShouldContain($"##vso[build.updatebuildnumber]{expected}");
-        }
+        result.Success.ShouldBe(true);
+        result.Errors.ShouldBe(0);
+        result.Log.ShouldContain($"##vso[build.updatebuildnumber]{expected}");
+    }
 
 
-        [Test]
-        public void WriteVersionInfoTaskShouldLogOutputVariablesToBuildOutputInGitHubActions()
-        {
-            var task = new WriteVersionInfoToBuildLog();
+    [Test]
+    public void WriteVersionInfoTaskShouldLogOutputVariablesToBuildOutputInGitHubActions()
+    {
+        var task = new WriteVersionInfoToBuildLog();
 
-            using var result = ExecuteMsBuildTaskInGitHubActions(task, GitHubEnvFilePath);
+        using var result = ExecuteMsBuildTaskInGitHubActions(task, GitHubEnvFilePath);
 
-            result.Success.ShouldBe(true);
-            result.Errors.ShouldBe(0);
-            string content = System.IO.File.ReadAllText(GitHubEnvFilePath);
-            content.ShouldContain("GitVersion_SemVer=1.0.1");
-        }
+        result.Success.ShouldBe(true);
+        result.Errors.ShouldBe(0);
+        string content = System.IO.File.ReadAllText(GitHubEnvFilePath);
+        content.ShouldContain("GitVersion_SemVer=1.0.1");
+    }
 
-        [Test]
-        [Category(NoNet48)]
-        [Category(NoMono)]
-        public void WriteVersionInfoTaskShouldNotLogOutputVariablesToBuildOutputWhenRunWithMsBuild()
-        {
-            const string taskName = nameof(WriteVersionInfoToBuildLog);
+    [Test]
+    [Category(NoNet48)]
+    [Category(NoMono)]
+    public void WriteVersionInfoTaskShouldNotLogOutputVariablesToBuildOutputWhenRunWithMsBuild()
+    {
+        const string taskName = nameof(WriteVersionInfoToBuildLog);
 
-            using var result = ExecuteMsBuildExe(project => AddWriteVersionInfoToBuildLogTask(project, taskName, taskName));
+        using var result = ExecuteMsBuildExe(project => AddWriteVersionInfoToBuildLogTask(project, taskName, taskName));
 
-            result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
-            result.MsBuild.Count.ShouldBeGreaterThan(0);
-            result.MsBuild.OverallSuccess.ShouldBe(true);
-            result.MsBuild.ShouldAllBe(x => x.Succeeded);
-            result.Output.ShouldNotBeNullOrWhiteSpace();
-            result.Output.ShouldNotContain("##vso[task.setvariable variable=GitVersion.FullSemVer]");
-        }
+        result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
+        result.MsBuild.Count.ShouldBeGreaterThan(0);
+        result.MsBuild.OverallSuccess.ShouldBe(true);
+        result.MsBuild.ShouldAllBe(x => x.Succeeded);
+        result.Output.ShouldNotBeNullOrWhiteSpace();
+        result.Output.ShouldNotContain("##vso[task.setvariable variable=GitVersion.FullSemVer]");
+    }
 
-        [Test]
-        [Category(NoNet48)]
-        [Category(NoMono)]
-        public void WriteVersionInfoTaskShouldLogOutputVariablesToBuildOutputWhenRunWithMsBuildInAzurePipeline()
-        {
-            const string taskName = nameof(WriteVersionInfoToBuildLog);
+    [Test]
+    [Category(NoNet48)]
+    [Category(NoMono)]
+    public void WriteVersionInfoTaskShouldLogOutputVariablesToBuildOutputWhenRunWithMsBuildInAzurePipeline()
+    {
+        const string taskName = nameof(WriteVersionInfoToBuildLog);
 
-            using var result = ExecuteMsBuildExeInAzurePipeline(project => AddWriteVersionInfoToBuildLogTask(project, taskName, taskName));
+        using var result = ExecuteMsBuildExeInAzurePipeline(project => AddWriteVersionInfoToBuildLogTask(project, taskName, taskName));
 
-            result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
-            result.MsBuild.Count.ShouldBeGreaterThan(0);
-            result.MsBuild.OverallSuccess.ShouldBe(true);
-            result.MsBuild.ShouldAllBe(x => x.Succeeded);
-            result.Output.ShouldNotBeNullOrWhiteSpace();
-            result.Output.ShouldContain("##vso[task.setvariable variable=GitVersion.FullSemVer]1.0.1+1");
-        }
+        result.ProjectPath.ShouldNotBeNullOrWhiteSpace();
+        result.MsBuild.Count.ShouldBeGreaterThan(0);
+        result.MsBuild.OverallSuccess.ShouldBe(true);
+        result.MsBuild.ShouldAllBe(x => x.Succeeded);
+        result.Output.ShouldNotBeNullOrWhiteSpace();
+        result.Output.ShouldContain("##vso[task.setvariable variable=GitVersion.FullSemVer]1.0.1+1");
+    }
 
-        private static void AddWriteVersionInfoToBuildLogTask(ProjectCreator project, string targetToRun, string taskName)
-        {
-            var assemblyFileLocation = typeof(GitVersionTaskBase).Assembly.Location;
-            project.UsingTaskAssemblyFile(taskName, assemblyFileLocation)
-                .Property("GenerateAssemblyInfo", "false")
-                .Target(targetToRun, beforeTargets: "CoreCompile;GetAssemblyVersion;GenerateNuspec")
-                .Task(taskName, parameters: new Dictionary<string, string>
-                {
-                    { "SolutionDirectory", "$(MSBuildProjectDirectory)" },
-                    { "VersionFile", "$(MSBuildProjectDirectory)/gitversion.json" }
-                })
-                .Target(MsBuildExeFixture.OutputTarget, dependsOnTargets: targetToRun);
-        }
+    private static void AddWriteVersionInfoToBuildLogTask(ProjectCreator project, string targetToRun, string taskName)
+    {
+        var assemblyFileLocation = typeof(GitVersionTaskBase).Assembly.Location;
+        project.UsingTaskAssemblyFile(taskName, assemblyFileLocation)
+            .Property("GenerateAssemblyInfo", "false")
+            .Target(targetToRun, beforeTargets: "CoreCompile;GetAssemblyVersion;GenerateNuspec")
+            .Task(taskName, parameters: new Dictionary<string, string>
+            {
+                { "SolutionDirectory", "$(MSBuildProjectDirectory)" },
+                { "VersionFile", "$(MSBuildProjectDirectory)/gitversion.json" }
+            })
+            .Target(MsBuildExeFixture.OutputTarget, dependsOnTargets: targetToRun);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild/GitVersionTaskBase.cs b/src/GitVersion.MsBuild/GitVersionTaskBase.cs
index bcd401e61b..36361497c6 100644
--- a/src/GitVersion.MsBuild/GitVersionTaskBase.cs
+++ b/src/GitVersion.MsBuild/GitVersionTaskBase.cs
@@ -1,24 +1,23 @@
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
-namespace GitVersion.MsBuild
+namespace GitVersion.MsBuild;
+
+public abstract class GitVersionTaskBase : ITask
 {
-    public abstract class GitVersionTaskBase : ITask
-    {
-        public IBuildEngine BuildEngine { get; set; }
-        public ITaskHost HostObject { get; set; }
+    public IBuildEngine BuildEngine { get; set; }
+    public ITaskHost HostObject { get; set; }
 
-        protected GitVersionTaskBase() => Log = new TaskLoggingHelper(this);
+    protected GitVersionTaskBase() => Log = new TaskLoggingHelper(this);
 
-        [Required]
-        public string SolutionDirectory { get; set; }
+    [Required]
+    public string SolutionDirectory { get; set; }
 
-        public string VersionFile { get; set; }
+    public string VersionFile { get; set; }
 
-        public TaskLoggingHelper Log { get; }
+    public TaskLoggingHelper Log { get; }
 
-        public bool Execute() => OnExecute();
+    public bool Execute() => OnExecute();
 
-        protected abstract bool OnExecute();
-    }
-}
+    protected abstract bool OnExecute();
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs b/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs
index 6ef2f82551..0889dbb390 100644
--- a/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs
+++ b/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs
@@ -5,67 +5,66 @@
 using GitVersion.OutputVariables;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion.MsBuild
+namespace GitVersion.MsBuild;
+
+public class GitVersionTaskExecutor : IGitVersionTaskExecutor
 {
-    public class GitVersionTaskExecutor : IGitVersionTaskExecutor
-    {
-        private readonly IFileSystem fileSystem;
-        private readonly ILog log;
-        private readonly IGitVersionOutputTool gitVersionOutputTool;
-        private readonly IOptions<GitVersionOptions> options;
+    private readonly IFileSystem fileSystem;
+    private readonly ILog log;
+    private readonly IGitVersionOutputTool gitVersionOutputTool;
+    private readonly IOptions<GitVersionOptions> options;
 
-        public GitVersionTaskExecutor(IFileSystem fileSystem, IGitVersionOutputTool gitVersionOutputTool, IOptions<GitVersionOptions> options, ILog log)
-        {
-            this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
-            this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.gitVersionOutputTool = gitVersionOutputTool ?? throw new ArgumentNullException(nameof(gitVersionOutputTool));
-            this.options = options ?? throw new ArgumentNullException(nameof(options));
-        }
+    public GitVersionTaskExecutor(IFileSystem fileSystem, IGitVersionOutputTool gitVersionOutputTool, IOptions<GitVersionOptions> options, ILog log)
+    {
+        this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
+        this.log = log ?? throw new ArgumentNullException(nameof(log));
+        this.gitVersionOutputTool = gitVersionOutputTool ?? throw new ArgumentNullException(nameof(gitVersionOutputTool));
+        this.options = options ?? throw new ArgumentNullException(nameof(options));
+    }
 
-        public void GetVersion(GetVersion task)
+    public void GetVersion(GetVersion task)
+    {
+        var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
+        var outputType = typeof(GetVersion);
+        foreach (var variable in versionVariables)
         {
-            var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
-            var outputType = typeof(GetVersion);
-            foreach (var variable in versionVariables)
-            {
-                outputType.GetProperty(variable.Key)?.SetValue(task, variable.Value, null);
-            }
+            outputType.GetProperty(variable.Key)?.SetValue(task, variable.Value, null);
         }
+    }
 
-        public void UpdateAssemblyInfo(UpdateAssemblyInfo task)
-        {
-            var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
-            FileHelper.DeleteTempFiles();
-            if (task.CompileFiles != null) FileHelper.CheckForInvalidFiles(task.CompileFiles, task.ProjectFile);
+    public void UpdateAssemblyInfo(UpdateAssemblyInfo task)
+    {
+        var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
+        FileHelper.DeleteTempFiles();
+        if (task.CompileFiles != null) FileHelper.CheckForInvalidFiles(task.CompileFiles, task.ProjectFile);
 
-            var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "AssemblyInfo");
-            task.AssemblyInfoTempFilePath = Path.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);
+        var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "AssemblyInfo");
+        task.AssemblyInfoTempFilePath = Path.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);
 
-            var gitVersionOptions = this.options.Value;
-            gitVersionOptions.AssemblyInfo.UpdateAssemblyInfo = true;
-            gitVersionOptions.AssemblyInfo.EnsureAssemblyInfo = true;
-            gitVersionOptions.WorkingDirectory = fileWriteInfo.WorkingDirectory;
-            gitVersionOptions.AssemblyInfo.Files.Add(fileWriteInfo.FileName);
+        var gitVersionOptions = this.options.Value;
+        gitVersionOptions.AssemblyInfo.UpdateAssemblyInfo = true;
+        gitVersionOptions.AssemblyInfo.EnsureAssemblyInfo = true;
+        gitVersionOptions.WorkingDirectory = fileWriteInfo.WorkingDirectory;
+        gitVersionOptions.AssemblyInfo.Files.Add(fileWriteInfo.FileName);
 
-            gitVersionOutputTool.UpdateAssemblyInfo(versionVariables);
-        }
+        gitVersionOutputTool.UpdateAssemblyInfo(versionVariables);
+    }
 
-        public void GenerateGitVersionInformation(GenerateGitVersionInformation task)
-        {
-            var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
-            var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "GitVersionInformation");
-            task.GitVersionInformationFilePath = Path.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);
+    public void GenerateGitVersionInformation(GenerateGitVersionInformation task)
+    {
+        var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
+        var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "GitVersionInformation");
+        task.GitVersionInformationFilePath = Path.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);
 
-            var gitVersionOptions = this.options.Value;
-            gitVersionOptions.WorkingDirectory = fileWriteInfo.WorkingDirectory;
+        var gitVersionOptions = this.options.Value;
+        gitVersionOptions.WorkingDirectory = fileWriteInfo.WorkingDirectory;
 
-            gitVersionOutputTool.GenerateGitVersionInformation(versionVariables, fileWriteInfo);
-        }
+        gitVersionOutputTool.GenerateGitVersionInformation(versionVariables, fileWriteInfo);
+    }
 
-        public void WriteVersionInfoToBuildLog(WriteVersionInfoToBuildLog task)
-        {
-            var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
-            gitVersionOutputTool.OutputVariables(versionVariables, false);
-        }
+    public void WriteVersionInfoToBuildLog(WriteVersionInfoToBuildLog task)
+    {
+        var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
+        gitVersionOutputTool.OutputVariables(versionVariables, false);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild/GitVersionTaskModule.cs b/src/GitVersion.MsBuild/GitVersionTaskModule.cs
index 362f08bdc8..ea6a8011c7 100644
--- a/src/GitVersion.MsBuild/GitVersionTaskModule.cs
+++ b/src/GitVersion.MsBuild/GitVersionTaskModule.cs
@@ -7,29 +7,28 @@
 using GitVersion.VersionConverters.WixUpdater;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GitVersion.MsBuild
+namespace GitVersion.MsBuild;
+
+public class GitVersionTaskModule : IGitVersionModule
 {
-    public class GitVersionTaskModule : IGitVersionModule
+    public void RegisterTypes(IServiceCollection services)
     {
-        public void RegisterTypes(IServiceCollection services)
-        {
-            services.AddSingleton<ILog, Log>();
-            services.AddSingleton<IFileSystem, FileSystem>();
-            services.AddSingleton<IEnvironment, Environment>();
-            services.AddSingleton<IConsole, ConsoleAdapter>();
+        services.AddSingleton<ILog, Log>();
+        services.AddSingleton<IFileSystem, FileSystem>();
+        services.AddSingleton<IEnvironment, Environment>();
+        services.AddSingleton<IConsole, ConsoleAdapter>();
 
-            services.AddSingleton<IGitVersionTaskExecutor, GitVersionTaskExecutor>();
+        services.AddSingleton<IGitVersionTaskExecutor, GitVersionTaskExecutor>();
 
-            services.AddSingleton<IGitVersionOutputTool, GitVersionOutputTool>();
-            services.AddSingleton<IOutputGenerator, OutputGenerator>();
-            services.AddSingleton<IGitVersionInfoGenerator, GitVersionInfoGenerator>();
-            services.AddSingleton<IWixVersionFileUpdater, WixVersionFileUpdater>();
-            services.AddSingleton<IAssemblyInfoFileUpdater, AssemblyInfoFileUpdater>();
-            services.AddSingleton<IProjectFileUpdater, ProjectFileUpdater>();
+        services.AddSingleton<IGitVersionOutputTool, GitVersionOutputTool>();
+        services.AddSingleton<IOutputGenerator, OutputGenerator>();
+        services.AddSingleton<IGitVersionInfoGenerator, GitVersionInfoGenerator>();
+        services.AddSingleton<IWixVersionFileUpdater, WixVersionFileUpdater>();
+        services.AddSingleton<IAssemblyInfoFileUpdater, AssemblyInfoFileUpdater>();
+        services.AddSingleton<IProjectFileUpdater, ProjectFileUpdater>();
 
-            services.AddSingleton<IBuildAgentResolver, BuildAgentResolver>();
-            services.AddModule(new BuildServerModule());
-            services.AddSingleton(sp => sp.GetService<IBuildAgentResolver>()?.Resolve());
-        }
+        services.AddSingleton<IBuildAgentResolver, BuildAgentResolver>();
+        services.AddModule(new BuildServerModule());
+        services.AddSingleton(sp => sp.GetService<IBuildAgentResolver>()?.Resolve());
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild/GitVersionTasks.cs b/src/GitVersion.MsBuild/GitVersionTasks.cs
index 9ff564a054..497ca4790a 100644
--- a/src/GitVersion.MsBuild/GitVersionTasks.cs
+++ b/src/GitVersion.MsBuild/GitVersionTasks.cs
@@ -7,78 +7,77 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
-namespace GitVersion.MsBuild
+namespace GitVersion.MsBuild;
+
+public static class GitVersionTasks
 {
-    public static class GitVersionTasks
-    {
-        public static bool GetVersion(GetVersion task) => ExecuteGitVersionTask(task, executor => executor.GetVersion(task));
+    public static bool GetVersion(GetVersion task) => ExecuteGitVersionTask(task, executor => executor.GetVersion(task));
 
-        public static bool UpdateAssemblyInfo(UpdateAssemblyInfo task) => ExecuteGitVersionTask(task, executor => executor.UpdateAssemblyInfo(task));
+    public static bool UpdateAssemblyInfo(UpdateAssemblyInfo task) => ExecuteGitVersionTask(task, executor => executor.UpdateAssemblyInfo(task));
 
-        public static bool GenerateGitVersionInformation(GenerateGitVersionInformation task) => ExecuteGitVersionTask(task, executor => executor.GenerateGitVersionInformation(task));
+    public static bool GenerateGitVersionInformation(GenerateGitVersionInformation task) => ExecuteGitVersionTask(task, executor => executor.GenerateGitVersionInformation(task));
 
-        public static bool WriteVersionInfoToBuildLog(WriteVersionInfoToBuildLog task) => ExecuteGitVersionTask(task, executor => executor.WriteVersionInfoToBuildLog(task));
+    public static bool WriteVersionInfoToBuildLog(WriteVersionInfoToBuildLog task) => ExecuteGitVersionTask(task, executor => executor.WriteVersionInfoToBuildLog(task));
 
-        private static bool ExecuteGitVersionTask<T>(T task, Action<IGitVersionTaskExecutor> action)
-            where T : GitVersionTaskBase
+    private static bool ExecuteGitVersionTask<T>(T task, Action<IGitVersionTaskExecutor> action)
+        where T : GitVersionTaskBase
+    {
+        var taskLog = task.Log;
+        try
         {
-            var taskLog = task.Log;
-            try
-            {
-                var sp = BuildServiceProvider(task);
-                var gitVersionTaskExecutor = sp.GetService<IGitVersionTaskExecutor>();
-
-                action(gitVersionTaskExecutor);
-            }
-            catch (WarningException errorException)
-            {
-                taskLog.LogWarningFromException(errorException);
-                return true;
-            }
-            catch (Exception exception)
-            {
-                taskLog.LogErrorFromException(exception, showStackTrace: true, showDetail: true, null);
-                return false;
-            }
-
-            return !taskLog.HasLoggedErrors;
-        }
+            var sp = BuildServiceProvider(task);
+            var gitVersionTaskExecutor = sp.GetService<IGitVersionTaskExecutor>();
 
-        private static void Configure(IServiceProvider sp, GitVersionTaskBase task)
+            action(gitVersionTaskExecutor);
+        }
+        catch (WarningException errorException)
         {
-            var log = sp.GetService<ILog>();
-            var buildAgent = sp.GetService<ICurrentBuildAgent>();
-            var gitVersionOptions = sp.GetService<IOptions<GitVersionOptions>>()?.Value;
+            taskLog.LogWarningFromException(errorException);
+            return true;
+        }
+        catch (Exception exception)
+        {
+            taskLog.LogErrorFromException(exception, showStackTrace: true, showDetail: true, null);
+            return false;
+        }
 
-            log.AddLogAppender(new MsBuildAppender(task.Log));
+        return !taskLog.HasLoggedErrors;
+    }
 
-            if (buildAgent != null)
-            {
-                gitVersionOptions.Output.Add(OutputType.BuildServer);
-            }
-            gitVersionOptions.Settings.NoFetch = gitVersionOptions.Settings.NoFetch || buildAgent != null && buildAgent.PreventFetch();
-        }
+    private static void Configure(IServiceProvider sp, GitVersionTaskBase task)
+    {
+        var log = sp.GetService<ILog>();
+        var buildAgent = sp.GetService<ICurrentBuildAgent>();
+        var gitVersionOptions = sp.GetService<IOptions<GitVersionOptions>>()?.Value;
+
+        log.AddLogAppender(new MsBuildAppender(task.Log));
 
-        private static IServiceProvider BuildServiceProvider(GitVersionTaskBase task)
+        if (buildAgent != null)
         {
-            var services = new ServiceCollection();
+            gitVersionOptions.Output.Add(OutputType.BuildServer);
+        }
+        gitVersionOptions.Settings.NoFetch = gitVersionOptions.Settings.NoFetch || buildAgent != null && buildAgent.PreventFetch();
+    }
 
-            var gitVersionOptions = new GitVersionOptions
-            {
-                WorkingDirectory = task.SolutionDirectory,
-            };
+    private static IServiceProvider BuildServiceProvider(GitVersionTaskBase task)
+    {
+        var services = new ServiceCollection();
 
-            gitVersionOptions.Output.Add(OutputType.BuildServer);
+        var gitVersionOptions = new GitVersionOptions
+        {
+            WorkingDirectory = task.SolutionDirectory,
+        };
 
-            services.AddSingleton(Options.Create(gitVersionOptions));
-            services.AddModule(new GitVersionTaskModule());
+        gitVersionOptions.Output.Add(OutputType.BuildServer);
 
-            services.AddSingleton<IConsole>(new MsBuildAdapter(task.Log));
+        services.AddSingleton(Options.Create(gitVersionOptions));
+        services.AddModule(new GitVersionTaskModule());
 
-            var sp = services.BuildServiceProvider();
-            Configure(sp, task);
+        services.AddSingleton<IConsole>(new MsBuildAdapter(task.Log));
 
-            return sp;
-        }
+        var sp = services.BuildServiceProvider();
+        Configure(sp, task);
+
+        return sp;
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild/Helpers/FileHelper.cs b/src/GitVersion.MsBuild/Helpers/FileHelper.cs
index f85034d251..087ef7cce5 100644
--- a/src/GitVersion.MsBuild/Helpers/FileHelper.cs
+++ b/src/GitVersion.MsBuild/Helpers/FileHelper.cs
@@ -5,94 +5,94 @@
 using System.Text.RegularExpressions;
 using Microsoft.Build.Framework;
 
-namespace GitVersion.MsBuild
+namespace GitVersion.MsBuild;
+
+public static class FileHelper
 {
-    public static class FileHelper
+    private static readonly Dictionary<string, Func<string, string, bool>> VersionAttributeFinders = new()
     {
-        private static readonly Dictionary<string, Func<string, string, bool>> VersionAttributeFinders = new()
-        {
-            { ".cs", CSharpFileContainsVersionAttribute },
-            { ".vb", VisualBasicFileContainsVersionAttribute }
-        };
+        { ".cs", CSharpFileContainsVersionAttribute },
+        { ".vb", VisualBasicFileContainsVersionAttribute }
+    };
+
+    public static readonly string TempPath = MakeAndGetTempPath();
 
-        public static readonly string TempPath = MakeAndGetTempPath();
+    private static string MakeAndGetTempPath()
+    {
+        var tempPath = Path.Combine(Path.GetTempPath(), "GitVersionTask");
+        Directory.CreateDirectory(tempPath);
+        return tempPath;
+    }
 
-        private static string MakeAndGetTempPath()
+    public static void DeleteTempFiles()
+    {
+        if (!Directory.Exists(TempPath))
         {
-            var tempPath = Path.Combine(Path.GetTempPath(), "GitVersionTask");
-            Directory.CreateDirectory(tempPath);
-            return tempPath;
+            return;
         }
 
-        public static void DeleteTempFiles()
+        foreach (var file in Directory.GetFiles(TempPath))
         {
-            if (!Directory.Exists(TempPath))
+            if (File.GetLastWriteTime(file) < DateTime.Now.AddDays(-1))
             {
-                return;
-            }
-
-            foreach (var file in Directory.GetFiles(TempPath))
-            {
-                if (File.GetLastWriteTime(file) < DateTime.Now.AddDays(-1))
+                try
+                {
+                    File.Delete(file);
+                }
+                catch (UnauthorizedAccessException)
                 {
-                    try
-                    {
-                        File.Delete(file);
-                    }
-                    catch (UnauthorizedAccessException)
-                    {
-                        //ignore contention
-                    }
+                    //ignore contention
                 }
             }
         }
+    }
 
-        public static string GetFileExtension(string language) => language switch
-        {
-            "C#" => "cs",
-            "F#" => "fs",
-            "VB" => "vb",
-            _ => throw new ArgumentException($"Unknown language detected: '{language}'")
-        };
+    public static string GetFileExtension(string language) => language switch
+    {
+        "C#" => "cs",
+        "F#" => "fs",
+        "VB" => "vb",
+        _ => throw new ArgumentException($"Unknown language detected: '{language}'")
+    };
 
-        public static void CheckForInvalidFiles(IEnumerable<ITaskItem> compileFiles, string projectFile)
+    public static void CheckForInvalidFiles(IEnumerable<ITaskItem> compileFiles, string projectFile)
+    {
+        if (GetInvalidFiles(compileFiles, projectFile).FirstOrDefault() is { } invalidCompileFile)
         {
-            if (GetInvalidFiles(compileFiles, projectFile).FirstOrDefault() is { } invalidCompileFile)
-            {
-                throw new WarningException("File contains assembly version attributes which conflict with the attributes generated by GitVersion " + invalidCompileFile);
-            }
+            throw new WarningException("File contains assembly version attributes which conflict with the attributes generated by GitVersion " + invalidCompileFile);
         }
+    }
 
-        private static bool FileContainsVersionAttribute(string compileFile, string projectFile)
-        {
-            var compileFileExtension = Path.GetExtension(compileFile);
-
-            if (VersionAttributeFinders.TryGetValue(compileFileExtension, out var languageSpecificFileContainsVersionAttribute))
-            {
-                return languageSpecificFileContainsVersionAttribute(compileFile, projectFile);
-            }
+    private static bool FileContainsVersionAttribute(string compileFile, string projectFile)
+    {
+        var compileFileExtension = Path.GetExtension(compileFile);
 
-            throw new WarningException("File with name containing AssemblyInfo could not be checked for assembly version attributes which conflict with the attributes generated by GitVersion " + compileFile);
+        if (VersionAttributeFinders.TryGetValue(compileFileExtension, out var languageSpecificFileContainsVersionAttribute))
+        {
+            return languageSpecificFileContainsVersionAttribute(compileFile, projectFile);
         }
 
-        private static bool CSharpFileContainsVersionAttribute(string compileFile, string projectFile)
-        {
-            var combine = Path.Combine(Path.GetDirectoryName(projectFile), compileFile);
-            var allText = File.ReadAllText(combine);
+        throw new WarningException("File with name containing AssemblyInfo could not be checked for assembly version attributes which conflict with the attributes generated by GitVersion " + compileFile);
+    }
+
+    private static bool CSharpFileContainsVersionAttribute(string compileFile, string projectFile)
+    {
+        var combine = Path.Combine(Path.GetDirectoryName(projectFile), compileFile);
+        var allText = File.ReadAllText(combine);
 
-            allText += System.Environment.NewLine; // Always add a new line, this handles the case for when a file ends with the EOF marker and no new line. If you don't have this newline, the regex will match commented out Assembly*Version tags on the last line.
+        allText += System.Environment.NewLine; // Always add a new line, this handles the case for when a file ends with the EOF marker and no new line. If you don't have this newline, the regex will match commented out Assembly*Version tags on the last line.
 
-            var blockComments = @"/\*(.*?)\*/";
-            var lineComments = @"//(.*?)\r?\n";
-            var strings = @"""((\\[^\n]|[^""\n])*)""";
-            var verbatimStrings = @"@(""[^""]*"")+";
+        var blockComments = @"/\*(.*?)\*/";
+        var lineComments = @"//(.*?)\r?\n";
+        var strings = @"""((\\[^\n]|[^""\n])*)""";
+        var verbatimStrings = @"@(""[^""]*"")+";
 
-            var noCommentsOrStrings = Regex.Replace(allText,
-                blockComments + "|" + lineComments + "|" + strings + "|" + verbatimStrings,
-                me => me.Value.StartsWith("//") ? System.Environment.NewLine : string.Empty,
-                RegexOptions.Singleline);
+        var noCommentsOrStrings = Regex.Replace(allText,
+            blockComments + "|" + lineComments + "|" + strings + "|" + verbatimStrings,
+            me => me.Value.StartsWith("//") ? System.Environment.NewLine : string.Empty,
+            RegexOptions.Singleline);
 
-            return Regex.IsMatch(noCommentsOrStrings, @"(?x) # IgnorePatternWhitespace
+        return Regex.IsMatch(noCommentsOrStrings, @"(?x) # IgnorePatternWhitespace
 
 \[\s*assembly\s*:\s*                    # The [assembly: part
 
@@ -101,24 +101,24 @@ private static bool CSharpFileContainsVersionAttribute(string compileFile, strin
 Assembly(File|Informational)?Version    # The attribute AssemblyVersion, AssemblyFileVersion, or AssemblyInformationalVersion
 
 \s*\(\s*\)\s*\]                         # End brackets ()]");
-        }
+    }
 
-        private static bool VisualBasicFileContainsVersionAttribute(string compileFile, string projectFile)
-        {
-            var combine = Path.Combine(Path.GetDirectoryName(projectFile), compileFile);
-            var allText = File.ReadAllText(combine);
+    private static bool VisualBasicFileContainsVersionAttribute(string compileFile, string projectFile)
+    {
+        var combine = Path.Combine(Path.GetDirectoryName(projectFile), compileFile);
+        var allText = File.ReadAllText(combine);
 
-            allText += System.Environment.NewLine; // Always add a new line, this handles the case for when a file ends with the EOF marker and no new line. If you don't have this newline, the regex will match commented out Assembly*Version tags on the last line.
+        allText += System.Environment.NewLine; // Always add a new line, this handles the case for when a file ends with the EOF marker and no new line. If you don't have this newline, the regex will match commented out Assembly*Version tags on the last line.
 
-            var lineComments = @"'(.*?)\r?\n";
-            var strings = @"""((\\[^\n]|[^""\n])*)""";
+        var lineComments = @"'(.*?)\r?\n";
+        var strings = @"""((\\[^\n]|[^""\n])*)""";
 
-            var noCommentsOrStrings = Regex.Replace(allText,
-                lineComments + "|" + strings,
-                me => me.Value.StartsWith("'") ? System.Environment.NewLine : string.Empty,
-                RegexOptions.Singleline);
+        var noCommentsOrStrings = Regex.Replace(allText,
+            lineComments + "|" + strings,
+            me => me.Value.StartsWith("'") ? System.Environment.NewLine : string.Empty,
+            RegexOptions.Singleline);
 
-            return Regex.IsMatch(noCommentsOrStrings, @"(?x) # IgnorePatternWhitespace
+        return Regex.IsMatch(noCommentsOrStrings, @"(?x) # IgnorePatternWhitespace
 
 \<\s*Assembly\s*:\s*                    # The <Assembly: part
 
@@ -127,28 +127,27 @@ private static bool VisualBasicFileContainsVersionAttribute(string compileFile,
 Assembly(File|Informational)?Version    # The attribute AssemblyVersion, AssemblyFileVersion, or AssemblyInformationalVersion
 
 \s*\(\s*\)\s*\>                         # End brackets ()>");
-        }
+    }
 
-        private static IEnumerable<string> GetInvalidFiles(IEnumerable<ITaskItem> compileFiles, string projectFile) => compileFiles.Select(x => x.ItemSpec)
-                .Where(compileFile => compileFile.Contains("AssemblyInfo"))
-                .Where(s => FileContainsVersionAttribute(s, projectFile));
+    private static IEnumerable<string> GetInvalidFiles(IEnumerable<ITaskItem> compileFiles, string projectFile) => compileFiles.Select(x => x.ItemSpec)
+        .Where(compileFile => compileFile.Contains("AssemblyInfo"))
+        .Where(s => FileContainsVersionAttribute(s, projectFile));
 
-        public static FileWriteInfo GetFileWriteInfo(this string intermediateOutputPath, string language, string projectFile, string outputFileName)
-        {
-            var fileExtension = GetFileExtension(language);
-            string workingDirectory, fileName;
+    public static FileWriteInfo GetFileWriteInfo(this string intermediateOutputPath, string language, string projectFile, string outputFileName)
+    {
+        var fileExtension = GetFileExtension(language);
+        string workingDirectory, fileName;
 
-            if (intermediateOutputPath == null)
-            {
-                fileName = $"{outputFileName}_{Path.GetFileNameWithoutExtension(projectFile)}_{Path.GetRandomFileName()}.g.{fileExtension}";
-                workingDirectory = TempPath;
-            }
-            else
-            {
-                fileName = $"{outputFileName}.g.{fileExtension}";
-                workingDirectory = intermediateOutputPath;
-            }
-            return new FileWriteInfo(workingDirectory, fileName, fileExtension);
+        if (intermediateOutputPath == null)
+        {
+            fileName = $"{outputFileName}_{Path.GetFileNameWithoutExtension(projectFile)}_{Path.GetRandomFileName()}.g.{fileExtension}";
+            workingDirectory = TempPath;
+        }
+        else
+        {
+            fileName = $"{outputFileName}.g.{fileExtension}";
+            workingDirectory = intermediateOutputPath;
         }
+        return new FileWriteInfo(workingDirectory, fileName, fileExtension);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild/Helpers/MsBuildAdapter.cs b/src/GitVersion.MsBuild/Helpers/MsBuildAdapter.cs
index 2eec2cf9ba..a0ba18b43c 100644
--- a/src/GitVersion.MsBuild/Helpers/MsBuildAdapter.cs
+++ b/src/GitVersion.MsBuild/Helpers/MsBuildAdapter.cs
@@ -2,32 +2,31 @@
 using GitVersion.Logging;
 using Microsoft.Build.Utilities;
 
-namespace GitVersion.MsBuild
+namespace GitVersion.MsBuild;
+
+internal class MsBuildAdapter : IConsole
 {
-    internal class MsBuildAdapter : IConsole
-    {
-        private readonly TaskLoggingHelper taskLog;
+    private readonly TaskLoggingHelper taskLog;
 
-        public MsBuildAdapter(TaskLoggingHelper taskLog) => this.taskLog = taskLog;
+    public MsBuildAdapter(TaskLoggingHelper taskLog) => this.taskLog = taskLog;
 
-        public void WriteLine(string msg)
-        {
-            Write(msg);
-            WriteLine();
-        }
+    public void WriteLine(string msg)
+    {
+        Write(msg);
+        WriteLine();
+    }
 
-        public void WriteLine() => this.taskLog.LogMessage("\n");
+    public void WriteLine() => this.taskLog.LogMessage("\n");
 
-        public void Write(string msg) => this.taskLog.LogMessage(msg);
+    public void Write(string msg) => this.taskLog.LogMessage(msg);
 
-        public string ReadLine() => Console.ReadLine();
+    public string ReadLine() => Console.ReadLine();
 
-        public IDisposable UseColor(ConsoleColor consoleColor)
-        {
-            var old = Console.ForegroundColor;
-            Console.ForegroundColor = consoleColor;
+    public IDisposable UseColor(ConsoleColor consoleColor)
+    {
+        var old = Console.ForegroundColor;
+        Console.ForegroundColor = consoleColor;
 
-            return Disposable.Create(() => Console.ForegroundColor = old);
-        }
+        return Disposable.Create(() => Console.ForegroundColor = old);
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild/Helpers/MsBuildAppender.cs b/src/GitVersion.MsBuild/Helpers/MsBuildAppender.cs
index e9495fb51c..d4a857fc76 100644
--- a/src/GitVersion.MsBuild/Helpers/MsBuildAppender.cs
+++ b/src/GitVersion.MsBuild/Helpers/MsBuildAppender.cs
@@ -2,46 +2,45 @@
 using GitVersion.Logging;
 using Microsoft.Build.Utilities;
 
-namespace GitVersion.MsBuild
+namespace GitVersion.MsBuild;
+
+public class MsBuildAppender : ILogAppender
 {
-    public class MsBuildAppender : ILogAppender
-    {
-        private readonly TaskLoggingHelper taskLog;
+    private readonly TaskLoggingHelper taskLog;
 
-        public MsBuildAppender(TaskLoggingHelper taskLog) => this.taskLog = taskLog;
+    public MsBuildAppender(TaskLoggingHelper taskLog) => this.taskLog = taskLog;
 
-        public void WriteTo(LogLevel level, string message)
+    public void WriteTo(LogLevel level, string message)
+    {
+        try
         {
-            try
-            {
-                WriteLogEntry(level, message);
-            }
-            catch (Exception)
-            {
-                //
-            }
+            WriteLogEntry(level, message);
         }
+        catch (Exception)
+        {
+            //
+        }
+    }
 
-        private void WriteLogEntry(LogLevel level, string str)
+    private void WriteLogEntry(LogLevel level, string str)
+    {
+        var contents = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss}\t\t{str}{System.Environment.NewLine}";
+        switch (level)
         {
-            var contents = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss}\t\t{str}{System.Environment.NewLine}";
-            switch (level)
-            {
-                case LogLevel.Fatal:
-                case LogLevel.Error:
-                    this.taskLog.LogError(contents);
-                    break;
-                case LogLevel.Warn:
-                    this.taskLog.LogWarning(contents);
-                    break;
-                case LogLevel.Info:
-                case LogLevel.Verbose:
-                case LogLevel.Debug:
-                    this.taskLog.LogMessage(contents);
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(level), level, null);
-            }
+            case LogLevel.Fatal:
+            case LogLevel.Error:
+                this.taskLog.LogError(contents);
+                break;
+            case LogLevel.Warn:
+                this.taskLog.LogWarning(contents);
+                break;
+            case LogLevel.Info:
+            case LogLevel.Verbose:
+            case LogLevel.Debug:
+                this.taskLog.LogMessage(contents);
+                break;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(level), level, null);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild/IGitVersionTaskExecutor.cs b/src/GitVersion.MsBuild/IGitVersionTaskExecutor.cs
index 29c3f18a57..63627de2b1 100644
--- a/src/GitVersion.MsBuild/IGitVersionTaskExecutor.cs
+++ b/src/GitVersion.MsBuild/IGitVersionTaskExecutor.cs
@@ -1,12 +1,11 @@
 using GitVersion.MsBuild.Tasks;
 
-namespace GitVersion.MsBuild
+namespace GitVersion.MsBuild;
+
+public interface IGitVersionTaskExecutor
 {
-    public interface IGitVersionTaskExecutor
-    {
-        void GetVersion(GetVersion task);
-        void UpdateAssemblyInfo(UpdateAssemblyInfo task);
-        void GenerateGitVersionInformation(GenerateGitVersionInformation task);
-        void WriteVersionInfoToBuildLog(WriteVersionInfoToBuildLog task);
-    }
-}
+    void GetVersion(GetVersion task);
+    void UpdateAssemblyInfo(UpdateAssemblyInfo task);
+    void GenerateGitVersionInformation(GenerateGitVersionInformation task);
+    void WriteVersionInfoToBuildLog(WriteVersionInfoToBuildLog task);
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild/Tasks/GenerateGitVersionInformation.cs b/src/GitVersion.MsBuild/Tasks/GenerateGitVersionInformation.cs
index cdc8a255bd..d830574d30 100644
--- a/src/GitVersion.MsBuild/Tasks/GenerateGitVersionInformation.cs
+++ b/src/GitVersion.MsBuild/Tasks/GenerateGitVersionInformation.cs
@@ -1,22 +1,21 @@
 using Microsoft.Build.Framework;
 
-namespace GitVersion.MsBuild.Tasks
+namespace GitVersion.MsBuild.Tasks;
+
+public class GenerateGitVersionInformation : GitVersionTaskBase
 {
-    public class GenerateGitVersionInformation : GitVersionTaskBase
-    {
-        [Required]
-        public string ProjectFile { get; set; }
+    [Required]
+    public string ProjectFile { get; set; }
 
-        [Required]
-        public string IntermediateOutputPath { get; set; }
+    [Required]
+    public string IntermediateOutputPath { get; set; }
 
-        [Required]
-        public string Language { get; set; } = "C#";
+    [Required]
+    public string Language { get; set; } = "C#";
 
-        [Output]
-        public string GitVersionInformationFilePath { get; set; }
+    [Output]
+    public string GitVersionInformationFilePath { get; set; }
 
-        protected override bool OnExecute() => GitVersionTasks.GenerateGitVersionInformation(this);
+    protected override bool OnExecute() => GitVersionTasks.GenerateGitVersionInformation(this);
 
-    }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild/Tasks/GetVersion.cs b/src/GitVersion.MsBuild/Tasks/GetVersion.cs
index aba5d99d3c..bc2e4ed155 100644
--- a/src/GitVersion.MsBuild/Tasks/GetVersion.cs
+++ b/src/GitVersion.MsBuild/Tasks/GetVersion.cs
@@ -1,109 +1,108 @@
 using Microsoft.Build.Framework;
 
-namespace GitVersion.MsBuild.Tasks
+namespace GitVersion.MsBuild.Tasks;
+
+public class GetVersion : GitVersionTaskBase
 {
-    public class GetVersion : GitVersionTaskBase
-    {
-        [Output]
-        public string Major { get; set; }
+    [Output]
+    public string Major { get; set; }
 
-        [Output]
-        public string Minor { get; set; }
+    [Output]
+    public string Minor { get; set; }
 
-        [Output]
-        public string Patch { get; set; }
+    [Output]
+    public string Patch { get; set; }
 
-        [Output]
-        public string PreReleaseTag { get; set; }
+    [Output]
+    public string PreReleaseTag { get; set; }
 
-        [Output]
-        public string PreReleaseTagWithDash { get; set; }
+    [Output]
+    public string PreReleaseTagWithDash { get; set; }
 
-        [Output]
-        public string PreReleaseLabel { get; set; }
+    [Output]
+    public string PreReleaseLabel { get; set; }
 
-        [Output]
-        public string PreReleaseLabelWithDash { get; set; }
+    [Output]
+    public string PreReleaseLabelWithDash { get; set; }
 
-        [Output]
-        public string PreReleaseNumber { get; set; }
+    [Output]
+    public string PreReleaseNumber { get; set; }
 
-        [Output]
-        public string WeightedPreReleaseNumber { get; set; }
+    [Output]
+    public string WeightedPreReleaseNumber { get; set; }
 
-        [Output]
-        public string BuildMetaData { get; set; }
+    [Output]
+    public string BuildMetaData { get; set; }
 
-        [Output]
-        public string BuildMetaDataPadded { get; set; }
+    [Output]
+    public string BuildMetaDataPadded { get; set; }
 
-        [Output]
-        public string FullBuildMetaData { get; set; }
+    [Output]
+    public string FullBuildMetaData { get; set; }
 
-        [Output]
-        public string MajorMinorPatch { get; set; }
+    [Output]
+    public string MajorMinorPatch { get; set; }
 
-        [Output]
-        public string SemVer { get; set; }
+    [Output]
+    public string SemVer { get; set; }
 
-        [Output]
-        public string LegacySemVer { get; set; }
+    [Output]
+    public string LegacySemVer { get; set; }
 
-        [Output]
-        public string LegacySemVerPadded { get; set; }
+    [Output]
+    public string LegacySemVerPadded { get; set; }
 
-        [Output]
-        public string AssemblySemVer { get; set; }
+    [Output]
+    public string AssemblySemVer { get; set; }
 
-        [Output]
-        public string AssemblySemFileVer { get; set; }
+    [Output]
+    public string AssemblySemFileVer { get; set; }
 
-        [Output]
-        public string FullSemVer { get; set; }
+    [Output]
+    public string FullSemVer { get; set; }
 
-        [Output]
-        public string InformationalVersion { get; set; }
+    [Output]
+    public string InformationalVersion { get; set; }
 
-        [Output]
-        public string BranchName { get; set; }
+    [Output]
+    public string BranchName { get; set; }
 
-        [Output]
-        public string EscapedBranchName { get; set; }
+    [Output]
+    public string EscapedBranchName { get; set; }
 
-        [Output]
-        public string Sha { get; set; }
+    [Output]
+    public string Sha { get; set; }
 
-        [Output]
-        public string ShortSha { get; set; }
+    [Output]
+    public string ShortSha { get; set; }
 
-        [Output]
-        public string NuGetVersionV2 { get; set; }
+    [Output]
+    public string NuGetVersionV2 { get; set; }
 
-        [Output]
-        public string NuGetVersion { get; set; }
+    [Output]
+    public string NuGetVersion { get; set; }
 
-        [Output]
-        public string NuGetPreReleaseTagV2 { get; set; }
+    [Output]
+    public string NuGetPreReleaseTagV2 { get; set; }
 
-        [Output]
-        public string NuGetPreReleaseTag { get; set; }
+    [Output]
+    public string NuGetPreReleaseTag { get; set; }
 
-        [Output]
-        public string CommitDate { get; set; }
+    [Output]
+    public string CommitDate { get; set; }
 
-        [Output]
-        public string VersionSourceSha { get; set; }
+    [Output]
+    public string VersionSourceSha { get; set; }
 
-        [Output]
-        public string CommitsSinceVersionSource { get; set; }
+    [Output]
+    public string CommitsSinceVersionSource { get; set; }
 
-        [Output]
-        public string CommitsSinceVersionSourcePadded { get; set; }
+    [Output]
+    public string CommitsSinceVersionSourcePadded { get; set; }
 
 
-        [Output]
-        public string UncommittedChanges { get; set; }
+    [Output]
+    public string UncommittedChanges { get; set; }
 
-        protected override bool OnExecute() => GitVersionTasks.GetVersion(this);
-    }
-}
+    protected override bool OnExecute() => GitVersionTasks.GetVersion(this);
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild/Tasks/UpdateAssemblyInfo.cs b/src/GitVersion.MsBuild/Tasks/UpdateAssemblyInfo.cs
index 79475bbff6..226bfb811b 100644
--- a/src/GitVersion.MsBuild/Tasks/UpdateAssemblyInfo.cs
+++ b/src/GitVersion.MsBuild/Tasks/UpdateAssemblyInfo.cs
@@ -1,25 +1,24 @@
 using System;
 using Microsoft.Build.Framework;
 
-namespace GitVersion.MsBuild.Tasks
+namespace GitVersion.MsBuild.Tasks;
+
+public class UpdateAssemblyInfo : GitVersionTaskBase
 {
-    public class UpdateAssemblyInfo : GitVersionTaskBase
-    {
-        [Required]
-        public string ProjectFile { get; set; }
+    [Required]
+    public string ProjectFile { get; set; }
 
-        [Required]
-        public string IntermediateOutputPath { get; set; }
+    [Required]
+    public string IntermediateOutputPath { get; set; }
 
-        [Required]
-        public ITaskItem[] CompileFiles { get; set; } = Array.Empty<ITaskItem>();
+    [Required]
+    public ITaskItem[] CompileFiles { get; set; } = Array.Empty<ITaskItem>();
 
-        [Required]
-        public string Language { get; set; } = "C#";
+    [Required]
+    public string Language { get; set; } = "C#";
 
-        [Output]
-        public string AssemblyInfoTempFilePath { get; set; }
+    [Output]
+    public string AssemblyInfoTempFilePath { get; set; }
 
-        protected override bool OnExecute() => GitVersionTasks.UpdateAssemblyInfo(this);
-    }
-}
+    protected override bool OnExecute() => GitVersionTasks.UpdateAssemblyInfo(this);
+}
\ No newline at end of file
diff --git a/src/GitVersion.MsBuild/Tasks/WriteVersionInfoToBuildLog.cs b/src/GitVersion.MsBuild/Tasks/WriteVersionInfoToBuildLog.cs
index bed8972188..c9b07e6165 100644
--- a/src/GitVersion.MsBuild/Tasks/WriteVersionInfoToBuildLog.cs
+++ b/src/GitVersion.MsBuild/Tasks/WriteVersionInfoToBuildLog.cs
@@ -1,7 +1,6 @@
-namespace GitVersion.MsBuild.Tasks
+namespace GitVersion.MsBuild.Tasks;
+
+public class WriteVersionInfoToBuildLog : GitVersionTaskBase
 {
-    public class WriteVersionInfoToBuildLog : GitVersionTaskBase
-    {
-        protected override bool OnExecute() => GitVersionTasks.WriteVersionInfoToBuildLog(this);
-    }
-}
+    protected override bool OnExecute() => GitVersionTasks.WriteVersionInfoToBuildLog(this);
+}
\ No newline at end of file

From e41cc2b69a7723ce43c5f54885973bd5f738eee5 Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Sun, 3 Oct 2021 16:03:57 +0200
Subject: [PATCH 15/30] (cleanup) using global usings for main solution

---
 src/Directory.Build.props                             |  9 +++++++++
 .../Fixtures/BaseGitFlowRepositoryFixture.cs          |  4 +---
 .../Fixtures/EmptyRepositoryFixture.cs                |  3 +--
 .../Fixtures/LocalRepositoryFixture.cs                |  2 +-
 .../Fixtures/RemoteRepositoryFixture.cs               |  3 +--
 .../Fixtures/RepositoryFixtureBase.cs                 |  3 +--
 src/GitTools.Testing/Fixtures/SequenceDiagram.cs      |  4 +---
 src/GitTools.Testing/Generate.cs                      |  3 +--
 src/GitTools.Testing/GitTestExtensions.cs             |  4 ----
 src/GitTools.Testing/Internal/DirectoryHelper.cs      |  7 +------
 src/GitTools.Testing/Internal/PathHelper.cs           |  5 +----
 src/GitTools.Testing/Internal/ProcessHelper.cs        |  7 +------
 .../Internal/StringBuilderExtensions.cs               |  3 +--
 src/GitTools.Testing/VirtualTime.cs                   |  4 +---
 .../ArgumentParserOnBuildServerTests.cs               |  3 +--
 src/GitVersion.App.Tests/ArgumentParserTests.cs       |  8 +++-----
 src/GitVersion.App.Tests/ExecCmdLineArgumentTest.cs   |  5 +----
 src/GitVersion.App.Tests/HelpWriterTests.cs           |  4 +---
 src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs   |  3 +--
 src/GitVersion.App.Tests/Helpers/ExecutionResults.cs  |  3 +--
 src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs  |  7 +------
 src/GitVersion.App.Tests/Helpers/ProgramFixture.cs    |  7 +------
 .../Helpers/TestConsoleAdapter.cs                     |  4 +---
 .../JsonOutputOnBuildServerTest.cs                    |  4 +---
 .../PullRequestInBuildAgentTest.cs                    |  6 +-----
 src/GitVersion.App.Tests/QuotedStringHelpersTests.cs  |  5 ++---
 .../TagCheckoutInBuildAgentTests.cs                   |  6 +-----
 src/GitVersion.App.Tests/UpdateWixVersionFileTests.cs |  6 +-----
 src/GitVersion.App.Tests/VersionWriterTests.cs        |  5 +----
 src/GitVersion.App/ArgumentParser.cs                  |  7 +------
 src/GitVersion.App/Arguments.cs                       |  3 +--
 src/GitVersion.App/GitVersionApp.cs                   |  5 +----
 src/GitVersion.App/GitVersionAppModule.cs             |  2 +-
 src/GitVersion.App/GitVersionExecutor.cs              |  6 +-----
 src/GitVersion.App/GlobbingResolver.cs                |  6 +-----
 src/GitVersion.App/HelpWriter.cs                      |  5 +----
 src/GitVersion.App/IArgumentParser.cs                 |  2 +-
 src/GitVersion.App/IGitVersionExecutor.cs             |  2 +-
 src/GitVersion.App/IGlobbingResolver.cs               |  4 +---
 src/GitVersion.App/IHelpWriter.cs                     |  4 +---
 src/GitVersion.App/IVersionWriter.cs                  |  5 +----
 src/GitVersion.App/OverrideConfigOptionParser.cs      |  7 ++-----
 src/GitVersion.App/Program.cs                         |  4 +---
 src/GitVersion.App/QuotedStringHelpers.cs             |  7 ++-----
 src/GitVersion.App/VersionWriter.cs                   |  5 +----
 .../BuildAgents/AzurePipelinesTests.cs                |  2 +-
 .../BuildAgents/BuildServerBaseTests.cs               |  4 +---
 .../BuildAgents/CodeBuildTests.cs                     |  6 +-----
 .../BuildAgents/ContinuaCiTests.cs                    |  3 +--
 src/GitVersion.Core.Tests/BuildAgents/DroneTests.cs   |  3 +--
 src/GitVersion.Core.Tests/BuildAgents/EnvRunTests.cs  |  3 +--
 .../BuildAgents/GitHubActionsTests.cs                 |  6 ++----
 .../BuildAgents/GitLabCiTests.cs                      |  6 +-----
 src/GitVersion.Core.Tests/BuildAgents/JenkinsTests.cs |  6 +-----
 src/GitVersion.Core.Tests/BuildAgents/MyGetTests.cs   |  2 +-
 .../BuildAgents/SpaceAutomationTests.cs               |  2 +-
 .../BuildAgents/TeamCityTests.cs                      |  2 +-
 .../Configuration/ConfigProviderTests.cs              |  7 +------
 .../Configuration/DefaultConfigFileLocatorTests.cs    |  4 +---
 .../Configuration/IgnoreConfigTests.cs                |  4 +---
 .../Configuration/Init/InitScenarios.cs               |  3 +--
 .../Core/DynamicRepositoryTests.cs                    |  3 +--
 .../Core/GitVersionExecutorTests.cs                   |  6 +-----
 .../Core/GitVersionToolDirectoryTests.cs              |  4 +---
 .../Core/RepositoryExtensionsTests.cs                 |  3 +--
 .../Core/RepositoryStoreTests.cs                      |  3 +--
 src/GitVersion.Core.Tests/DocumentationTests.cs       |  6 +-----
 .../Extensions/GitToolsTestingExtensions.cs           |  6 +-----
 .../Extensions/StringFormatWithExtensionTests.cs      |  3 +--
 src/GitVersion.Core.Tests/Helpers/DirectoryHelper.cs  |  6 +-----
 .../Helpers/GitVersionContextBuilder.cs               |  5 +----
 .../Helpers/GitVersionCoreTestModule.cs               |  2 +-
 src/GitVersion.Core.Tests/Helpers/PathHelper.cs       |  6 +-----
 src/GitVersion.Core.Tests/Helpers/RuntimeHelper.cs    |  4 ++--
 src/GitVersion.Core.Tests/Helpers/TestBase.cs         |  3 +--
 src/GitVersion.Core.Tests/Helpers/TestConsole.cs      |  4 +---
 .../Helpers/TestEffectiveConfiguration.cs             |  4 +---
 src/GitVersion.Core.Tests/Helpers/TestEnvironment.cs  |  4 +---
 src/GitVersion.Core.Tests/Helpers/TestFileSystem.cs   |  6 +-----
 src/GitVersion.Core.Tests/Helpers/TestLogAppender.cs  |  3 +--
 src/GitVersion.Core.Tests/Helpers/TestStream.cs       |  4 +---
 .../Helpers/TestableVersionVariables.cs               |  2 +-
 .../IntegrationTests/BranchWithoutCommitScenarios.cs  |  2 +-
 .../IntegrationTests/DevelopScenarios.cs              |  3 +--
 .../IntegrationTests/DocumentationSamples.cs          |  3 +--
 .../IntegrationTests/FeatureBranchScenarios.cs        |  3 +--
 .../IntegrationTests/FileSystemTests.cs               |  4 +---
 .../IntegrationTests/HotfixBranchScenarios.cs         |  3 +--
 .../IntegrationTests/IgnoreBeforeScenarios.cs         |  3 +--
 .../IntegrationTests/MainScenarios.cs                 |  2 +-
 .../IntegrationTests/MainlineDevelopmentMode.cs       |  6 +-----
 .../IntegrationTests/OtherBranchScenarios.cs          |  3 +--
 .../IntegrationTests/OtherScenarios.cs                |  8 +++-----
 .../IntegrationTests/PullRequestScenarios.cs          |  2 +-
 .../IntegrationTests/ReleaseBranchScenarios.cs        |  2 +-
 .../IntegrationTests/RemoteRepositoryScenarios.cs     |  3 +--
 .../IntegrationTests/SupportBranchScenarios.cs        |  2 +-
 .../IntegrationTests/SwitchingToGitFlowScenarios.cs   |  2 +-
 .../IntegrationTests/TagCheckoutScenarios.cs          |  2 +-
 .../IntegrationTests/VersionBumpingScenarios.cs       |  3 +--
 .../VersionInCurrentBranchNameScenarios.cs            |  8 +++-----
 .../VersionInMergedBranchNameScenarios.cs             |  8 +++-----
 .../IntegrationTests/VersionInTagScenarios.cs         |  2 +-
 .../IntegrationTests/WorktreeScenarios.cs             |  3 +--
 src/GitVersion.Core.Tests/Logging/LoggerTest.cs       |  2 +-
 src/GitVersion.Core.Tests/Logging/LoggingTests.cs     |  2 +-
 src/GitVersion.Core.Tests/Model/CommitDateTests.cs    |  4 +---
 .../Model/GitVersionContextTests.cs                   |  4 +---
 src/GitVersion.Core.Tests/Model/MergeMessageTests.cs  |  4 +---
 .../VersionCalculation/BaseVersionCalculatorTests.cs  |  4 +---
 .../VersionCalculation/JsonVersionBuilderTests.cs     |  3 +--
 .../VersionCalculation/MinDateVersionFilterTests.cs   |  3 +--
 .../VersionCalculation/NextVersionCalculatorTests.cs  |  4 +---
 .../VersionCalculation/SemanticVersionTests.cs        |  2 +-
 .../VersionCalculation/ShaVersionFilterTests.cs       |  3 +--
 .../ConfigNextVersionBaseVersionStrategyTests.cs      |  3 +--
 .../MergeMessageBaseVersionStrategyTests.cs           |  4 +---
 .../VersionInBranchNameBaseVersionStrategyTests.cs    |  5 ++---
 .../VersionCalculation/TestBaseVersionCalculator.cs   |  2 +-
 .../TestMainlineVersionCalculator.cs                  |  4 ++--
 .../VersionCalculation/VariableProviderTests.cs       |  4 +---
 .../VersionCalculation/VersionSourceTests.cs          |  2 +-
 .../VersionConverters/AssemblyFileVersionTests.cs     |  2 +-
 .../VersionConverters/AssemblyInfoFileUpdaterTests.cs |  6 +-----
 .../VersionConverters/GitVersionInfoGeneratorTests.cs |  4 +---
 .../InformationalVersionBuilderTests.cs               |  3 +--
 .../VersionConverters/ProjectFileUpdaterTests.cs      |  4 +---
 .../VersionConverters/WixFileTests.cs                 |  5 +----
 .../BuildAgents/Abstractions/IBuildAgent.cs           |  3 +--
 .../BuildAgents/Abstractions/IBuildAgentResolver.cs   |  2 +-
 src/GitVersion.Core/BuildAgents/AppVeyor.cs           |  5 +----
 src/GitVersion.Core/BuildAgents/AzurePipelines.cs     |  4 +---
 src/GitVersion.Core/BuildAgents/BuildAgentBase.cs     |  4 +---
 src/GitVersion.Core/BuildAgents/BuildAgentResolver.cs |  4 +---
 src/GitVersion.Core/BuildAgents/BuildServerModule.cs  |  3 +--
 src/GitVersion.Core/BuildAgents/CodeBuild.cs          |  4 +---
 src/GitVersion.Core/BuildAgents/ContinuaCi.cs         |  2 +-
 src/GitVersion.Core/BuildAgents/Drone.cs              |  3 +--
 src/GitVersion.Core/BuildAgents/EnvRun.cs             |  3 +--
 src/GitVersion.Core/BuildAgents/GitHubActions.cs      |  7 +++----
 src/GitVersion.Core/BuildAgents/GitLabCi.cs           |  4 +---
 src/GitVersion.Core/BuildAgents/Jenkins.cs            |  4 +---
 src/GitVersion.Core/BuildAgents/MyGet.cs              |  4 +---
 src/GitVersion.Core/BuildAgents/SpaceAutomation.cs    |  4 ++--
 src/GitVersion.Core/BuildAgents/TeamCity.cs           |  2 +-
 src/GitVersion.Core/BuildAgents/TravisCI.cs           |  2 +-
 .../Abstractions/IBranchConfigurationCalculator.cs    |  3 +--
 .../Configuration/Abstractions/IConfigFileLocator.cs  |  2 +-
 .../Configuration/Abstractions/IConfigProvider.cs     |  2 +-
 .../Configuration/BranchConfigurationCalculator.cs    |  5 +----
 src/GitVersion.Core/Configuration/ConfigExtensions.cs |  5 +----
 .../Configuration/ConfigFileLocator.cs                |  4 +---
 src/GitVersion.Core/Configuration/ConfigProvider.cs   |  4 +---
 src/GitVersion.Core/Configuration/ConfigSerializer.cs |  3 +--
 .../Configuration/ConfigurationBuilder.cs             |  5 +----
 .../Configuration/ConfigurationModule.cs              |  2 +-
 .../Configuration/Init/BuildServer/AppVeyorSetup.cs   |  6 +-----
 .../Init/BuildServer/AppveyorPublicPrivate.cs         |  3 +--
 .../Init/BuildServer/SetupBuildScripts.cs             |  3 +--
 .../Configuration/Init/EditConfigStep.cs              |  3 +--
 .../Configuration/Init/GitVersionInitModule.cs        |  3 +--
 .../Init/SetConfig/AssemblyVersioningSchemeSetting.cs |  3 +--
 .../Configuration/Init/SetConfig/ConfigureBranch.cs   |  3 +--
 .../Configuration/Init/SetConfig/ConfigureBranches.cs |  5 +----
 .../Configuration/Init/SetConfig/GlobalModeSetting.cs |  3 +--
 .../Init/SetConfig/SetBranchIncrementMode.cs          |  3 +--
 .../Configuration/Init/SetConfig/SetBranchTag.cs      |  3 +--
 .../Configuration/Init/SetNextVersion.cs              |  3 +--
 src/GitVersion.Core/Configuration/Init/StepResult.cs  |  2 +-
 .../Init/Wizard/ConfigInitStepFactory.cs              |  3 +--
 .../Configuration/Init/Wizard/ConfigInitWizard.cs     |  4 +---
 .../Configuration/Init/Wizard/ConfigInitWizardStep.cs |  4 +---
 .../Configuration/Init/Wizard/FinishedSetupStep.cs    |  2 +-
 .../Configuration/Init/Wizard/GitFlowSetupStep.cs     |  2 +-
 .../Configuration/Init/Wizard/GitHubFlowStep.cs       |  2 +-
 .../Init/Wizard/IConfigInitStepFactory.cs             |  2 +-
 .../Configuration/Init/Wizard/IConfigInitWizard.cs    |  2 +-
 .../Init/Wizard/PickBranchingStrategy1Step.cs         |  5 ++---
 .../Init/Wizard/PickBranchingStrategy2Step.cs         |  3 +--
 .../Init/Wizard/PickBranchingStrategy3Step.cs         |  3 +--
 .../Init/Wizard/PickBranchingStrategyStep.cs          |  3 +--
 src/GitVersion.Core/Core/Abstractions/IEnvironment.cs |  2 +-
 src/GitVersion.Core/Core/Abstractions/IFileSystem.cs  |  6 +-----
 src/GitVersion.Core/Core/Abstractions/IGitPreparer.cs |  2 +-
 .../Core/Abstractions/IGitVersionCalculateTool.cs     |  2 +-
 .../Core/Abstractions/IGitVersionContextFactory.cs    |  2 +-
 .../Core/Abstractions/IGitVersionModule.cs            |  2 +-
 .../Core/Abstractions/IGitVersionOutputTool.cs        |  2 +-
 .../Core/Abstractions/IRepositoryStore.cs             |  4 +---
 src/GitVersion.Core/Core/Environment.cs               |  2 +-
 src/GitVersion.Core/Core/FileSystem.cs                |  6 +-----
 src/GitVersion.Core/Core/GitPreparer.cs               |  5 +----
 src/GitVersion.Core/Core/GitVersionCalculateTool.cs   |  3 +--
 src/GitVersion.Core/Core/GitVersionContextFactory.cs  |  3 +--
 src/GitVersion.Core/Core/GitVersionModule.cs          |  6 +-----
 src/GitVersion.Core/Core/GitVersionOutputTool.cs      |  4 +---
 src/GitVersion.Core/Core/RepositoryStore.cs           |  5 +----
 .../Extensions/AssemblyVersionsGeneratorExtensions.cs |  4 +---
 .../Extensions/DictionaryExtensions.cs                |  5 +----
 .../Extensions/EnumerableExtensions.cs                |  5 +----
 src/GitVersion.Core/Extensions/GitExtensions.cs       |  5 +----
 src/GitVersion.Core/Extensions/NullableAttributes.cs  |  2 +-
 src/GitVersion.Core/Extensions/ObjectExtensions.cs    |  6 +-----
 .../Extensions/ReadEmbeddedResourceExtensions.cs      |  6 ++----
 .../Extensions/ServiceCollectionExtensions.cs         |  4 +---
 src/GitVersion.Core/Extensions/StringExtensions.cs    |  6 +-----
 src/GitVersion.Core/Git/CommitFilter.cs               |  4 +---
 src/GitVersion.Core/Git/IBranch.cs                    |  4 +---
 src/GitVersion.Core/Git/IBranchCollection.cs          |  4 +---
 src/GitVersion.Core/Git/ICommit.cs                    |  5 +----
 src/GitVersion.Core/Git/ICommitCollection.cs          |  5 +----
 src/GitVersion.Core/Git/IGitObject.cs                 |  4 +---
 src/GitVersion.Core/Git/IGitRepository.cs             |  2 +-
 src/GitVersion.Core/Git/IGitRepositoryInfo.cs         |  2 +-
 src/GitVersion.Core/Git/IMutatingGitRepository.cs     |  4 +---
 src/GitVersion.Core/Git/INamedReference.cs            |  2 +-
 src/GitVersion.Core/Git/IObjectId.cs                  |  4 +---
 src/GitVersion.Core/Git/IRefSpec.cs                   |  4 +---
 src/GitVersion.Core/Git/IRefSpecCollection.cs         |  4 +---
 src/GitVersion.Core/Git/IReference.cs                 |  4 +---
 src/GitVersion.Core/Git/IReferenceCollection.cs       |  4 +---
 src/GitVersion.Core/Git/IRemote.cs                    |  5 +----
 src/GitVersion.Core/Git/IRemoteCollection.cs          |  4 +---
 src/GitVersion.Core/Git/ITag.cs                       |  4 +---
 src/GitVersion.Core/Git/ITagCollection.cs             |  4 +---
 src/GitVersion.Core/Git/RefSpecDirection.cs           |  2 +-
 src/GitVersion.Core/Git/ReferenceName.cs              |  3 +--
 src/GitVersion.Core/GitVersionCoreModule.cs           |  3 +--
 src/GitVersion.Core/Helpers/EncodingHelper.cs         |  7 +------
 src/GitVersion.Core/Helpers/LambdaEqualityHelper.cs   |  4 +---
 src/GitVersion.Core/Helpers/LambdaKeyComparer.cs      |  5 +----
 src/GitVersion.Core/Helpers/ProcessHelper.cs          |  7 +------
 src/GitVersion.Core/Helpers/RetryAction.cs            |  4 +---
 .../Helpers/ServiceMessageEscapeHelper.cs             |  2 +-
 src/GitVersion.Core/Helpers/StringComparerUtils.cs    |  4 +---
 src/GitVersion.Core/Helpers/StringFormatWith.cs       |  4 +---
 src/GitVersion.Core/Logging/Abstractions/IConsole.cs  |  4 +---
 src/GitVersion.Core/Logging/Abstractions/ILog.cs      |  4 +---
 .../Logging/Abstractions/ILogAppender.cs              |  2 +-
 src/GitVersion.Core/Logging/ConsoleAdapter.cs         |  4 +---
 src/GitVersion.Core/Logging/ConsoleAppender.cs        |  5 +----
 src/GitVersion.Core/Logging/Disposable.cs             |  4 +---
 src/GitVersion.Core/Logging/FileAppender.cs           |  5 +----
 src/GitVersion.Core/Logging/Log.cs                    |  6 +-----
 src/GitVersion.Core/Logging/LogAction.cs              |  2 +-
 src/GitVersion.Core/Logging/LogExtensions.cs          |  5 +----
 src/GitVersion.Core/Logging/LogLevel.cs               |  2 +-
 src/GitVersion.Core/Logging/NullLog.cs                |  4 +---
 src/GitVersion.Core/Logging/Verbosity.cs              |  2 +-
 src/GitVersion.Core/Model/AssemblyInfoData.cs         |  4 +---
 src/GitVersion.Core/Model/AuthenticationInfo.cs       |  2 +-
 src/GitVersion.Core/Model/BranchCommit.cs             |  4 +---
 src/GitVersion.Core/Model/ConfigInfo.cs               |  2 +-
 .../Model/Configuration/BranchConfig.cs               |  4 +---
 src/GitVersion.Core/Model/Configuration/Config.cs     |  5 +----
 .../Model/Configuration/EffectiveConfiguration.cs     |  3 +--
 .../Model/Configuration/IgnoreConfig.cs               |  5 +----
 src/GitVersion.Core/Model/Exceptions/BugException.cs  |  4 +---
 .../Model/Exceptions/ConfigurationException.cs        |  4 +---
 .../Model/Exceptions/GitToolsException.cs             |  4 +---
 .../Model/Exceptions/GitVersionException.cs           |  4 +---
 .../Model/Exceptions/LockedFileException.cs           |  4 +---
 .../Model/Exceptions/WarningException.cs              |  4 +---
 src/GitVersion.Core/Model/FileWriteInfo.cs            |  2 +-
 src/GitVersion.Core/Model/GitVersionCacheKey.cs       |  3 +--
 src/GitVersion.Core/Model/GitVersionContext.cs        |  2 +-
 src/GitVersion.Core/Model/GitVersionOptions.cs        |  3 +--
 src/GitVersion.Core/Model/MergeMessage.cs             |  5 +----
 src/GitVersion.Core/Model/OutputType.cs               |  2 +-
 src/GitVersion.Core/Model/RepositoryInfo.cs           |  2 +-
 src/GitVersion.Core/Model/Settings.cs                 |  2 +-
 src/GitVersion.Core/Model/VersionVariables.cs         |  7 +------
 .../Model/VersionVariablesJsonModel.cs                |  2 +-
 .../Model/VersionVariablesJsonNumberConverter.cs      |  3 +--
 .../Model/VersionVariablesJsonStringConverter.cs      |  3 +--
 src/GitVersion.Core/Model/WixInfo.cs                  |  2 +-
 .../Abstractions/IBaseVersionCalculator.cs            |  2 +-
 .../Abstractions/IIncrementStrategyFinder.cs          |  4 +---
 .../Abstractions/IMainlineVersionCalculator.cs        |  2 +-
 .../Abstractions/INextVersionCalculator.cs            |  2 +-
 .../Abstractions/IVariableProvider.cs                 |  2 +-
 .../VersionCalculation/Abstractions/IVersionFilter.cs |  2 +-
 .../Abstractions/IVersionStrategy.cs                  |  4 +---
 .../VersionCalculation/BaseVersionCalculator.cs       |  5 +----
 .../BaseVersionCalculators/BaseVersion.cs             |  2 +-
 .../ConfigNextVersionVersionStrategy.cs               |  4 +---
 .../BaseVersionCalculators/FallbackVersionStrategy.cs |  4 +---
 .../MergeMessageVersionStrategy.cs                    |  5 +----
 .../TaggedCommitVersionStrategy.cs                    |  5 +----
 .../TrackReleaseBranchesVersionStrategy.cs            |  5 +----
 .../VersionInBranchNameVersionStrategy.cs             |  4 +---
 .../BaseVersionCalculators/VersionStrategyBase.cs     |  5 +----
 .../BaseVersionCalculators/VersionStrategyModule.cs   |  4 +---
 .../VersionCalculation/Cache/GitVersionCache.cs       |  6 +-----
 .../Cache/GitVersionCacheKeyFactory.cs                |  7 +------
 .../VersionCalculation/Cache/IGitVersionCache.cs      |  2 +-
 .../Cache/IGitVersionCacheKeyFactory.cs               |  2 +-
 .../VersionCalculation/CommitMessageIncrementMode.cs  |  2 +-
 .../VersionCalculation/IncrementStrategy.cs           |  3 +--
 .../VersionCalculation/IncrementStrategyFinder.cs     |  5 +----
 .../VersionCalculation/MainlineVersionCalculator.cs   |  5 +----
 .../VersionCalculation/MinDateVersionFilter.cs        |  3 +--
 .../VersionCalculation/NextVersionCalculator.cs       |  4 +---
 .../SemanticVersioning/SemanticVersion.cs             |  3 +--
 .../SemanticVersionBuildMetaData.cs                   |  3 +--
 .../SemanticVersioning/SemanticVersionExtensions.cs   |  2 +-
 .../SemanticVersioning/SemanticVersionFormatValues.cs |  3 +--
 .../SemanticVersionPreReleaseTag.cs                   |  4 +---
 .../VersionCalculation/ShaVersionFilter.cs            |  5 +----
 .../VersionCalculation/VariableProvider.cs            |  3 +--
 .../VersionCalculation/VersionCalculationModule.cs    |  2 +-
 .../VersionCalculation/VersioningMode.cs              |  2 +-
 .../AssemblyInfo/AssemblyInfoContext.cs               |  2 +-
 .../AssemblyInfo/AssemblyInfoFileUpdater.cs           |  6 +-----
 .../AssemblyInfo/ProjectFileUpdater.cs                |  6 +-----
 .../GitVersionInfo/GitVersionInfoContext.cs           |  2 +-
 .../GitVersionInfo/GitVersionInfoGenerator.cs         |  5 +----
 .../VersionConverters/IConverterContext.cs            |  2 +-
 .../VersionConverters/IVersionConverter.cs            |  3 +--
 .../OutputGenerator/OutputContext.cs                  |  2 +-
 .../OutputGenerator/OutputGenerator.cs                |  4 +---
 .../VersionConverters/TemplateManager.cs              |  6 +-----
 .../VersionConverters/VersionConvertersModule.cs      |  2 +-
 .../VersionConverters/WixUpdater/WixVersionContext.cs |  2 +-
 .../WixUpdater/WixVersionFileUpdater.cs               |  6 +-----
 src/GitVersion.LibGit2Sharp/Git/Branch.cs             |  3 +--
 src/GitVersion.LibGit2Sharp/Git/BranchCollection.cs   |  4 +---
 src/GitVersion.LibGit2Sharp/Git/Commit.cs             |  5 +----
 src/GitVersion.LibGit2Sharp/Git/CommitCollection.cs   |  6 +-----
 src/GitVersion.LibGit2Sharp/Git/GitObject.cs          |  2 +-
 src/GitVersion.LibGit2Sharp/Git/GitRepository.cs      |  5 +----
 src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs  |  5 +----
 src/GitVersion.LibGit2Sharp/Git/ObjectId.cs           |  2 +-
 src/GitVersion.LibGit2Sharp/Git/RefSpec.cs            |  2 +-
 src/GitVersion.LibGit2Sharp/Git/RefSpecCollection.cs  |  6 +-----
 .../Git/ReferenceCollection.cs                        |  6 +-----
 src/GitVersion.LibGit2Sharp/Git/Remote.cs             |  4 +---
 src/GitVersion.LibGit2Sharp/Git/RemoteCollection.cs   |  6 +-----
 src/GitVersion.LibGit2Sharp/Git/Tag.cs                |  2 +-
 src/GitVersion.LibGit2Sharp/Git/TagCollection.cs      |  6 +-----
 .../GitVersionLibGit2SharpModule.cs                   |  2 +-
 src/GitVersion.LibGit2Sharp/RepositoryExtensions.cs   |  3 +--
 src/GitVersion.MsBuild.Tests/FileHelperTests.cs       |  2 +-
 .../Helpers/EventArgsFormatting.cs                    |  4 +---
 .../Helpers/GitToolsTestingExtensions.cs              |  3 +--
 .../Helpers/MsBuildExeFixture.cs                      |  5 +----
 .../Helpers/MsBuildExeFixtureResult.cs                |  3 +--
 .../Helpers/MsBuildTaskFixture.cs                     |  6 +-----
 .../Helpers/MsBuildTaskFixtureResult.cs               |  3 +--
 .../InvalidFileCheckerTests.cs                        |  4 +---
 src/GitVersion.MsBuild.Tests/Mocks/MockEngine.cs      |  5 +----
 src/GitVersion.MsBuild.Tests/Mocks/MockTaskItem.cs    |  4 +---
 .../Tasks/GenerateGitVersionInformationTest.cs        |  4 +---
 .../Tasks/GetVersionTaskTests.cs                      |  4 +---
 src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs    |  6 +-----
 .../Tasks/UpdateAssemblyInfoTaskTest.cs               |  4 +---
 .../Tasks/WriteVersionInfoTest.cs                     | 11 +++++------
 src/GitVersion.MsBuild/GitVersionTaskBase.cs          |  2 +-
 src/GitVersion.MsBuild/GitVersionTaskExecutor.cs      |  4 +---
 src/GitVersion.MsBuild/GitVersionTaskModule.cs        |  2 +-
 src/GitVersion.MsBuild/GitVersionTasks.cs             |  3 +--
 src/GitVersion.MsBuild/Helpers/FileHelper.cs          |  6 +-----
 src/GitVersion.MsBuild/Helpers/MsBuildAdapter.cs      |  3 +--
 src/GitVersion.MsBuild/Helpers/MsBuildAppender.cs     |  3 +--
 src/GitVersion.MsBuild/IGitVersionTaskExecutor.cs     |  2 +-
 .../Tasks/GenerateGitVersionInformation.cs            |  2 +-
 src/GitVersion.MsBuild/Tasks/GetVersion.cs            |  2 +-
 src/GitVersion.MsBuild/Tasks/UpdateAssemblyInfo.cs    |  3 +--
 .../Tasks/WriteVersionInfoToBuildLog.cs               |  2 +-
 369 files changed, 400 insertions(+), 1001 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index c8828de84a..8df069d167 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -66,6 +66,15 @@
 
     </ItemGroup>
 
+    <ItemGroup>
+        <Using Include="System.Collections" />
+        <Using Include="System.Collections.Specialized" />
+        <Using Include="System.Diagnostics" />
+        <Using Include="System.Reflection" />
+        <Using Include="System.Text" />
+        <Using Include="System.Xml" />
+    </ItemGroup>
+
     <ItemGroup>
         <None Include="../../docs/input/docs/img/package_icon.png">
             <Pack>true</Pack>
diff --git a/src/GitTools.Testing/Fixtures/BaseGitFlowRepositoryFixture.cs b/src/GitTools.Testing/Fixtures/BaseGitFlowRepositoryFixture.cs
index d746ab4833..94fb6327bc 100644
--- a/src/GitTools.Testing/Fixtures/BaseGitFlowRepositoryFixture.cs
+++ b/src/GitTools.Testing/Fixtures/BaseGitFlowRepositoryFixture.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using LibGit2Sharp;
 
 namespace GitTools.Testing;
@@ -37,4 +35,4 @@ private void SetupRepo(Action<IRepository> initialMainAction)
         Commands.Checkout(Repository, Repository.CreateBranch("develop"));
         Repository.MakeACommit();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitTools.Testing/Fixtures/EmptyRepositoryFixture.cs b/src/GitTools.Testing/Fixtures/EmptyRepositoryFixture.cs
index 8bdfd54223..0c4d0ea0d1 100644
--- a/src/GitTools.Testing/Fixtures/EmptyRepositoryFixture.cs
+++ b/src/GitTools.Testing/Fixtures/EmptyRepositoryFixture.cs
@@ -1,4 +1,3 @@
-using System;
 using LibGit2Sharp;
 
 namespace GitTools.Testing;
@@ -16,4 +15,4 @@ private static IRepository CreateNewRepository(string path)
 
         return new Repository(path);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitTools.Testing/Fixtures/LocalRepositoryFixture.cs b/src/GitTools.Testing/Fixtures/LocalRepositoryFixture.cs
index 2e08899b43..3ce412eb80 100644
--- a/src/GitTools.Testing/Fixtures/LocalRepositoryFixture.cs
+++ b/src/GitTools.Testing/Fixtures/LocalRepositoryFixture.cs
@@ -7,4 +7,4 @@ public class LocalRepositoryFixture : RepositoryFixtureBase
     public LocalRepositoryFixture(IRepository repository) : base(repository)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitTools.Testing/Fixtures/RemoteRepositoryFixture.cs b/src/GitTools.Testing/Fixtures/RemoteRepositoryFixture.cs
index 65bdbcb8b3..8ee343181e 100644
--- a/src/GitTools.Testing/Fixtures/RemoteRepositoryFixture.cs
+++ b/src/GitTools.Testing/Fixtures/RemoteRepositoryFixture.cs
@@ -1,4 +1,3 @@
-using System;
 using LibGit2Sharp;
 
 namespace GitTools.Testing;
@@ -46,4 +45,4 @@ protected override void Dispose(bool disposing)
 
         base.Dispose(disposing);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitTools.Testing/Fixtures/RepositoryFixtureBase.cs b/src/GitTools.Testing/Fixtures/RepositoryFixtureBase.cs
index 07c6ba805a..955d4464ed 100644
--- a/src/GitTools.Testing/Fixtures/RepositoryFixtureBase.cs
+++ b/src/GitTools.Testing/Fixtures/RepositoryFixtureBase.cs
@@ -1,4 +1,3 @@
-using System;
 using GitTools.Testing.Internal;
 using LibGit2Sharp;
 
@@ -119,4 +118,4 @@ public LocalRepositoryFixture CloneRepository()
         LibGit2Sharp.Repository.Clone(RepositoryPath, localPath);
         return new LocalRepositoryFixture(new Repository(localPath));
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitTools.Testing/Fixtures/SequenceDiagram.cs b/src/GitTools.Testing/Fixtures/SequenceDiagram.cs
index dde1ace814..59f44e2c92 100644
--- a/src/GitTools.Testing/Fixtures/SequenceDiagram.cs
+++ b/src/GitTools.Testing/Fixtures/SequenceDiagram.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Text;
 using GitTools.Testing.Internal;
 
 namespace GitTools.Testing;
@@ -124,4 +122,4 @@ private string GetParticipant(string branch)
     /// returns the plantUML representation of the Sequence Diagram
     /// </summary>
     public string GetDiagram() => this.diagramBuilder.ToString();
-}
\ No newline at end of file
+}
diff --git a/src/GitTools.Testing/Generate.cs b/src/GitTools.Testing/Generate.cs
index 0d13387e7d..86e4450ac2 100644
--- a/src/GitTools.Testing/Generate.cs
+++ b/src/GitTools.Testing/Generate.cs
@@ -1,4 +1,3 @@
-using System;
 using LibGit2Sharp;
 
 namespace GitTools.Testing;
@@ -21,4 +20,4 @@ public static Signature SignatureNow()
     /// Creates a libgit2sharp signature at the specified time
     /// </summary>
     public static Signature Signature(DateTimeOffset dateTimeOffset) => new("A. U. Thor", "thor@valhalla.asgard.com", dateTimeOffset);
-}
\ No newline at end of file
+}
diff --git a/src/GitTools.Testing/GitTestExtensions.cs b/src/GitTools.Testing/GitTestExtensions.cs
index 5b8c80fbc4..8ea9adadfb 100644
--- a/src/GitTools.Testing/GitTestExtensions.cs
+++ b/src/GitTools.Testing/GitTestExtensions.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Text;
 using GitTools.Testing.Internal;
 using LibGit2Sharp;
 
diff --git a/src/GitTools.Testing/Internal/DirectoryHelper.cs b/src/GitTools.Testing/Internal/DirectoryHelper.cs
index 4fa7963dad..362c1f0020 100644
--- a/src/GitTools.Testing/Internal/DirectoryHelper.cs
+++ b/src/GitTools.Testing/Internal/DirectoryHelper.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-
 namespace GitTools.Testing.Internal;
 
 internal static class DirectoryHelper
@@ -81,4 +76,4 @@ public static void DeleteDirectory(string directoryPath)
                 Environment.NewLine, Path.GetFullPath(directoryPath)));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitTools.Testing/Internal/PathHelper.cs b/src/GitTools.Testing/Internal/PathHelper.cs
index 93afe8ff8c..8b71cdf091 100644
--- a/src/GitTools.Testing/Internal/PathHelper.cs
+++ b/src/GitTools.Testing/Internal/PathHelper.cs
@@ -1,9 +1,6 @@
-using System;
-using System.IO;
-
 namespace GitTools.Testing.Internal;
 
 internal static class PathHelper
 {
     public static string GetTempPath() => Path.Combine(Path.GetTempPath(), "TestRepositories", Guid.NewGuid().ToString());
-}
\ No newline at end of file
+}
diff --git a/src/GitTools.Testing/Internal/ProcessHelper.cs b/src/GitTools.Testing/Internal/ProcessHelper.cs
index f4eb6f91f5..8f4934054b 100644
--- a/src/GitTools.Testing/Internal/ProcessHelper.cs
+++ b/src/GitTools.Testing/Internal/ProcessHelper.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
 using System.Runtime.InteropServices;
-using System.Threading;
 
 namespace GitTools.Testing.Internal;
 
@@ -206,4 +201,4 @@ void IDisposable.Dispose()
         [DllImport("kernel32.dll")]
         private static extern int SetErrorMode(int newMode);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitTools.Testing/Internal/StringBuilderExtensions.cs b/src/GitTools.Testing/Internal/StringBuilderExtensions.cs
index a983330601..9f1adbc8d5 100644
--- a/src/GitTools.Testing/Internal/StringBuilderExtensions.cs
+++ b/src/GitTools.Testing/Internal/StringBuilderExtensions.cs
@@ -1,4 +1,3 @@
-using System.Text;
 using JetBrains.Annotations;
 
 namespace GitTools.Testing.Internal;
@@ -11,4 +10,4 @@ public static void AppendLineFormat(this StringBuilder stringBuilder, string for
         stringBuilder.AppendFormat(format, args);
         stringBuilder.AppendLine();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitTools.Testing/VirtualTime.cs b/src/GitTools.Testing/VirtualTime.cs
index ec5f5d3956..baac3b8822 100644
--- a/src/GitTools.Testing/VirtualTime.cs
+++ b/src/GitTools.Testing/VirtualTime.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitTools.Testing;
 
 /// <summary>
@@ -21,4 +19,4 @@ public static DateTimeOffset Now
             return _simulatedTime;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App.Tests/ArgumentParserOnBuildServerTests.cs b/src/GitVersion.App.Tests/ArgumentParserOnBuildServerTests.cs
index bea513a1c5..b85b9eea84 100644
--- a/src/GitVersion.App.Tests/ArgumentParserOnBuildServerTests.cs
+++ b/src/GitVersion.App.Tests/ArgumentParserOnBuildServerTests.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.OutputVariables;
@@ -44,4 +43,4 @@ private class MockBuildAgent : ICurrentBuildAgent
 
         public bool ShouldCleanUpRemotes() => throw new NotImplementedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App.Tests/ArgumentParserTests.cs b/src/GitVersion.App.Tests/ArgumentParserTests.cs
index 40535a670e..251d28f701 100644
--- a/src/GitVersion.App.Tests/ArgumentParserTests.cs
+++ b/src/GitVersion.App.Tests/ArgumentParserTests.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.IO;
 using GitTools.Testing;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
@@ -452,7 +450,7 @@ private static IEnumerable<TestCaseData> OverrideconfigWithSingleOptionTestData(
             "mode=ContinuousDelivery",
             new Config
             {
-                VersioningMode = GitVersion.VersionCalculation.VersioningMode.ContinuousDelivery
+                VersioningMode = VersioningMode.ContinuousDelivery
             }
         );
         yield return new TestCaseData(
@@ -595,7 +593,7 @@ private static IEnumerable<TestCaseData> OverrideconfigWithMultipleOptionsTestDa
                 AssemblyVersioningFormat = "{Major}.{Minor}.{Patch}.{env:CI_JOB_ID ?? 0}",
                 UpdateBuildNumber = true,
                 AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
-                VersioningMode = GitVersion.VersionCalculation.VersioningMode.ContinuousDelivery,
+                VersioningMode = VersioningMode.ContinuousDelivery,
                 TagPreReleaseWeight = 4
             }
         );
@@ -760,4 +758,4 @@ public void ArbitraryArgumentsRemotePasswordDefinedSetsPassword()
         var arguments = this.argumentParser.ParseArguments("-nocache");
         arguments.Authentication.Password.ShouldBe("value");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App.Tests/ExecCmdLineArgumentTest.cs b/src/GitVersion.App.Tests/ExecCmdLineArgumentTest.cs
index 24421cc753..75a2079632 100644
--- a/src/GitVersion.App.Tests/ExecCmdLineArgumentTest.cs
+++ b/src/GitVersion.App.Tests/ExecCmdLineArgumentTest.cs
@@ -1,6 +1,3 @@
-using System;
-using System.IO;
-using System.Text;
 using GitTools.Testing;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Helpers;
@@ -93,4 +90,4 @@ public void WorkingDirectoryDoesNotExistFailsWithInformativeMessage()
         var outputString = output.ToString();
         outputString.ShouldContain($"The working directory '{workingDirectory}' does not exist.", Case.Insensitive, outputString);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App.Tests/HelpWriterTests.cs b/src/GitVersion.App.Tests/HelpWriterTests.cs
index 89af3f30fe..07a024d520 100644
--- a/src/GitVersion.App.Tests/HelpWriterTests.cs
+++ b/src/GitVersion.App.Tests/HelpWriterTests.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
 using Microsoft.Extensions.DependencyInjection;
@@ -58,4 +56,4 @@ private static bool IsNotInHelp(IReadOnlyDictionary<string, string> lookup, stri
 
         return !helpText.Contains("/" + propertyName.ToLower());
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs b/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs
index 6bd61369ae..f495b9aa64 100644
--- a/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs
+++ b/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs
@@ -1,4 +1,3 @@
-using System.Text;
 using GitVersion.Extensions;
 
 namespace GitVersion.App.Tests;
@@ -71,4 +70,4 @@ public override string ToString()
     private readonly string projectArgs;
     private readonly string projectFile;
     private readonly string workingDirectory;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App.Tests/Helpers/ExecutionResults.cs b/src/GitVersion.App.Tests/Helpers/ExecutionResults.cs
index 2ec49dfa42..192fa1fa1e 100644
--- a/src/GitVersion.App.Tests/Helpers/ExecutionResults.cs
+++ b/src/GitVersion.App.Tests/Helpers/ExecutionResults.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.OutputVariables;
 
 namespace GitVersion.App.Tests;
@@ -27,4 +26,4 @@ public virtual VersionVariables OutputVariables
             return VersionVariables.FromJson(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs b/src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs
index 1d17390c78..a97df828eb 100644
--- a/src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs
+++ b/src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
@@ -116,4 +111,4 @@ params KeyValuePair<string, string>[] environments
 
         return new ExecutionResults(exitCode, output.ToString(), logContents);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App.Tests/Helpers/ProgramFixture.cs b/src/GitVersion.App.Tests/Helpers/ProgramFixture.cs
index aa8e694dee..5ecff1d07e 100644
--- a/src/GitVersion.App.Tests/Helpers/ProgramFixture.cs
+++ b/src/GitVersion.App.Tests/Helpers/ProgramFixture.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
 using GitVersion.Logging;
@@ -97,4 +92,4 @@ public VersionVariables OutputVariables
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App.Tests/Helpers/TestConsoleAdapter.cs b/src/GitVersion.App.Tests/Helpers/TestConsoleAdapter.cs
index 895ebaa57c..ec0c5d6683 100644
--- a/src/GitVersion.App.Tests/Helpers/TestConsoleAdapter.cs
+++ b/src/GitVersion.App.Tests/Helpers/TestConsoleAdapter.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Text;
 using GitVersion.Logging;
 
 namespace GitVersion.App.Tests;
@@ -19,4 +17,4 @@ public class TestConsoleAdapter : IConsole
     public string ReadLine() => throw new NotImplementedException();
 
     public IDisposable UseColor(ConsoleColor consoleColor) => Disposable.Empty;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App.Tests/JsonOutputOnBuildServerTest.cs b/src/GitVersion.App.Tests/JsonOutputOnBuildServerTest.cs
index 3df96bcda4..1855399eed 100644
--- a/src/GitVersion.App.Tests/JsonOutputOnBuildServerTest.cs
+++ b/src/GitVersion.App.Tests/JsonOutputOnBuildServerTest.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.IO;
 using GitTools.Testing;
 using GitVersion.BuildAgents;
 using GitVersion.OutputVariables;
@@ -69,4 +67,4 @@ public void BeingOnBuildServerWithOutputJsonAndOutputFileDoesNotFail(string outp
         outputVariables.ShouldNotBeNull();
         outputVariables.FullSemVer.ShouldBeEquivalentTo(version);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs b/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs
index 011f970c00..7a818c8bf1 100644
--- a/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs
+++ b/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using GitTools.Testing;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
@@ -170,4 +166,4 @@ private static async Task VerifyPullRequestVersionIsCalculatedProperly(string pu
         // Cleanup repository files
         DirectoryHelper.DeleteDirectory(remoteRepositoryPath);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App.Tests/QuotedStringHelpersTests.cs b/src/GitVersion.App.Tests/QuotedStringHelpersTests.cs
index e4a65deaa8..678fca3d4c 100644
--- a/src/GitVersion.App.Tests/QuotedStringHelpersTests.cs
+++ b/src/GitVersion.App.Tests/QuotedStringHelpersTests.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion;
 using NUnit.Framework;
 
@@ -14,7 +13,7 @@ private static IEnumerable<TestCaseData> SplitUnquotedTestData()
     {
         yield return new TestCaseData(null, ' ')
         {
-            ExpectedResult = System.Array.Empty<string>()
+            ExpectedResult = Array.Empty<string>()
         };
         yield return new TestCaseData("one two three", ' ')
         {
@@ -117,4 +116,4 @@ private static IEnumerable<TestCaseData> UnquoteTextTestData()
             ExpectedResult = "escaped \"quote"
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs b/src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs
index 54922e8101..10db2d7f94 100644
--- a/src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs
+++ b/src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using GitTools.Testing;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
@@ -73,4 +69,4 @@ private static async Task VerifyTagCheckoutVersionIsCalculatedProperly(Dictionar
         // Cleanup repository files
         DirectoryHelper.DeleteDirectory(remoteRepositoryPath);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App.Tests/UpdateWixVersionFileTests.cs b/src/GitVersion.App.Tests/UpdateWixVersionFileTests.cs
index 960fd71680..9cdeffe564 100644
--- a/src/GitVersion.App.Tests/UpdateWixVersionFileTests.cs
+++ b/src/GitVersion.App.Tests/UpdateWixVersionFileTests.cs
@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Xml;
 using GitTools.Testing;
 using GitVersion.OutputVariables;
 using GitVersion.VersionConverters.WixUpdater;
@@ -88,4 +84,4 @@ private static Dictionary<string, string> GetGitVersionVarsInWixFile(string file
         }
         return gitVersionVarsInWix;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App.Tests/VersionWriterTests.cs b/src/GitVersion.App.Tests/VersionWriterTests.cs
index 2589e855c8..c15e1af590 100644
--- a/src/GitVersion.App.Tests/VersionWriterTests.cs
+++ b/src/GitVersion.App.Tests/VersionWriterTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.IO;
-using System.Reflection;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
 using Microsoft.Extensions.DependencyInjection;
@@ -60,4 +57,4 @@ private static Assembly GenerateAssembly(Version fileVersion, string prereleaseI
 
         return Assembly.Load(memoryStream.ToArray());
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/ArgumentParser.cs b/src/GitVersion.App/ArgumentParser.cs
index 632e7ec3da..67fdea8c7d 100644
--- a/src/GitVersion.App/ArgumentParser.cs
+++ b/src/GitVersion.App/ArgumentParser.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.IO;
-using System.Linq;
 using GitVersion.BuildAgents;
 using GitVersion.Extensions;
 using GitVersion.Logging;
@@ -584,4 +579,4 @@ private static NameValueCollection CollectSwitchesAndValuesFromArguments(IList<s
 
         return switchesAndValues;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/Arguments.cs b/src/GitVersion.App/Arguments.cs
index 22c17e0889..3273606364 100644
--- a/src/GitVersion.App/Arguments.cs
+++ b/src/GitVersion.App/Arguments.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Logging;
 using GitVersion.Model;
 using GitVersion.Model.Configuration;
@@ -104,4 +103,4 @@ public GitVersionOptions ToOptions()
             OutputFile = OutputFile
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/GitVersionApp.cs b/src/GitVersion.App/GitVersionApp.cs
index 6c6f0f09f7..ee0b006e61 100644
--- a/src/GitVersion.App/GitVersionApp.cs
+++ b/src/GitVersion.App/GitVersionApp.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using GitVersion.Logging;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
@@ -40,4 +37,4 @@ public Task StartAsync(CancellationToken cancellationToken)
     }
 
     public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/GitVersionAppModule.cs b/src/GitVersion.App/GitVersionAppModule.cs
index b91af84912..abbfe807e7 100644
--- a/src/GitVersion.App/GitVersionAppModule.cs
+++ b/src/GitVersion.App/GitVersionAppModule.cs
@@ -13,4 +13,4 @@ public void RegisterTypes(IServiceCollection services)
         services.AddSingleton<IVersionWriter, VersionWriter>();
         services.AddSingleton<IGitVersionExecutor, GitVersionExecutor>();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/GitVersionExecutor.cs b/src/GitVersion.App/GitVersionExecutor.cs
index 7e1bcf9ff9..8e67da4874 100644
--- a/src/GitVersion.App/GitVersionExecutor.cs
+++ b/src/GitVersion.App/GitVersionExecutor.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using System.Reflection;
-using System.Threading;
 using GitVersion.Configuration;
 using GitVersion.Extensions;
 using GitVersion.Logging;
@@ -191,4 +187,4 @@ private static void ConfigureLogging(GitVersionOptions gitVersionOptions, ILog l
             log.AddLogAppender(new FileAppender(gitVersionOptions.LogFilePath));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/GlobbingResolver.cs b/src/GitVersion.App/GlobbingResolver.cs
index ef50ca0213..a79712f67f 100644
--- a/src/GitVersion.App/GlobbingResolver.cs
+++ b/src/GitVersion.App/GlobbingResolver.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using Microsoft.Extensions.FileSystemGlobbing;
 using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
 
@@ -18,4 +14,4 @@ public IEnumerable<string> Resolve(string workingDirectory, string pattern)
     }
 
     protected virtual DirectoryInfoBase GetDirectoryInfoWrapper(string workingDirectory) => new DirectoryInfoWrapper(new DirectoryInfo(workingDirectory));
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/HelpWriter.cs b/src/GitVersion.App/HelpWriter.cs
index 644e35030d..75133fc832 100644
--- a/src/GitVersion.App/HelpWriter.cs
+++ b/src/GitVersion.App/HelpWriter.cs
@@ -1,6 +1,3 @@
-using System;
-using System.IO;
-using System.Reflection;
 using GitVersion.Logging;
 
 namespace GitVersion;
@@ -40,4 +37,4 @@ private string ArgumentList()
         var codeBlockEnd = argsMarkdown.LastIndexOf("```") - codeBlockStart;
         return argsMarkdown.Substring(codeBlockStart, codeBlockEnd).Trim();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/IArgumentParser.cs b/src/GitVersion.App/IArgumentParser.cs
index f7ea7e3f72..0b54023c06 100644
--- a/src/GitVersion.App/IArgumentParser.cs
+++ b/src/GitVersion.App/IArgumentParser.cs
@@ -4,4 +4,4 @@ public interface IArgumentParser
 {
     Arguments ParseArguments(string commandLineArguments);
     Arguments ParseArguments(string[] commandLineArguments);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/IGitVersionExecutor.cs b/src/GitVersion.App/IGitVersionExecutor.cs
index 514c982861..0bca364649 100644
--- a/src/GitVersion.App/IGitVersionExecutor.cs
+++ b/src/GitVersion.App/IGitVersionExecutor.cs
@@ -3,4 +3,4 @@ namespace GitVersion;
 public interface IGitVersionExecutor
 {
     int Execute(GitVersionOptions gitVersionOptions);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/IGlobbingResolver.cs b/src/GitVersion.App/IGlobbingResolver.cs
index 2ed40da4cb..161e649067 100644
--- a/src/GitVersion.App/IGlobbingResolver.cs
+++ b/src/GitVersion.App/IGlobbingResolver.cs
@@ -1,8 +1,6 @@
-using System.Collections.Generic;
-
 namespace GitVersion;
 
 public interface IGlobbingResolver
 {
     public IEnumerable<string> Resolve(string workingDirectory, string pattern);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/IHelpWriter.cs b/src/GitVersion.App/IHelpWriter.cs
index 5c850a56bf..81c7b998b8 100644
--- a/src/GitVersion.App/IHelpWriter.cs
+++ b/src/GitVersion.App/IHelpWriter.cs
@@ -1,9 +1,7 @@
-using System;
-
 namespace GitVersion;
 
 public interface IHelpWriter
 {
     void Write();
     void WriteTo(Action<string> writeAction);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/IVersionWriter.cs b/src/GitVersion.App/IVersionWriter.cs
index 2932586ad6..19182c1cad 100644
--- a/src/GitVersion.App/IVersionWriter.cs
+++ b/src/GitVersion.App/IVersionWriter.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Reflection;
-
 namespace GitVersion;
 
 public interface IVersionWriter
 {
     void Write(Assembly assembly);
     void WriteTo(Assembly assembly, Action<string> writeAction);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/OverrideConfigOptionParser.cs b/src/GitVersion.App/OverrideConfigOptionParser.cs
index 4a27b7e6d6..87cc670fc9 100644
--- a/src/GitVersion.App/OverrideConfigOptionParser.cs
+++ b/src/GitVersion.App/OverrideConfigOptionParser.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Linq;
-using System.Reflection;
 using GitVersion.Model.Configuration;
 
 namespace GitVersion;
@@ -76,7 +73,7 @@ internal void SetValue(string key, string value)
                 }
                 catch (ArgumentException)
                 {
-                    var sb = new System.Text.StringBuilder();
+                    var sb = new StringBuilder();
 
                     sb.Append($"Could not parse /overrideconfig option: {key}={value}.");
                     sb.AppendLine(" Ensure that 'value' is valid for specified 'key' enumeration: ");
@@ -104,4 +101,4 @@ internal void SetValue(string key, string value)
     }
 
     internal Config GetConfig() => this.lazyConfig.IsValueCreated ? this.lazyConfig.Value : null;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/Program.cs b/src/GitVersion.App/Program.cs
index 13e49f5a7a..ad4a197f99 100644
--- a/src/GitVersion.App/Program.cs
+++ b/src/GitVersion.App/Program.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Threading.Tasks;
 using GitVersion.Extensions;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -38,4 +36,4 @@ private IHostBuilder CreateHostBuilder(string[] args) =>
                 services.AddHostedService<GitVersionApp>();
             })
             .UseConsoleLifetime();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/QuotedStringHelpers.cs b/src/GitVersion.App/QuotedStringHelpers.cs
index fac3ed1979..dbfc7ef144 100644
--- a/src/GitVersion.App/QuotedStringHelpers.cs
+++ b/src/GitVersion.App/QuotedStringHelpers.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using GitVersion.Extensions;
 
 namespace GitVersion;
@@ -26,7 +23,7 @@ public static class QuotedStringHelpers
     public static string[] SplitUnquoted(string input, char splitChar)
     {
         if (input == null)
-            return System.Array.Empty<string>();
+            return Array.Empty<string>();
 
         var splitted = new List<string>();
         bool isPreviousCharBackslash = false;
@@ -81,4 +78,4 @@ public static string UnquoteText(string input)
 
         return sb.ToString();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.App/VersionWriter.cs b/src/GitVersion.App/VersionWriter.cs
index 183d227cc9..226404223f 100644
--- a/src/GitVersion.App/VersionWriter.cs
+++ b/src/GitVersion.App/VersionWriter.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Linq;
-using System.Reflection;
 using GitVersion.Logging;
 
 namespace GitVersion;
@@ -29,4 +26,4 @@ private static string GetAssemblyVersion(Assembly assembly)
 
         return assembly.GetName().Version.ToString();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/BuildAgents/AzurePipelinesTests.cs b/src/GitVersion.Core.Tests/BuildAgents/AzurePipelinesTests.cs
index facf9afc04..76032ac07e 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/AzurePipelinesTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/AzurePipelinesTests.cs
@@ -80,4 +80,4 @@ public void AzurePipelinesBuildNumberWithSemVer(string buildNumberFormat, string
         var logMessage = this.buildServer.GenerateSetVersionMessage(vars);
         logMessage.ShouldBe(logPrefix + expectedBuildNumber);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/BuildAgents/BuildServerBaseTests.cs b/src/GitVersion.Core.Tests/BuildAgents/BuildServerBaseTests.cs
index 7be26b13df..8f00dfae47 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/BuildServerBaseTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/BuildServerBaseTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Logging;
@@ -67,4 +65,4 @@ public BuildAgent(IEnvironment environment, ILog log) : base(environment, log)
 
         public override string[] GenerateSetParameterMessage(string name, string value) => Array.Empty<string>();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/BuildAgents/CodeBuildTests.cs b/src/GitVersion.Core.Tests/BuildAgents/CodeBuildTests.cs
index 0a96918ab7..dee0cb205a 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/CodeBuildTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/CodeBuildTests.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.VersionCalculation;
@@ -104,4 +100,4 @@ private void AssertVariablesAreWrittenToFile(string file)
         props.ShouldContain("GitVersion_Major=1");
         props.ShouldContain("GitVersion_Minor=2");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/BuildAgents/ContinuaCiTests.cs b/src/GitVersion.Core.Tests/BuildAgents/ContinuaCiTests.cs
index b606b3d08a..17e22256d2 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/ContinuaCiTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/ContinuaCiTests.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
 using Microsoft.Extensions.DependencyInjection;
@@ -22,4 +21,4 @@ public void GenerateBuildVersion()
         var continuaCiVersion = buildServer.GenerateSetVersionMessage(vars);
         Assert.AreEqual("@@continua[setBuildVersion value='0.0.0-Beta4.7']", continuaCiVersion);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/BuildAgents/DroneTests.cs b/src/GitVersion.Core.Tests/BuildAgents/DroneTests.cs
index f0468f7fd4..676069903f 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/DroneTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/DroneTests.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
 using Microsoft.Extensions.DependencyInjection;
@@ -139,4 +138,4 @@ public void GetCurrentBranchShouldUseDroneBranchInCaseOfPullRequestAndEmptyDrone
         // Assert
         result.ShouldBe(droneBranch);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/BuildAgents/EnvRunTests.cs b/src/GitVersion.Core.Tests/BuildAgents/EnvRunTests.cs
index 9453c828fc..ce2af786fb 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/EnvRunTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/EnvRunTests.cs
@@ -1,4 +1,3 @@
-using System.IO;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
 using Microsoft.Extensions.DependencyInjection;
@@ -67,4 +66,4 @@ public void GenerateSetParameterMessage(string name, string value, string expect
         output.ShouldHaveSingleItem();
         output[0].ShouldBe(expected);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/BuildAgents/GitHubActionsTests.cs b/src/GitVersion.Core.Tests/BuildAgents/GitHubActionsTests.cs
index bbdf21d962..bc668e81ce 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/GitHubActionsTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/GitHubActionsTests.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.IO;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
 using Microsoft.Extensions.DependencyInjection;
@@ -121,7 +119,7 @@ public void SkipEmptySetParameterMessage()
         var result = this.buildServer.GenerateSetParameterMessage("Hello", string.Empty);
 
         // Assert
-        result.ShouldBeEquivalentTo(System.Array.Empty<string>());
+        result.ShouldBeEquivalentTo(Array.Empty<string>());
     }
 
     [Test]
@@ -189,4 +187,4 @@ public void GetEmptyGenerateSetVersionMessage()
         // Assert
         message.ShouldBeEmpty();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/BuildAgents/GitLabCiTests.cs b/src/GitVersion.Core.Tests/BuildAgents/GitLabCiTests.cs
index f2d8766495..88650af096 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/GitLabCiTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/GitLabCiTests.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.VersionCalculation;
@@ -88,4 +84,4 @@ private void AssertVariablesAreWrittenToFile(string file)
         props.ShouldContain("GitVersion_Major=1");
         props.ShouldContain("GitVersion_Minor=2");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/BuildAgents/JenkinsTests.cs b/src/GitVersion.Core.Tests/BuildAgents/JenkinsTests.cs
index 950f523322..51f8381364 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/JenkinsTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/JenkinsTests.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.VersionCalculation;
@@ -160,4 +156,4 @@ private void AssertVariablesAreWrittenToFile(string file)
         props.ShouldContain("GitVersion_Major=1");
         props.ShouldContain("GitVersion_Minor=2");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/BuildAgents/MyGetTests.cs b/src/GitVersion.Core.Tests/BuildAgents/MyGetTests.cs
index 4a3265ec1e..8a2706f690 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/MyGetTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/MyGetTests.cs
@@ -38,4 +38,4 @@ public void BuildNumber()
         var message = this.buildServer.GenerateSetParameterMessage("LegacySemVerPadded", "0.8.0-unstable568");
         Assert.AreEqual("##myget[buildNumber '0.8.0-unstable568']", message[1]);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/BuildAgents/SpaceAutomationTests.cs b/src/GitVersion.Core.Tests/BuildAgents/SpaceAutomationTests.cs
index f313de13a8..0082235e93 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/SpaceAutomationTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/SpaceAutomationTests.cs
@@ -99,4 +99,4 @@ public void GetEmptyGenerateSetVersionMessage()
         // Assert
         message.ShouldBeEmpty();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/BuildAgents/TeamCityTests.cs b/src/GitVersion.Core.Tests/BuildAgents/TeamCityTests.cs
index 7342d0ac5d..77c3545b7a 100644
--- a/src/GitVersion.Core.Tests/BuildAgents/TeamCityTests.cs
+++ b/src/GitVersion.Core.Tests/BuildAgents/TeamCityTests.cs
@@ -32,4 +32,4 @@ public void EscapeValues()
         Assert.AreEqual("##teamcity[setParameter name='GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", tcVersion[0]);
         Assert.AreEqual("##teamcity[setParameter name='system.GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", tcVersion[1]);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.cs b/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.cs
index bdd0003786..5d13baaa84 100644
--- a/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.cs
+++ b/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
 using System.Runtime.CompilerServices;
 using GitVersion.Configuration;
 using GitVersion.Core.Tests.Helpers;
@@ -508,4 +503,4 @@ public void ShouldNotOverrideTagPrefixFromConfigFileWhenNotSetInOverrideConfig()
 
         config.TagPrefix.ShouldBe("custom-tag-prefix-from-yml");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Configuration/DefaultConfigFileLocatorTests.cs b/src/GitVersion.Core.Tests/Configuration/DefaultConfigFileLocatorTests.cs
index 70f2aa39e0..c1267f8736 100644
--- a/src/GitVersion.Core.Tests/Configuration/DefaultConfigFileLocatorTests.cs
+++ b/src/GitVersion.Core.Tests/Configuration/DefaultConfigFileLocatorTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using GitVersion.Configuration;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
@@ -226,4 +224,4 @@ private static IServiceProvider GetServiceProvider(GitVersionOptions gitVersionO
                 services.AddSingleton(Options.Create(gitVersionOptions));
             });
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Configuration/IgnoreConfigTests.cs b/src/GitVersion.Core.Tests/Configuration/IgnoreConfigTests.cs
index c0c801fe7c..482dedda72 100644
--- a/src/GitVersion.Core.Tests/Configuration/IgnoreConfigTests.cs
+++ b/src/GitVersion.Core.Tests/Configuration/IgnoreConfigTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using GitVersion.Configuration;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Model.Configuration;
@@ -82,4 +80,4 @@ public void NewInstanceShouldBeEmpty()
 
         ignoreConfig.IsEmpty.ShouldBeTrue();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Configuration/Init/InitScenarios.cs b/src/GitVersion.Core.Tests/Configuration/Init/InitScenarios.cs
index 0fca03c272..dc5cdc33b5 100644
--- a/src/GitVersion.Core.Tests/Configuration/Init/InitScenarios.cs
+++ b/src/GitVersion.Core.Tests/Configuration/Init/InitScenarios.cs
@@ -1,4 +1,3 @@
-using System.IO;
 using System.Runtime.InteropServices;
 using GitVersion.Configuration;
 using GitVersion.Core.Tests.Helpers;
@@ -36,4 +35,4 @@ public void CanSetNextVersion()
 
         fileSystem.ReadAllText(Path.Combine(workingDirectory, "GitVersion.yml")).ShouldMatchApproved();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs b/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs
index 9a97e97d5a..0263e0f0c5 100644
--- a/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs
+++ b/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs
@@ -1,4 +1,3 @@
-using System.IO;
 using GitVersion.Core.Tests.Helpers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -87,4 +86,4 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
 
         Assert.AreEqual(expectedFullSemVer, versionVariables?.FullSemVer);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs b/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs
index 4207c4b58b..68673d9392 100644
--- a/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs
+++ b/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Text;
 using GitTools.Testing;
 using GitVersion.BuildAgents;
 using GitVersion.Configuration;
@@ -567,4 +563,4 @@ private static IServiceProvider GetServiceProvider(GitVersionOptions gitVersionO
             services.AddSingleton(options);
             services.AddSingleton(RepositoryExtensions.ToGitRepositoryInfo(options));
         });
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Core/GitVersionToolDirectoryTests.cs b/src/GitVersion.Core.Tests/Core/GitVersionToolDirectoryTests.cs
index 493d85401a..e68c3fb1cb 100644
--- a/src/GitVersion.Core.Tests/Core/GitVersionToolDirectoryTests.cs
+++ b/src/GitVersion.Core.Tests/Core/GitVersionToolDirectoryTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using GitVersion.Core.Tests.Helpers;
 using LibGit2Sharp;
 using Microsoft.Extensions.DependencyInjection;
@@ -71,4 +69,4 @@ public void FindsGitDirectoryInParent()
             Assert.IsNotAssignableFrom<RepositoryNotFoundException>(ex);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Core/RepositoryExtensionsTests.cs b/src/GitVersion.Core.Tests/Core/RepositoryExtensionsTests.cs
index 60ca79ca12..684d1224d1 100644
--- a/src/GitVersion.Core.Tests/Core/RepositoryExtensionsTests.cs
+++ b/src/GitVersion.Core.Tests/Core/RepositoryExtensionsTests.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Core.Tests.Helpers;
 using NSubstitute;
 using NUnit.Framework;
@@ -50,4 +49,4 @@ private static IRemote MockRemote(IGitRepository repository)
         repository.Branches.Returns(branches);
         return remote;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs b/src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs
index 90ff1a1f3f..e875ff8d9f 100644
--- a/src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs
+++ b/src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs
@@ -1,4 +1,3 @@
-using System;
 using GitTools.Testing;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Core.Tests.IntegrationTests;
@@ -233,4 +232,4 @@ public void FindCommitBranchWasBranchedFromShouldReturnNullIfTheRemoteIsTheOnlyS
         Assert.IsNull(branchedCommit.Branch);
         Assert.IsNull(branchedCommit.Commit);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/DocumentationTests.cs b/src/GitVersion.Core.Tests/DocumentationTests.cs
index 435b3c81b6..8a79cb6e58 100644
--- a/src/GitVersion.Core.Tests/DocumentationTests.cs
+++ b/src/GitVersion.Core.Tests/DocumentationTests.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Reflection;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Model.Configuration;
 using GitVersion.OutputVariables;
@@ -98,4 +94,4 @@ private static DirectoryInfo GetDocsDirectory()
 
         return currentDirectory;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs b/src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs
index c15e381029..8a8007c781 100644
--- a/src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs
+++ b/src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using GitTools.Testing;
 using GitVersion.BuildAgents;
 using GitVersion.Configuration;
@@ -162,4 +158,4 @@ private static IServiceProvider ConfigureServices(Action<IServiceCollection> ser
         servicesOverrides?.Invoke(services);
         return services.BuildServiceProvider();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs b/src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs
index d5687d360a..5f8cdb5425 100644
--- a/src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs
+++ b/src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Helpers;
 using NUnit.Framework;
@@ -247,4 +246,4 @@ public void FormatProperty_NullObject_WithFallback_QuotedAndEmpty()
         var actual = target.FormatWith(propertyObject, this.environment);
         Assert.That(actual, Is.EqualTo(""));
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Helpers/DirectoryHelper.cs b/src/GitVersion.Core.Tests/Helpers/DirectoryHelper.cs
index 51ff6edb9f..d442a8215d 100644
--- a/src/GitVersion.Core.Tests/Helpers/DirectoryHelper.cs
+++ b/src/GitVersion.Core.Tests/Helpers/DirectoryHelper.cs
@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-
 namespace GitVersion.Core.Tests.Helpers;
 
 public static class DirectoryHelper
@@ -78,4 +74,4 @@ public static void DeleteDirectory(string directoryPath)
                 System.Environment.NewLine, Path.GetFullPath(directoryPath)));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs b/src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs
index b715516f4a..c151d555d3 100644
--- a/src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs
+++ b/src/GitVersion.Core.Tests/Helpers/GitVersionContextBuilder.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using GitTools.Testing;
 using GitVersion.Configuration;
 using GitVersion.Core.Tests.Helpers;
@@ -103,4 +100,4 @@ private static IServiceProvider ConfigureServices(Action<IServiceCollection> ove
 
         return services.BuildServiceProvider();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs b/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs
index 3b6121518d..5784f11a65 100644
--- a/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs
+++ b/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs
@@ -15,4 +15,4 @@ public void RegisterTypes(IServiceCollection services)
         services.AddSingleton<IEnvironment, TestEnvironment>();
         services.AddSingleton<ILog, NullLog>();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Helpers/PathHelper.cs b/src/GitVersion.Core.Tests/Helpers/PathHelper.cs
index 5154bcd171..2b9288ad8e 100644
--- a/src/GitVersion.Core.Tests/Helpers/PathHelper.cs
+++ b/src/GitVersion.Core.Tests/Helpers/PathHelper.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using System.Reflection;
-
 namespace GitVersion.Core.Tests.Helpers;
 
 public static class PathHelper
@@ -22,4 +18,4 @@ public static string GetExecutableArgs(string args)
     public static string GetTempPath() => Path.Combine(GetCurrentDirectory(), "TestRepositories", Guid.NewGuid().ToString());
 
     private static string GetExeDirectory() => Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)?.Replace("GitVersion.App.Tests", "GitVersion.App");
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Helpers/RuntimeHelper.cs b/src/GitVersion.Core.Tests/Helpers/RuntimeHelper.cs
index e08c88ccf5..315bf717d1 100644
--- a/src/GitVersion.Core.Tests/Helpers/RuntimeHelper.cs
+++ b/src/GitVersion.Core.Tests/Helpers/RuntimeHelper.cs
@@ -14,8 +14,8 @@ public static bool IsCoreClr()
         return _isCoreClr.Value;
 #else
 #pragma warning disable IDE0022 // Use expression body for methods // Cannot be set because of the pragma section
-            return false;
+        return false;
 #pragma warning restore IDE0022 // Use expression body for methods
 #endif
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Helpers/TestBase.cs b/src/GitVersion.Core.Tests/Helpers/TestBase.cs
index 3299c943b9..55a3a7a862 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestBase.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestBase.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Configuration;
 using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
@@ -41,4 +40,4 @@ protected static IServiceProvider BuildServiceProvider(string workingDirectory,
         });
         return sp;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Helpers/TestConsole.cs b/src/GitVersion.Core.Tests/Helpers/TestConsole.cs
index 86da5e267a..9749356cb8 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestConsole.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestConsole.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitVersion.Logging;
 
 namespace GitVersion.Core.Tests.Helpers;
@@ -29,4 +27,4 @@ private class NoOpDisposable : IDisposable
     {
         public void Dispose() { }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs b/src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs
index b29638048d..3dc978d6a0 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
 using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
 using GitVersion.VersionCalculation;
@@ -45,4 +43,4 @@ public TestEffectiveConfiguration(
             tracksReleaseBranches, isRelease, commitDateFormat, updateBuildNumber, 0, 0)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Helpers/TestEnvironment.cs b/src/GitVersion.Core.Tests/Helpers/TestEnvironment.cs
index d63ea8f5d8..a42192efee 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestEnvironment.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestEnvironment.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace GitVersion.Core.Tests.Helpers;
 
 public class TestEnvironment : IEnvironment
@@ -11,4 +9,4 @@ public class TestEnvironment : IEnvironment
     public string GetEnvironmentVariable(string variableName) => this.map.TryGetValue(variableName, out var val) ? val : null;
 
     public void SetEnvironmentVariable(string variableName, string value) => this.map[variableName] = value;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Helpers/TestFileSystem.cs b/src/GitVersion.Core.Tests/Helpers/TestFileSystem.cs
index 0b255d04cf..a2c8235637 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestFileSystem.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestFileSystem.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
 using GitVersion.Helpers;
 
 namespace GitVersion.Core.Tests.Helpers;
@@ -113,4 +109,4 @@ public bool PathsEqual(string path, string otherPath) => string.Equals(
         Path.GetFullPath(path).TrimEnd('\\').TrimEnd('/'),
         Path.GetFullPath(otherPath).TrimEnd('\\').TrimEnd('/'),
         StringComparerUtils.OsDependentComparison);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Helpers/TestLogAppender.cs b/src/GitVersion.Core.Tests/Helpers/TestLogAppender.cs
index 11e1cea32f..54483a0e8d 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestLogAppender.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestLogAppender.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Logging;
 
 namespace GitVersion.Core.Tests.Helpers;
@@ -9,4 +8,4 @@ public class TestLogAppender : ILogAppender
 
     public TestLogAppender(Action<string> logAction) => this.logAction = logAction;
     public void WriteTo(LogLevel level, string message) => this.logAction(message);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Helpers/TestStream.cs b/src/GitVersion.Core.Tests/Helpers/TestStream.cs
index d576eefa4e..d69fda5321 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestStream.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestStream.cs
@@ -1,5 +1,3 @@
-using System.IO;
-
 namespace GitVersion.Core.Tests.Helpers;
 
 public class TestStream : Stream
@@ -45,4 +43,4 @@ public override long Position
         get => this.underlying.Position;
         set => this.underlying.Position = value;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Helpers/TestableVersionVariables.cs b/src/GitVersion.Core.Tests/Helpers/TestableVersionVariables.cs
index 8a92d66c1e..c6cf98e02c 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestableVersionVariables.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestableVersionVariables.cs
@@ -22,4 +22,4 @@ public TestableVersionVariables(
         nugetPreReleaseTag, nugetPreReleaseTagV2, versionSourceSha, commitsSinceVersionSource, commitsSinceVersionSourcePadded, uncommittedChanges)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/BranchWithoutCommitScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/BranchWithoutCommitScenarios.cs
index a5c16ff5b3..9c82aa5417 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/BranchWithoutCommitScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/BranchWithoutCommitScenarios.cs
@@ -36,4 +36,4 @@ public void BranchVersionHavePrecedenceOverTagVersionIfVersionGreaterThanTag()
 
         fixture.AssertFullSemver("1.0.0-beta.1+0");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs
index 6e927b5305..941acbd66f 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitTools.Testing;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Model.Configuration;
@@ -399,4 +398,4 @@ public void WhenPreventIncrementOfMergedBranchVersionIsSetToFalseForDevelopCommi
         fixture.Repository.Branches.Remove(HotfixBranch);
         fixture.AssertFullSemver("1.2.0-alpha.19", config);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs
index 45745fba91..f7e7991c26 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamples.cs
@@ -1,4 +1,3 @@
-using System;
 using GitTools.Testing;
 using GitVersion.Core.Tests.Helpers;
 using NUnit.Framework;
@@ -404,4 +403,4 @@ public void GitHubFlowMajorRelease()
         fixture.Repository.DumpGraph();
         fixture.AssertFullSemver("2.0.1+1");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs
index d65f7280fb..ad776816b4 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitTools.Testing;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
@@ -559,4 +558,4 @@ public void ShouldHaveAGreaterSemVerAfterDevelopIsMergedIntoFeature()
         fixture.MergeNoFF("develop");
         fixture.AssertFullSemver("16.24.0-feat-featX.4", config);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/FileSystemTests.cs b/src/GitVersion.Core.Tests/IntegrationTests/FileSystemTests.cs
index 2f3533ea41..a2775f3198 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/FileSystemTests.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/FileSystemTests.cs
@@ -1,5 +1,3 @@
-using System.IO;
-using System.Text;
 using GitVersion.Core.Tests.Helpers;
 using NUnit.Framework;
 using Shouldly;
@@ -54,4 +52,4 @@ public void WhenFileDoesNotExistCreateWithUtf8WithPreamble()
 
         bytes.ShouldBe(preamble);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs
index fdd91f6b60..2da0d91a29 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using GitTools.Testing;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
@@ -227,4 +226,4 @@ public void FeatureOnHotfixFeatureBranchNotDeleted()
         fixture.AssertFullSemver("4.5.1-beta.2", config);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/IgnoreBeforeScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/IgnoreBeforeScenarios.cs
index 87a6499656..78ba4c9c25 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/IgnoreBeforeScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/IgnoreBeforeScenarios.cs
@@ -1,4 +1,3 @@
-using System;
 using GitTools.Testing;
 using GitVersion.Configuration;
 using GitVersion.Core.Tests.Helpers;
@@ -31,4 +30,4 @@ public void ShouldFallbackToBaseVersionWhenAllCommitsAreIgnored()
 
         fixture.AssertFullSemver("0.1.0+0", config);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs
index 0739ac7d36..4b53420583 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs
@@ -206,4 +206,4 @@ public void AreTagsNotAdheringToTagPrefixIgnored()
 
         fixture.AssertFullSemver("0.1.0+6", config);   //Fallback version + 6 commits since tag
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentMode.cs b/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentMode.cs
index 13c2932511..84eff91a6a 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentMode.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentMode.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Text;
 using GitTools.Testing;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
@@ -542,4 +538,4 @@ string GetParticipant(string participant) =>
         diagramBuilder.AppendLineFormat("{0} -> {0}: Commit '{1}'", GetParticipant(fixture.Repository.Head.FriendlyName),
             commitMsg);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/OtherBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/OtherBranchScenarios.cs
index 226b790049..0525ca66de 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/OtherBranchScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/OtherBranchScenarios.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitTools.Testing;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Model.Configuration;
@@ -87,4 +86,4 @@ public void TagIsBranchNameForBranchesWithoutPrefixedBranchName(string tag, stri
         var expectedFullSemVer = $"1.0.1-{preReleaseTagName}.1+5";
         fixture.AssertFullSemver(expectedFullSemVer, config);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs
index b1c2b35c49..f9c8ec2864 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs
@@ -1,6 +1,4 @@
 using System.Globalization;
-using System.IO;
-using System.Linq;
 using GitTools.Testing;
 using GitVersion.Core.Tests.Helpers;
 using LibGit2Sharp;
@@ -24,7 +22,7 @@ public void DoNotBlowUpWhenMainAndDevelopPointAtSameCommit()
         fixture.Repository.MakeACommit();
         fixture.Repository.CreateBranch("develop");
 
-        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
+        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, Array.Empty<string>(), new FetchOptions(), null);
         Commands.Checkout(fixture.LocalRepositoryFixture.Repository, fixture.Repository.Head.Tip);
         fixture.LocalRepositoryFixture.Repository.Branches.Remove(MainBranch);
         fixture.InitializeRepo();
@@ -91,7 +89,7 @@ public void DoNotBlowUpWhenDevelopAndFeatureBranchPointAtSameCommit()
         fixture.Repository.MakeACommit();
         fixture.Repository.CreateBranch("feature/someFeature");
 
-        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
+        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, Array.Empty<string>(), new FetchOptions(), null);
         Commands.Checkout(fixture.LocalRepositoryFixture.Repository, fixture.Repository.Head.Tip);
         fixture.LocalRepositoryFixture.Repository.Branches.Remove(MainBranch);
         fixture.InitializeRepo();
@@ -132,4 +130,4 @@ public void NoDirtyFlagInCleanRepository()
         var zero = 0;
         version.UncommittedChanges.ShouldBe(zero.ToString(CultureInfo.InvariantCulture));
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs
index 850f4c91ae..cfb7aaf7c2 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs
@@ -98,4 +98,4 @@ public void CalculatesCorrectVersionAfterReleaseBranchMergedToMain()
 
         fixture.AssertFullSemver("2.0.0-PullRequest0002.0");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/ReleaseBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/ReleaseBranchScenarios.cs
index 4137dbb7e3..80494424fe 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/ReleaseBranchScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/ReleaseBranchScenarios.cs
@@ -670,4 +670,4 @@ public void FeatureOnReleaseFeatureBranchNotDeleted()
 
         fixture.AssertFullSemver("4.5.0-beta.2", config);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/RemoteRepositoryScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/RemoteRepositoryScenarios.cs
index be73c0bea2..af0512f7b6 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/RemoteRepositoryScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/RemoteRepositoryScenarios.cs
@@ -1,4 +1,3 @@
-using System;
 using GitTools.Testing;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
@@ -140,4 +139,4 @@ private static void CopyRemoteBranchesToHeads(IRepository repository)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/SupportBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/SupportBranchScenarios.cs
index 3fe0392472..351101afec 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/SupportBranchScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/SupportBranchScenarios.cs
@@ -71,4 +71,4 @@ public void WhenSupportIsBranchedAndTaggedFromAnotherSupportEnsureNewMinorIsUsed
 
         fixture.AssertFullSemver("1.3.1+2");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs
index 2e9b5ac459..6f8fd6fce9 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs
@@ -18,4 +18,4 @@ public void WhenDevelopBranchedFromMainWithLegacyVersionTagsDevelopCanUseReachab
         Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
         fixture.AssertFullSemver("1.1.0-alpha.2");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/TagCheckoutScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/TagCheckoutScenarios.cs
index f4388e0e76..6a1cc117fc 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/TagCheckoutScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/TagCheckoutScenarios.cs
@@ -48,4 +48,4 @@ public void GivenARepositoryWithTwoTagsAndADevelopBranch()
 
         fixture.AssertFullSemver(hotfixVersion);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs
index 25ff8c37a4..c777f1ae51 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/VersionBumpingScenarios.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitTools.Testing;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Model.Configuration;
@@ -110,4 +109,4 @@ public void CanUseCommitMessagesToBumpVersionBaseVersionTagIsAppliedToSameCommit
 
         fixture.AssertFullSemver("2.0.1+1");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs
index beb492a7a4..33ac445def 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
 using GitTools.Testing;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Model.Configuration;
@@ -49,7 +47,7 @@ public void TakesVersionFromNameOfRemoteReleaseBranchInOrigin()
         using var fixture = new RemoteRepositoryFixture();
         fixture.BranchTo("release/2.0.0");
         fixture.MakeACommit();
-        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
+        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, Array.Empty<string>(), new FetchOptions(), null);
 
         fixture.LocalRepositoryFixture.Checkout("origin/release/2.0.0");
 
@@ -63,10 +61,10 @@ public void DoesNotTakeVersionFromNameOfRemoteReleaseBranchInCustomRemote()
         fixture.LocalRepositoryFixture.Repository.Network.Remotes.Rename("origin", "upstream");
         fixture.BranchTo("release/2.0.0");
         fixture.MakeACommit();
-        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
+        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, Array.Empty<string>(), new FetchOptions(), null);
 
         fixture.LocalRepositoryFixture.Checkout("upstream/release/2.0.0");
 
         fixture.LocalRepositoryFixture.AssertFullSemver("0.1.0-beta.1+5");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs
index 5031c3bdac..fe026c9d13 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
 using GitTools.Testing;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Model.Configuration;
@@ -50,7 +48,7 @@ public void TakesVersionFromNameOfRemoteReleaseBranchInOrigin()
         using var fixture = new RemoteRepositoryFixture();
         fixture.BranchTo("release/2.0.0");
         fixture.MakeACommit();
-        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
+        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, Array.Empty<string>(), new FetchOptions(), null);
 
         fixture.LocalRepositoryFixture.MergeNoFF("origin/release/2.0.0");
 
@@ -64,7 +62,7 @@ public void DoesNotTakeVersionFromNameOfRemoteReleaseBranchInCustomRemote()
         fixture.LocalRepositoryFixture.Repository.Network.Remotes.Rename("origin", "upstream");
         fixture.BranchTo("release/2.0.0");
         fixture.MakeACommit();
-        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
+        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, Array.Empty<string>(), new FetchOptions(), null);
 
         fixture.LocalRepositoryFixture.MergeNoFF("upstream/release/2.0.0");
 
@@ -81,4 +79,4 @@ public static void CreateAndMergeBranchIntoDevelop(this BaseGitFlowRepositoryFix
         fixture.Checkout("develop");
         fixture.MergeNoFF(branchName);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionInTagScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionInTagScenarios.cs
index 62ff153478..648eee8205 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/VersionInTagScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/VersionInTagScenarios.cs
@@ -108,4 +108,4 @@ public void TagPreReleaseWeightIsNotConfigured_GitFlowReleaseIsFinished_Weighted
         // Assert
         version.AssemblySemFileVer.ShouldBe("1.1.0.60000");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/WorktreeScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/WorktreeScenarios.cs
index 8ad21af5a9..df44f16e3c 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/WorktreeScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/WorktreeScenarios.cs
@@ -1,4 +1,3 @@
-using System.IO;
 using GitTools.Testing;
 using GitVersion.Core.Tests.Helpers;
 using LibGit2Sharp;
@@ -30,4 +29,4 @@ public void UseWorktreeRepositoryForVersion()
         worktreeFixture.AssertFullSemver("1.0.0");
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Logging/LoggerTest.cs b/src/GitVersion.Core.Tests/Logging/LoggerTest.cs
index c8b55f5c0b..4c1d4129cb 100644
--- a/src/GitVersion.Core.Tests/Logging/LoggerTest.cs
+++ b/src/GitVersion.Core.Tests/Logging/LoggerTest.cs
@@ -43,4 +43,4 @@ public void UsernameWithoutPassword()
 
         s.Contains(repoUrl).ShouldBe(true);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Logging/LoggingTests.cs b/src/GitVersion.Core.Tests/Logging/LoggingTests.cs
index 7a0d6572e0..72e611b939 100644
--- a/src/GitVersion.Core.Tests/Logging/LoggingTests.cs
+++ b/src/GitVersion.Core.Tests/Logging/LoggingTests.cs
@@ -13,4 +13,4 @@ public void CanLogNonFormatStrings()
 
         log.Info("Logging using git revision syntax eg. 1.0.0.0^{} shouldn't throw");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Model/CommitDateTests.cs b/src/GitVersion.Core.Tests/Model/CommitDateTests.cs
index 90c738faf5..8606929a57 100644
--- a/src/GitVersion.Core.Tests/Model/CommitDateTests.cs
+++ b/src/GitVersion.Core.Tests/Model/CommitDateTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Linq;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
@@ -33,4 +31,4 @@ public void CommitDateFormatTest(string format, string expectedOutcome)
 
         Assert.That(formatValues.CommitDate, Is.EqualTo(expectedOutcome));
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Model/GitVersionContextTests.cs b/src/GitVersion.Core.Tests/Model/GitVersionContextTests.cs
index 27b40adf98..88ef7f8155 100644
--- a/src/GitVersion.Core.Tests/Model/GitVersionContextTests.cs
+++ b/src/GitVersion.Core.Tests/Model/GitVersionContextTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitTools.Testing;
 using GitVersion.Configuration;
 using GitVersion.Core.Tests.Helpers;
@@ -197,4 +195,4 @@ private static GitVersionContext GetGitVersionContext(string workingDirectory, I
 
         return sp.GetService<Lazy<GitVersionContext>>()?.Value;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/Model/MergeMessageTests.cs b/src/GitVersion.Core.Tests/Model/MergeMessageTests.cs
index 6038e2a939..2929199ff0 100644
--- a/src/GitVersion.Core.Tests/Model/MergeMessageTests.cs
+++ b/src/GitVersion.Core.Tests/Model/MergeMessageTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Model.Configuration;
 using NUnit.Framework;
@@ -362,4 +360,4 @@ public void ReturnsAfterFirstMatchingPattern()
         sut.PullRequestNumber.ShouldBe(null);
         sut.Version.ShouldBeNull();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/BaseVersionCalculatorTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/BaseVersionCalculatorTests.cs
index 892355874e..42a28d8f48 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/BaseVersionCalculatorTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/BaseVersionCalculatorTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Model.Configuration;
 using GitVersion.VersionCalculation;
@@ -246,4 +244,4 @@ private sealed class TestVersionStrategy : IVersionStrategy
 
         public IEnumerable<BaseVersion> GetVersions() => this.versions;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/JsonVersionBuilderTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/JsonVersionBuilderTests.cs
index a049c1e279..16a442336c 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/JsonVersionBuilderTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/JsonVersionBuilderTests.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.VersionCalculation;
 using Microsoft.Extensions.DependencyInjection;
@@ -36,4 +35,4 @@ public void Json()
         var json = variables.ToString();
         json.ShouldMatchApproved(c => c.SubFolder("Approved"));
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/MinDateVersionFilterTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/MinDateVersionFilterTests.cs
index 13f558c04c..f9d0af5e85 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/MinDateVersionFilterTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/MinDateVersionFilterTests.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.VersionCalculation;
 using NUnit.Framework;
@@ -52,4 +51,4 @@ public void ExcludeShouldAcceptVersionWithNullCommit()
         sut.Exclude(version, out var reason).ShouldBeFalse();
         reason.ShouldBeNull();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs
index c00a2b3879..7ea18e212a 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitTools.Testing;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Core.Tests.IntegrationTests;
@@ -321,4 +319,4 @@ public void GetNextVersionOnNonMainlineBranchWithoutCommitsShouldWorkNormally()
         fixture.BranchTo("feature/f1");
         fixture.AssertFullSemver("1.0.0-f1.0", config);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
index 18fe68412d..049fc4f679 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
@@ -258,4 +258,4 @@ public void ToStringITests()
         };
         Assert.AreEqual("1.2.3-beta.4+5.Branch.TheBranch.Sha.theSha.TheOtherMetaData", fullSemVer.ToString("i"));
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/ShaVersionFilterTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/ShaVersionFilterTests.cs
index 0a72e6d635..e204a174e9 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/ShaVersionFilterTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/ShaVersionFilterTests.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.VersionCalculation;
 using NUnit.Framework;
@@ -52,4 +51,4 @@ public void ExcludeShouldAcceptVersionWithNullCommit()
         sut.Exclude(version, out var reason).ShouldBeFalse();
         reason.ShouldBeNull();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs
index 419eac5d04..f2d849a1ff 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
@@ -48,4 +47,4 @@ private static BaseVersion GetBaseVersion(Config config = null)
 
         return strategy.GetVersions().SingleOrDefault();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
index 6e8aae0fd7..5db853906d 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
@@ -198,4 +196,4 @@ private static List<ICommit> GetParents(bool isMergeCommit)
             null
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs
index 20bba2f98c..e8541760c9 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using GitTools.Testing;
 using GitVersion.Configuration;
 using GitVersion.Core.Tests.Helpers;
@@ -72,7 +71,7 @@ public void CanTakeVersionFromNameOfRemoteReleaseBranch(string branchName, strin
         Commands.Checkout(fixture.Repository, branch);
         fixture.MakeACommit();
 
-        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, System.Array.Empty<string>(), new FetchOptions(), null);
+        Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, Array.Empty<string>(), new FetchOptions(), null);
         fixture.LocalRepositoryFixture.Checkout($"origin/{branchName}");
 
         var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), branchName);
@@ -86,4 +85,4 @@ private static IVersionStrategy GetVersionStrategy(string workingDirectory, IGit
         var sp = BuildServiceProvider(workingDirectory, repository, branch, config);
         return sp.GetServiceForType<IVersionStrategy, VersionInBranchNameVersionStrategy>();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/TestBaseVersionCalculator.cs b/src/GitVersion.Core.Tests/VersionCalculation/TestBaseVersionCalculator.cs
index 42ec6e1cf0..48b5ebb761 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/TestBaseVersionCalculator.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/TestBaseVersionCalculator.cs
@@ -16,4 +16,4 @@ public TestBaseVersionCalculator(bool shouldIncrement, SemanticVersion semanticV
     }
 
     public BaseVersion GetBaseVersion() => new("Test source", this.shouldIncrement, this.semanticVersion, this.source, null);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/TestMainlineVersionCalculator.cs b/src/GitVersion.Core.Tests/VersionCalculation/TestMainlineVersionCalculator.cs
index 5fa0305c27..762c3d90af 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/TestMainlineVersionCalculator.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/TestMainlineVersionCalculator.cs
@@ -8,7 +8,7 @@ public class TestMainlineVersionCalculator : IMainlineVersionCalculator
 
     public TestMainlineVersionCalculator(SemanticVersionBuildMetaData metaData) => this.metaData = metaData;
 
-    public SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion) => throw new System.NotImplementedException();
+    public SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion) => throw new NotImplementedException();
 
     public SemanticVersionBuildMetaData CreateVersionBuildMetaData(ICommit baseVersionSource) => this.metaData;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs
index 506dd0bb50..bcae1c7775 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Logging;
 using GitVersion.VersionCalculation;
@@ -305,4 +303,4 @@ public void ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomA
 
         vars.ToString().ShouldMatchApproved(c => c.SubFolder("Approved"));
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs
index bdb4f9b674..6c0fb9545a 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/VersionSourceTests.cs
@@ -69,4 +69,4 @@ private static INextVersionCalculator GetNextVersionCalculator(RepositoryFixture
         var sp = BuildServiceProvider(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), fixture.Repository.Head.CanonicalName);
         return sp.GetService<INextVersionCalculator>();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionConverters/AssemblyFileVersionTests.cs b/src/GitVersion.Core.Tests/VersionConverters/AssemblyFileVersionTests.cs
index 42dc36bc8c..a7e343cefe 100644
--- a/src/GitVersion.Core.Tests/VersionConverters/AssemblyFileVersionTests.cs
+++ b/src/GitVersion.Core.Tests/VersionConverters/AssemblyFileVersionTests.cs
@@ -25,4 +25,4 @@ public void ValidateAssemblyFileVersionBuilder(AssemblyFileVersioningScheme asse
 
         assemblyFileVersion.ShouldBe(versionString);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionConverters/AssemblyInfoFileUpdaterTests.cs b/src/GitVersion.Core.Tests/VersionConverters/AssemblyInfoFileUpdaterTests.cs
index e1b0d99774..8065ab50d8 100644
--- a/src/GitVersion.Core.Tests/VersionConverters/AssemblyInfoFileUpdaterTests.cs
+++ b/src/GitVersion.Core.Tests/VersionConverters/AssemblyInfoFileUpdaterTests.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
 using GitVersion.Logging;
@@ -466,4 +462,4 @@ private void VerifyAssemblyInfoFile(
 
         verify?.Invoke(this.fileSystem, variables);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs b/src/GitVersion.Core.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs
index 8a3ede8142..ed916a7df4 100644
--- a/src/GitVersion.Core.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs
+++ b/src/GitVersion.Core.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.VersionCalculation;
 using GitVersion.VersionConverters.GitVersionInfo;
@@ -49,4 +47,4 @@ public void ShouldCreateFile(string fileExtension)
 
         fileSystem.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionConverters/InformationalVersionBuilderTests.cs b/src/GitVersion.Core.Tests/VersionConverters/InformationalVersionBuilderTests.cs
index a90384146f..befa95cbc5 100644
--- a/src/GitVersion.Core.Tests/VersionConverters/InformationalVersionBuilderTests.cs
+++ b/src/GitVersion.Core.Tests/VersionConverters/InformationalVersionBuilderTests.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Core.Tests.Helpers;
 using NUnit.Framework;
 
@@ -36,4 +35,4 @@ public void ValidateInformationalVersionBuilder(string branchName, string sha, s
         Assert.AreEqual(versionString, informationalVersion);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionConverters/ProjectFileUpdaterTests.cs b/src/GitVersion.Core.Tests/VersionConverters/ProjectFileUpdaterTests.cs
index 2579cf2628..ab057e289f 100644
--- a/src/GitVersion.Core.Tests/VersionConverters/ProjectFileUpdaterTests.cs
+++ b/src/GitVersion.Core.Tests/VersionConverters/ProjectFileUpdaterTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using System.Xml.Linq;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
@@ -388,4 +386,4 @@ private void VerifyAssemblyInfoFile(
 
         verify?.Invoke(this.fileSystem, variables);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core.Tests/VersionConverters/WixFileTests.cs b/src/GitVersion.Core.Tests/VersionConverters/WixFileTests.cs
index 8d60aaf35e..b149983a85 100644
--- a/src/GitVersion.Core.Tests/VersionConverters/WixFileTests.cs
+++ b/src/GitVersion.Core.Tests/VersionConverters/WixFileTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.IO;
-using System.Text;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Logging;
 using GitVersion.VersionCalculation;
@@ -107,4 +104,4 @@ public void UpdateWixVersionFileWhenFileAlreadyExists()
             .ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved")));
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgent.cs b/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgent.cs
index d7e1a9ed61..6a81aaafe2 100644
--- a/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgent.cs
+++ b/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgent.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.OutputVariables;
 
 namespace GitVersion.BuildAgents;
@@ -12,4 +11,4 @@ public interface IBuildAgent
     bool ShouldCleanUpRemotes();
 }
 
-public interface ICurrentBuildAgent : IBuildAgent { }
\ No newline at end of file
+public interface ICurrentBuildAgent : IBuildAgent { }
diff --git a/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgentResolver.cs b/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgentResolver.cs
index 0e725757d5..5f08c53be1 100644
--- a/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgentResolver.cs
+++ b/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgentResolver.cs
@@ -3,4 +3,4 @@ namespace GitVersion.BuildAgents;
 public interface IBuildAgentResolver
 {
     ICurrentBuildAgent? Resolve();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/AppVeyor.cs b/src/GitVersion.Core/BuildAgents/AppVeyor.cs
index 24b1bb6d3e..f714b3bf52 100644
--- a/src/GitVersion.Core/BuildAgents/AppVeyor.cs
+++ b/src/GitVersion.Core/BuildAgents/AppVeyor.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Net.Http;
-using System.Text;
 using System.Text.Json;
 using GitVersion.Extensions;
 using GitVersion.Logging;
@@ -78,4 +75,4 @@ private HttpClient GetHttpClient()
     }
 
     public override bool PreventFetch() => false;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/AzurePipelines.cs b/src/GitVersion.Core/BuildAgents/AzurePipelines.cs
index ae44403749..54d978b3ed 100644
--- a/src/GitVersion.Core/BuildAgents/AzurePipelines.cs
+++ b/src/GitVersion.Core/BuildAgents/AzurePipelines.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 using GitVersion.Logging;
@@ -56,4 +54,4 @@ private static string ReplaceVariables(string buildNumberEnv, KeyValuePair<strin
         var replacement = variable.Value ?? string.Empty;
         return buildNumberEnv.RegexReplace(pattern, replacement, RegexOptions.IgnoreCase);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/BuildAgentBase.cs b/src/GitVersion.Core/BuildAgents/BuildAgentBase.cs
index ad1a27a5ed..7e1958f7e9 100644
--- a/src/GitVersion.Core/BuildAgents/BuildAgentBase.cs
+++ b/src/GitVersion.Core/BuildAgents/BuildAgentBase.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitVersion.Extensions;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
@@ -59,4 +57,4 @@ protected IEnumerable<string> GenerateBuildLogOutput(VersionVariables variables)
 
         return output;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/BuildAgentResolver.cs b/src/GitVersion.Core/BuildAgents/BuildAgentResolver.cs
index 843fbac3b7..8a6e048146 100644
--- a/src/GitVersion.Core/BuildAgents/BuildAgentResolver.cs
+++ b/src/GitVersion.Core/BuildAgents/BuildAgentResolver.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitVersion.Logging;
 
 namespace GitVersion.BuildAgents;
@@ -35,4 +33,4 @@ public BuildAgentResolver(IEnumerable<IBuildAgent> buildAgents, ILog log)
 
         return instance;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/BuildServerModule.cs b/src/GitVersion.Core/BuildAgents/BuildServerModule.cs
index cd43a37466..bd0a79d211 100644
--- a/src/GitVersion.Core/BuildAgents/BuildServerModule.cs
+++ b/src/GitVersion.Core/BuildAgents/BuildServerModule.cs
@@ -1,4 +1,3 @@
-using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace GitVersion.BuildAgents;
@@ -19,4 +18,4 @@ public override void RegisterTypes(IServiceCollection services)
         services.AddSingleton(sp => sp.GetService<IBuildAgentResolver>()?.Resolve());
 #pragma warning restore CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint.
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/CodeBuild.cs b/src/GitVersion.Core/BuildAgents/CodeBuild.cs
index 256d6707e0..68b8cdbf1a 100644
--- a/src/GitVersion.Core/BuildAgents/CodeBuild.cs
+++ b/src/GitVersion.Core/BuildAgents/CodeBuild.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using GitVersion.Extensions;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
@@ -49,4 +47,4 @@ public override void WriteIntegration(Action<string?> writer, VersionVariables v
 
     public override bool CanApplyToCurrentContext()
         => !Environment.GetEnvironmentVariable(WebHookEnvironmentVariableName).IsNullOrEmpty() || !Environment.GetEnvironmentVariable(SourceVersionEnvironmentVariableName).IsNullOrEmpty();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/ContinuaCi.cs b/src/GitVersion.Core/BuildAgents/ContinuaCi.cs
index 7feab42186..36b611d246 100644
--- a/src/GitVersion.Core/BuildAgents/ContinuaCi.cs
+++ b/src/GitVersion.Core/BuildAgents/ContinuaCi.cs
@@ -21,4 +21,4 @@ public override string[] GenerateSetParameterMessage(string name, string value)
     public override string GenerateSetVersionMessage(VersionVariables variables) => $"@@continua[setBuildVersion value='{variables.FullSemVer}']";
 
     public override bool PreventFetch() => false;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/Drone.cs b/src/GitVersion.Core/BuildAgents/Drone.cs
index 8db3ced3fc..7fa6b6f8af 100644
--- a/src/GitVersion.Core/BuildAgents/Drone.cs
+++ b/src/GitVersion.Core/BuildAgents/Drone.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Extensions;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
@@ -53,4 +52,4 @@ public override string[] GenerateSetParameterMessage(string name, string value)
     }
 
     public override bool PreventFetch() => false;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/EnvRun.cs b/src/GitVersion.Core/BuildAgents/EnvRun.cs
index 5fd601d811..7edbad2a11 100644
--- a/src/GitVersion.Core/BuildAgents/EnvRun.cs
+++ b/src/GitVersion.Core/BuildAgents/EnvRun.cs
@@ -1,4 +1,3 @@
-using System.IO;
 using GitVersion.Extensions;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
@@ -37,4 +36,4 @@ public override string[] GenerateSetParameterMessage(string name, string value)
         $"@@envrun[set name='GitVersion_{name}' value='{value}']"
     };
     public override bool PreventFetch() => true;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/GitHubActions.cs b/src/GitVersion.Core/BuildAgents/GitHubActions.cs
index 003b482f02..85e8476648 100644
--- a/src/GitVersion.Core/BuildAgents/GitHubActions.cs
+++ b/src/GitVersion.Core/BuildAgents/GitHubActions.cs
@@ -1,4 +1,3 @@
-using System.IO;
 using GitVersion.Extensions;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
@@ -22,9 +21,9 @@ public override string GenerateSetVersionMessage(VersionVariables variables) =>
         string.Empty; // There is no equivalent function in GitHub Actions.
 
     public override string[] GenerateSetParameterMessage(string name, string value) =>
-        System.Array.Empty<string>(); // There is no equivalent function in GitHub Actions.
+        Array.Empty<string>(); // There is no equivalent function in GitHub Actions.
 
-    public override void WriteIntegration(System.Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true)
+    public override void WriteIntegration(Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true)
     {
         base.WriteIntegration(writer, variables, updateBuildNumber);
 
@@ -60,4 +59,4 @@ public override void WriteIntegration(System.Action<string?> writer, VersionVari
     public override string? GetCurrentBranch(bool usingDynamicRepos) => Environment.GetEnvironmentVariable("GITHUB_REF");
 
     public override bool PreventFetch() => true;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/GitLabCi.cs b/src/GitVersion.Core/BuildAgents/GitLabCi.cs
index 3135d26d54..c1d7431a3b 100644
--- a/src/GitVersion.Core/BuildAgents/GitLabCi.cs
+++ b/src/GitVersion.Core/BuildAgents/GitLabCi.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
@@ -36,4 +34,4 @@ public override void WriteIntegration(Action<string?> writer, VersionVariables v
     }
 
     private void WriteVariablesFile(VersionVariables variables) => File.WriteAllLines(this.file, GenerateBuildLogOutput(variables));
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/Jenkins.cs b/src/GitVersion.Core/BuildAgents/Jenkins.cs
index 7b735598bb..f405ed1517 100644
--- a/src/GitVersion.Core/BuildAgents/Jenkins.cs
+++ b/src/GitVersion.Core/BuildAgents/Jenkins.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using GitVersion.Extensions;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
@@ -46,4 +44,4 @@ public override void WriteIntegration(Action<string?> writer, VersionVariables v
     }
 
     private void WriteVariablesFile(VersionVariables variables) => File.WriteAllLines(this.file, GenerateBuildLogOutput(variables));
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/MyGet.cs b/src/GitVersion.Core/BuildAgents/MyGet.cs
index f330672eec..c00c04f62b 100644
--- a/src/GitVersion.Core/BuildAgents/MyGet.cs
+++ b/src/GitVersion.Core/BuildAgents/MyGet.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitVersion.Extensions;
 using GitVersion.Helpers;
 using GitVersion.Logging;
@@ -41,4 +39,4 @@ public override string[] GenerateSetParameterMessage(string name, string value)
     public override string? GenerateSetVersionMessage(VersionVariables variables) => null;
 
     public override bool PreventFetch() => false;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/SpaceAutomation.cs b/src/GitVersion.Core/BuildAgents/SpaceAutomation.cs
index ea5df2564d..c54b42f914 100644
--- a/src/GitVersion.Core/BuildAgents/SpaceAutomation.cs
+++ b/src/GitVersion.Core/BuildAgents/SpaceAutomation.cs
@@ -15,7 +15,7 @@ public SpaceAutomation(IEnvironment environment, ILog log) : base(environment, l
 
     public override string? GetCurrentBranch(bool usingDynamicRepos) => Environment.GetEnvironmentVariable("JB_SPACE_GIT_BRANCH");
 
-    public override string[] GenerateSetParameterMessage(string name, string value) => System.Array.Empty<string>();
+    public override string[] GenerateSetParameterMessage(string name, string value) => Array.Empty<string>();
 
     public override string GenerateSetVersionMessage(VersionVariables variables) => string.Empty;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/TeamCity.cs b/src/GitVersion.Core/BuildAgents/TeamCity.cs
index 95fd049b3e..5ef73d5b71 100644
--- a/src/GitVersion.Core/BuildAgents/TeamCity.cs
+++ b/src/GitVersion.Core/BuildAgents/TeamCity.cs
@@ -46,4 +46,4 @@ public override string[] GenerateSetParameterMessage(string name, string value)
     };
 
     public override string GenerateSetVersionMessage(VersionVariables variables) => $"##teamcity[buildNumber '{ServiceMessageEscapeHelper.EscapeValue(variables.FullSemVer)}']";
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/BuildAgents/TravisCI.cs b/src/GitVersion.Core/BuildAgents/TravisCI.cs
index 1b5403fd12..ba3aaf18c4 100644
--- a/src/GitVersion.Core/BuildAgents/TravisCI.cs
+++ b/src/GitVersion.Core/BuildAgents/TravisCI.cs
@@ -22,4 +22,4 @@ public override string[] GenerateSetParameterMessage(string name, string value)
     };
 
     public override bool PreventFetch() => true;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Abstractions/IBranchConfigurationCalculator.cs b/src/GitVersion.Core/Configuration/Abstractions/IBranchConfigurationCalculator.cs
index 7e6092e773..ed49a4e085 100644
--- a/src/GitVersion.Core/Configuration/Abstractions/IBranchConfigurationCalculator.cs
+++ b/src/GitVersion.Core/Configuration/Abstractions/IBranchConfigurationCalculator.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Model.Configuration;
 
 namespace GitVersion.Configuration;
@@ -9,4 +8,4 @@ public interface IBranchConfigurationCalculator
     /// Gets the <see cref="BranchConfig"/> for the current commit.
     /// </summary>
     BranchConfig GetBranchConfiguration(IBranch targetBranch, ICommit? currentCommit, Config configuration, IList<IBranch>? excludedInheritBranches = null);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Abstractions/IConfigFileLocator.cs b/src/GitVersion.Core/Configuration/Abstractions/IConfigFileLocator.cs
index 5951d88096..3cacf7f676 100644
--- a/src/GitVersion.Core/Configuration/Abstractions/IConfigFileLocator.cs
+++ b/src/GitVersion.Core/Configuration/Abstractions/IConfigFileLocator.cs
@@ -11,4 +11,4 @@ public interface IConfigFileLocator
     void Verify(string workingDirectory, string projectRootDirectory);
     string SelectConfigFilePath(GitVersionOptions gitVersionOptions, IGitRepositoryInfo repositoryInfo);
     Config ReadConfig(string? workingDirectory);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Abstractions/IConfigProvider.cs b/src/GitVersion.Core/Configuration/Abstractions/IConfigProvider.cs
index 0c4bb44a92..d7b26dfae5 100644
--- a/src/GitVersion.Core/Configuration/Abstractions/IConfigProvider.cs
+++ b/src/GitVersion.Core/Configuration/Abstractions/IConfigProvider.cs
@@ -7,4 +7,4 @@ public interface IConfigProvider
     Config Provide(Config? overrideConfig = null);
     Config Provide(string workingDirectory, Config? overrideConfig = null);
     void Init(string workingDirectory);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/BranchConfigurationCalculator.cs b/src/GitVersion.Core/Configuration/BranchConfigurationCalculator.cs
index 9422d80c0e..3fbf5faac3 100644
--- a/src/GitVersion.Core/Configuration/BranchConfigurationCalculator.cs
+++ b/src/GitVersion.Core/Configuration/BranchConfigurationCalculator.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.RegularExpressions;
 using GitVersion.Common;
 using GitVersion.Extensions;
@@ -261,4 +258,4 @@ public int GetHashCode(IBranch b)
             return b.Name.WithoutRemote.GetHashCode();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/ConfigExtensions.cs b/src/GitVersion.Core/Configuration/ConfigExtensions.cs
index 7f4aec2833..b0180cc3a5 100644
--- a/src/GitVersion.Core/Configuration/ConfigExtensions.cs
+++ b/src/GitVersion.Core/Configuration/ConfigExtensions.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 using GitVersion.Logging;
@@ -145,4 +142,4 @@ public static string GetBranchSpecificTag(this EffectiveConfiguration configurat
         configuration.Branches
             .Where(b => b.Value?.IsReleaseBranch == true)
             .ToList();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/ConfigFileLocator.cs b/src/GitVersion.Core/Configuration/ConfigFileLocator.cs
index 2d478d7c1a..7b656d6eb4 100644
--- a/src/GitVersion.Core/Configuration/ConfigFileLocator.cs
+++ b/src/GitVersion.Core/Configuration/ConfigFileLocator.cs
@@ -1,5 +1,3 @@
-using System.IO;
-using System.Linq;
 using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
 using GitVersion.VersionCalculation;
@@ -103,4 +101,4 @@ private void WarnAboutAmbiguousConfigFileSelection(string? workingDirectory, str
                 throw new WarningException($"The configuration file was not found at '{workingConfigFile}' or '{projectRootConfigFile}'");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/ConfigProvider.cs b/src/GitVersion.Core/Configuration/ConfigProvider.cs
index ce9d6fea35..5143a0b2b6 100644
--- a/src/GitVersion.Core/Configuration/ConfigProvider.cs
+++ b/src/GitVersion.Core/Configuration/ConfigProvider.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
@@ -57,4 +55,4 @@ public void Init(string workingDirectory)
         ConfigSerializer.Write(config, writer);
         stream.Flush();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/ConfigSerializer.cs b/src/GitVersion.Core/Configuration/ConfigSerializer.cs
index 8d87636252..2a07c58fd8 100644
--- a/src/GitVersion.Core/Configuration/ConfigSerializer.cs
+++ b/src/GitVersion.Core/Configuration/ConfigSerializer.cs
@@ -1,4 +1,3 @@
-using System.IO;
 using GitVersion.Model.Configuration;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
@@ -24,4 +23,4 @@ public static void Write(Config config, TextWriter writer)
             .Build();
         serializer.Serialize(writer, config);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs b/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs
index 4cd953bdf2..58ab331eca 100644
--- a/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs
+++ b/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
 using GitVersion.VersionCalculation;
@@ -286,4 +283,4 @@ void AddBranchConfig(string name, BranchConfig overrides)
             config.Branches[name] = BranchConfig.CreateDefaultBranchConfig(name).Apply(overrides);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/ConfigurationModule.cs b/src/GitVersion.Core/Configuration/ConfigurationModule.cs
index ce8448a555..cadd2afb47 100644
--- a/src/GitVersion.Core/Configuration/ConfigurationModule.cs
+++ b/src/GitVersion.Core/Configuration/ConfigurationModule.cs
@@ -14,4 +14,4 @@ public void RegisterTypes(IServiceCollection services)
         services.AddSingleton<IConfigFileLocator, ConfigFileLocator>();
         services.AddSingleton<IBranchConfigurationCalculator, BranchConfigurationCalculator>();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/BuildServer/AppVeyorSetup.cs b/src/GitVersion.Core/Configuration/Init/BuildServer/AppVeyorSetup.cs
index b561cf52e7..f08c1d4363 100644
--- a/src/GitVersion.Core/Configuration/Init/BuildServer/AppVeyorSetup.cs
+++ b/src/GitVersion.Core/Configuration/Init/BuildServer/AppVeyorSetup.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
 using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
@@ -133,4 +129,4 @@ private static string GetOutputFilename(string workingDirectory, IFileSystem fil
     private static bool AppVeyorConfigExists(string workingDirectory, IFileSystem fileSystem) => fileSystem.Exists(Path.Combine(workingDirectory, "appveyor.yml"));
 
     protected override string DefaultResult => "0";
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/BuildServer/AppveyorPublicPrivate.cs b/src/GitVersion.Core/Configuration/Init/BuildServer/AppveyorPublicPrivate.cs
index 53c37a29bd..e6bb7c935e 100644
--- a/src/GitVersion.Core/Configuration/Init/BuildServer/AppveyorPublicPrivate.cs
+++ b/src/GitVersion.Core/Configuration/Init/BuildServer/AppveyorPublicPrivate.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
@@ -37,4 +36,4 @@ That is ... does it require authentication to clone/pull?
 2) Private";
 
     protected override string DefaultResult => "0";
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/BuildServer/SetupBuildScripts.cs b/src/GitVersion.Core/Configuration/Init/BuildServer/SetupBuildScripts.cs
index 1e407870f6..8654e2d0c1 100644
--- a/src/GitVersion.Core/Configuration/Init/BuildServer/SetupBuildScripts.cs
+++ b/src/GitVersion.Core/Configuration/Init/BuildServer/SetupBuildScripts.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
@@ -33,4 +32,4 @@ Want to see more? Contribute a pull request!
 1) AppVeyor";
 
     protected override string DefaultResult => "0";
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/EditConfigStep.cs b/src/GitVersion.Core/Configuration/Init/EditConfigStep.cs
index d1873b3d96..d018fd13a1 100644
--- a/src/GitVersion.Core/Configuration/Init/EditConfigStep.cs
+++ b/src/GitVersion.Core/Configuration/Init/EditConfigStep.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Configuration.Init.BuildServer;
 using GitVersion.Configuration.Init.SetConfig;
 using GitVersion.Configuration.Init.Wizard;
@@ -61,4 +60,4 @@ protected override string GetPrompt(Config config, string workingDirectory) => $
 7) Setup build scripts";
 
     protected override string? DefaultResult => null;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/GitVersionInitModule.cs b/src/GitVersion.Core/Configuration/Init/GitVersionInitModule.cs
index b47fc45a2c..156fca30c7 100644
--- a/src/GitVersion.Core/Configuration/Init/GitVersionInitModule.cs
+++ b/src/GitVersion.Core/Configuration/Init/GitVersionInitModule.cs
@@ -1,4 +1,3 @@
-using System.Reflection;
 using GitVersion.Configuration.Init.Wizard;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -18,4 +17,4 @@ public override void RegisterTypes(IServiceCollection services)
             services.AddTransient(step);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/SetConfig/AssemblyVersioningSchemeSetting.cs b/src/GitVersion.Core/Configuration/Init/SetConfig/AssemblyVersioningSchemeSetting.cs
index 346a967a5e..ed0d3ae8c2 100644
--- a/src/GitVersion.Core/Configuration/Init/SetConfig/AssemblyVersioningSchemeSetting.cs
+++ b/src/GitVersion.Core/Configuration/Init/SetConfig/AssemblyVersioningSchemeSetting.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Extensions;
 using GitVersion.Logging;
@@ -55,4 +54,4 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
 5) None (skip's updating AssemblyVersion)";
 
     protected override string DefaultResult => "0";
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranch.cs b/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranch.cs
index 1ee9e75537..2252a3129b 100644
--- a/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranch.cs
+++ b/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranch.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
@@ -46,4 +45,4 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
 2) Branch Increment mode (per commit/after tag) (Current: {this.branchConfig.VersioningMode})";
 
     protected override string DefaultResult => "0";
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranches.cs b/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranches.cs
index fc1114defe..0831a013b9 100644
--- a/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranches.cs
+++ b/src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranches.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
@@ -59,4 +56,4 @@ protected override string GetPrompt(Config config, string workingDirectory) => @
     }
 
     protected override string DefaultResult => "0";
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/SetConfig/GlobalModeSetting.cs b/src/GitVersion.Core/Configuration/Init/SetConfig/GlobalModeSetting.cs
index 6c05d48134..610188ed39 100644
--- a/src/GitVersion.Core/Configuration/Init/SetConfig/GlobalModeSetting.cs
+++ b/src/GitVersion.Core/Configuration/Init/SetConfig/GlobalModeSetting.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
@@ -55,4 +54,4 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
 {(this.isPartOfWizard ? "4) Skip" : string.Empty)}";
 
     protected override string DefaultResult => "4";
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchIncrementMode.cs b/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchIncrementMode.cs
index b4cd66c3ee..9a4908582f 100644
--- a/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchIncrementMode.cs
+++ b/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchIncrementMode.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
@@ -50,4 +49,4 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
 2) Increment based on branch config every commit (continuous deployment mode)";
 
     protected override string DefaultResult => "0";
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchTag.cs b/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchTag.cs
index e67120ce47..3f19fce780 100644
--- a/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchTag.cs
+++ b/src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchTag.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Extensions;
 using GitVersion.Logging;
@@ -54,4 +53,4 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
 Anything else will be used as the tag";
 
     protected override string DefaultResult => "0";
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/SetNextVersion.cs b/src/GitVersion.Core/Configuration/Init/SetNextVersion.cs
index dd515bc16d..6cbe889258 100644
--- a/src/GitVersion.Core/Configuration/Init/SetNextVersion.cs
+++ b/src/GitVersion.Core/Configuration/Init/SetNextVersion.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Configuration.Init.Wizard;
 using GitVersion.Extensions;
 using GitVersion.Logging;
@@ -32,4 +31,4 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
     protected override string GetPrompt(Config config, string workingDirectory) => @"What would you like to set the next version to (enter nothing to cancel)?";
 
     protected override string? DefaultResult => null;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/StepResult.cs b/src/GitVersion.Core/Configuration/Init/StepResult.cs
index e7c6c86a95..b3cd1ea9ee 100644
--- a/src/GitVersion.Core/Configuration/Init/StepResult.cs
+++ b/src/GitVersion.Core/Configuration/Init/StepResult.cs
@@ -28,4 +28,4 @@ private StepResult() { }
     public bool Save { get; private set; }
 
     public bool InvalidResponse { get; private set; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitStepFactory.cs b/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitStepFactory.cs
index 3643a2abff..20731b1042 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitStepFactory.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitStepFactory.cs
@@ -1,4 +1,3 @@
-using System;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace GitVersion.Configuration.Init.Wizard;
@@ -14,4 +13,4 @@ public ConfigInitStepFactory()
     public ConfigInitStepFactory(IServiceProvider sp) => this.sp = sp ?? throw new ArgumentNullException(nameof(sp));
 
     public T? CreateStep<T>() => this.sp!.GetService<T>();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizard.cs b/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizard.cs
index 77e9a7188b..b6fd700b4f 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizard.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizard.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
@@ -33,4 +31,4 @@ public ConfigInitWizard(IConsole console, IConfigInitStepFactory stepFactory)
 
         return config;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizardStep.cs b/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizardStep.cs
index d955c05d13..c81361a3a4 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizardStep.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizardStep.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitVersion.Extensions;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
@@ -69,4 +67,4 @@ private void InvalidResponse(Queue<ConfigInitWizardStep> steps)
     protected abstract StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory);
     protected abstract string GetPrompt(Config config, string workingDirectory);
     protected abstract string? DefaultResult { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/FinishedSetupStep.cs b/src/GitVersion.Core/Configuration/Init/Wizard/FinishedSetupStep.cs
index 8ec836ba49..185c903125 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/FinishedSetupStep.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/FinishedSetupStep.cs
@@ -10,4 +10,4 @@ public FinishedSetupStep(IConsole console, IFileSystem fileSystem, ILog log, ICo
     }
 
     protected override string GetPrompt(Config config, string workingDirectory) => $"Questions are all done, you can now edit GitVersion's configuration further{System.Environment.NewLine}" + base.GetPrompt(config, workingDirectory);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/GitFlowSetupStep.cs b/src/GitVersion.Core/Configuration/Init/Wizard/GitFlowSetupStep.cs
index 433ce60f83..4df17baa97 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/GitFlowSetupStep.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/GitFlowSetupStep.cs
@@ -12,4 +12,4 @@ public GitFlowSetupStep(IConsole console, IFileSystem fileSystem, ILog log, ICon
 
     protected override string GetPrompt(Config config, string workingDirectory) => $"By default GitVersion will only increment the version of the 'develop' branch every commit, all other branches will increment when tagged{System.Environment.NewLine}{System.Environment.NewLine}" +
                                                                                    base.GetPrompt(config, workingDirectory);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/GitHubFlowStep.cs b/src/GitVersion.Core/Configuration/Init/Wizard/GitHubFlowStep.cs
index d692aa3172..e0ea2bc4b5 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/GitHubFlowStep.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/GitHubFlowStep.cs
@@ -11,4 +11,4 @@ public GitHubFlowStep(IConsole console, IFileSystem fileSystem, ILog log, IConfi
     }
 
     protected override string GetPrompt(Config config, string workingDirectory) => $"By default GitVersion will only increment the version when tagged{System.Environment.NewLine}{System.Environment.NewLine}" + base.GetPrompt(config, workingDirectory);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitStepFactory.cs b/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitStepFactory.cs
index 5534e4776e..19a8b14ed8 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitStepFactory.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitStepFactory.cs
@@ -3,4 +3,4 @@ namespace GitVersion.Configuration.Init.Wizard;
 public interface IConfigInitStepFactory
 {
     T? CreateStep<T>();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitWizard.cs b/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitWizard.cs
index 5c45e5a9ac..54c67cf81d 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitWizard.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/IConfigInitWizard.cs
@@ -5,4 +5,4 @@ namespace GitVersion.Configuration.Init.Wizard;
 public interface IConfigInitWizard
 {
     Config? Run(Config config, string workingDirectory);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy1Step.cs b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy1Step.cs
index aee342b28b..6f7002f46f 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy1Step.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy1Step.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
@@ -28,9 +27,9 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
         return StepResult.InvalidResponseSelected();
     }
 
-    protected override string GetPrompt(Config config, string workingDirectory) => @"GitVersion can try to recommend you a branching strategy based on a few questions. 
+    protected override string GetPrompt(Config config, string workingDirectory) => @"GitVersion can try to recommend you a branching strategy based on a few questions.
 
 Do you need to maintain multiple versions of your application simultaneously in production? (y/n)";
 
     protected override string? DefaultResult => null;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy2Step.cs b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy2Step.cs
index d46c98d61b..8f3c8e6652 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy2Step.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy2Step.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
@@ -34,4 +33,4 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
     protected override string GetPrompt(Config config, string workingDirectory) => "Do you stabilise releases while continuing work on the next version? (y/n)";
 
     protected override string? DefaultResult => null;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy3Step.cs b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy3Step.cs
index adb783fb79..846858a323 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy3Step.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategy3Step.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
@@ -35,4 +34,4 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
     protected override string GetPrompt(Config config, string workingDirectory) => "Do you need to build nightlies or consume packages the CI build creates without releasing those versions? (y/n)";
 
     protected override string? DefaultResult => null;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategyStep.cs b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategyStep.cs
index 05aa71e43e..61445bd6c5 100644
--- a/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategyStep.cs
+++ b/src/GitVersion.Core/Configuration/Init/Wizard/PickBranchingStrategyStep.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
 
@@ -38,4 +37,4 @@ protected override string GetPrompt(Config config, string workingDirectory) => @
 3) Unsure, tell me more";
 
     protected override string? DefaultResult => null;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/Abstractions/IEnvironment.cs b/src/GitVersion.Core/Core/Abstractions/IEnvironment.cs
index 8f0b2aa66c..5878dfb3f3 100644
--- a/src/GitVersion.Core/Core/Abstractions/IEnvironment.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IEnvironment.cs
@@ -4,4 +4,4 @@ public interface IEnvironment
 {
     string? GetEnvironmentVariable(string variableName);
     void SetEnvironmentVariable(string variableName, string value);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/Abstractions/IFileSystem.cs b/src/GitVersion.Core/Core/Abstractions/IFileSystem.cs
index f938bee23c..b316a76f7e 100644
--- a/src/GitVersion.Core/Core/Abstractions/IFileSystem.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IFileSystem.cs
@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
 namespace GitVersion;
 
 public interface IFileSystem
@@ -21,4 +17,4 @@ public interface IFileSystem
     long GetLastDirectoryWrite(string path);
 
     bool PathsEqual(string? path, string? otherPath);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/Abstractions/IGitPreparer.cs b/src/GitVersion.Core/Core/Abstractions/IGitPreparer.cs
index 80ace64071..8fede694f1 100644
--- a/src/GitVersion.Core/Core/Abstractions/IGitPreparer.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IGitPreparer.cs
@@ -4,4 +4,4 @@ public interface IGitPreparer
 {
     void Prepare();
     void EnsureLocalBranchExistsForCurrentBranch(IRemote remote, string currentBranch);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/Abstractions/IGitVersionCalculateTool.cs b/src/GitVersion.Core/Core/Abstractions/IGitVersionCalculateTool.cs
index 390455e5d4..94f2e5c1d0 100644
--- a/src/GitVersion.Core/Core/Abstractions/IGitVersionCalculateTool.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IGitVersionCalculateTool.cs
@@ -5,4 +5,4 @@ namespace GitVersion;
 public interface IGitVersionCalculateTool
 {
     VersionVariables CalculateVersionVariables();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/Abstractions/IGitVersionContextFactory.cs b/src/GitVersion.Core/Core/Abstractions/IGitVersionContextFactory.cs
index 4732b8e871..8b4a849776 100644
--- a/src/GitVersion.Core/Core/Abstractions/IGitVersionContextFactory.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IGitVersionContextFactory.cs
@@ -3,4 +3,4 @@ namespace GitVersion;
 public interface IGitVersionContextFactory
 {
     GitVersionContext Create(GitVersionOptions? gitVersionOptions);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/Abstractions/IGitVersionModule.cs b/src/GitVersion.Core/Core/Abstractions/IGitVersionModule.cs
index 0b1594ff5c..e1461d9fc2 100644
--- a/src/GitVersion.Core/Core/Abstractions/IGitVersionModule.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IGitVersionModule.cs
@@ -5,4 +5,4 @@ namespace GitVersion;
 public interface IGitVersionModule
 {
     void RegisterTypes(IServiceCollection services);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/Abstractions/IGitVersionOutputTool.cs b/src/GitVersion.Core/Core/Abstractions/IGitVersionOutputTool.cs
index e9875b9fe6..a20f5a9ecf 100644
--- a/src/GitVersion.Core/Core/Abstractions/IGitVersionOutputTool.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IGitVersionOutputTool.cs
@@ -8,4 +8,4 @@ public interface IGitVersionOutputTool
     void UpdateAssemblyInfo(VersionVariables variables);
     void UpdateWixVersionFile(VersionVariables variables);
     void GenerateGitVersionInformation(VersionVariables variables, FileWriteInfo fileWriteInfo);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs b/src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs
index 02890307a2..213ab2f245 100644
--- a/src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitVersion.Model.Configuration;
 using GitVersion.VersionCalculation;
 
@@ -43,4 +41,4 @@ public interface IRepositoryStore
     VersionField? DetermineIncrementedField(BaseVersion baseVersion, GitVersionContext context);
 
     int GetNumberOfUncommittedChanges();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/Environment.cs b/src/GitVersion.Core/Core/Environment.cs
index 955eef8f04..fcb58b5dbe 100644
--- a/src/GitVersion.Core/Core/Environment.cs
+++ b/src/GitVersion.Core/Core/Environment.cs
@@ -5,4 +5,4 @@ public class Environment : IEnvironment
     public string? GetEnvironmentVariable(string variableName) => System.Environment.GetEnvironmentVariable(variableName);
 
     public void SetEnvironmentVariable(string variableName, string value) => System.Environment.SetEnvironmentVariable(variableName, value);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/FileSystem.cs b/src/GitVersion.Core/Core/FileSystem.cs
index cc8b9a5344..04ce5591c5 100644
--- a/src/GitVersion.Core/Core/FileSystem.cs
+++ b/src/GitVersion.Core/Core/FileSystem.cs
@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
 using GitVersion.Helpers;
 
 namespace GitVersion;
@@ -52,4 +48,4 @@ public bool PathsEqual(string? path, string? otherPath) =>
             Path.GetFullPath(path).TrimEnd('\\').TrimEnd('/'),
             Path.GetFullPath(otherPath).TrimEnd('\\').TrimEnd('/'),
             StringComparerUtils.OsDependentComparison);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/GitPreparer.cs b/src/GitVersion.Core/Core/GitPreparer.cs
index 5140fe0d04..496ac1b1fc 100644
--- a/src/GitVersion.Core/Core/GitPreparer.cs
+++ b/src/GitVersion.Core/Core/GitPreparer.cs
@@ -1,6 +1,3 @@
-using System;
-using System.IO;
-using System.Linq;
 using GitVersion.BuildAgents;
 using GitVersion.Common;
 using GitVersion.Extensions;
@@ -393,4 +390,4 @@ public void EnsureLocalBranchExistsForCurrentBranch(IRemote? remote, string? cur
     }
 
     private void Checkout(string commitOrBranchSpec) => this.retryAction.Execute(() => this.repository.Checkout(commitOrBranchSpec));
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/GitVersionCalculateTool.cs b/src/GitVersion.Core/Core/GitVersionCalculateTool.cs
index afffb8a661..3b23f852ac 100644
--- a/src/GitVersion.Core/Core/GitVersionCalculateTool.cs
+++ b/src/GitVersion.Core/Core/GitVersionCalculateTool.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 using GitVersion.VersionCalculation;
@@ -64,4 +63,4 @@ public VersionVariables CalculateVersionVariables()
 
         return versionVariables;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/GitVersionContextFactory.cs b/src/GitVersion.Core/Core/GitVersionContextFactory.cs
index b403f11a72..69a7e2afc8 100644
--- a/src/GitVersion.Core/Core/GitVersionContextFactory.cs
+++ b/src/GitVersion.Core/Core/GitVersionContextFactory.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Common;
 using GitVersion.Configuration;
 using GitVersion.Extensions;
@@ -44,4 +43,4 @@ public GitVersionContext Create(GitVersionOptions? gitVersionOptions)
 
         return new GitVersionContext(currentBranch, currentCommit, configuration, effectiveConfiguration, currentCommitTaggedVersion, numberOfUncommittedChanges);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/GitVersionModule.cs b/src/GitVersion.Core/Core/GitVersionModule.cs
index c11a181b98..3762aeb2ec 100644
--- a/src/GitVersion.Core/Core/GitVersionModule.cs
+++ b/src/GitVersion.Core/Core/GitVersionModule.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace GitVersion;
@@ -15,4 +11,4 @@ protected static IEnumerable<Type> FindAllDerivedTypes<T>(Assembly assembly)
         var derivedType = typeof(T);
         return assembly.GetTypes().Where(t => t != derivedType && derivedType.IsAssignableFrom(t));
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/GitVersionOutputTool.cs b/src/GitVersion.Core/Core/GitVersionOutputTool.cs
index 449024e383..96099e635e 100644
--- a/src/GitVersion.Core/Core/GitVersionOutputTool.cs
+++ b/src/GitVersion.Core/Core/GitVersionOutputTool.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Linq;
 using GitVersion.OutputVariables;
 using GitVersion.VersionConverters.AssemblyInfo;
 using GitVersion.VersionConverters.GitVersionInfo;
@@ -86,4 +84,4 @@ public void GenerateGitVersionInformation(VersionVariables variables, FileWriteI
             this.gitVersionInfoGenerator.Execute(variables, new GitVersionInfoContext(gitVersionOptions.WorkingDirectory, fileWriteInfo.FileName, fileWriteInfo.FileExtension));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Core/RepositoryStore.cs b/src/GitVersion.Core/Core/RepositoryStore.cs
index 1a0fa0b8c8..3e82e5c317 100644
--- a/src/GitVersion.Core/Core/RepositoryStore.cs
+++ b/src/GitVersion.Core/Core/RepositoryStore.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.RegularExpressions;
 using GitVersion.Common;
 using GitVersion.Configuration;
@@ -491,4 +488,4 @@ private ICommit GetForwardMerge(ICommit? commitToFindCommonBase, ICommit? findMe
     public ICommit FindMergeBase(ICommit commit, ICommit mainlineTip) => this.repository.FindMergeBase(commit, mainlineTip);
 
     public int GetNumberOfUncommittedChanges() => this.repository.GetNumberOfUncommittedChanges();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Extensions/AssemblyVersionsGeneratorExtensions.cs b/src/GitVersion.Core/Extensions/AssemblyVersionsGeneratorExtensions.cs
index eb2ee22814..d92d63d559 100644
--- a/src/GitVersion.Core/Extensions/AssemblyVersionsGeneratorExtensions.cs
+++ b/src/GitVersion.Core/Extensions/AssemblyVersionsGeneratorExtensions.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion.Extensions;
 
 public enum AssemblyFileVersioningScheme
@@ -43,4 +41,4 @@ public static class AssemblyVersionsGeneratorExtensions
             AssemblyFileVersioningScheme.None => null,
             _ => throw new ArgumentException($"Unexpected value ({scheme}).", nameof(scheme))
         };
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Extensions/DictionaryExtensions.cs b/src/GitVersion.Core/Extensions/DictionaryExtensions.cs
index c9b64ffb42..ade4ffb7c6 100644
--- a/src/GitVersion.Core/Extensions/DictionaryExtensions.cs
+++ b/src/GitVersion.Core/Extensions/DictionaryExtensions.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace GitVersion.Extensions;
 
 public static class DictionaryExtensions
@@ -16,4 +13,4 @@ public static TValue GetOrAdd<TKey, TValue>(this IDictionary<TKey, TValue> dict,
         }
         return value;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Extensions/EnumerableExtensions.cs b/src/GitVersion.Core/Extensions/EnumerableExtensions.cs
index f6a9a5dea4..bc11eca4b9 100644
--- a/src/GitVersion.Core/Extensions/EnumerableExtensions.cs
+++ b/src/GitVersion.Core/Extensions/EnumerableExtensions.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace GitVersion.Extensions;
 
 public static class EnumerableExtensions
@@ -24,4 +21,4 @@ public static class EnumerableExtensions
 
         return default;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Extensions/GitExtensions.cs b/src/GitVersion.Core/Extensions/GitExtensions.cs
index dd757f8856..e17bee2207 100644
--- a/src/GitVersion.Core/Extensions/GitExtensions.cs
+++ b/src/GitVersion.Core/Extensions/GitExtensions.cs
@@ -1,6 +1,3 @@
-using System;
-using System.IO;
-using System.Text;
 using GitVersion.Helpers;
 
 namespace GitVersion.Extensions;
@@ -46,4 +43,4 @@ public static string CreateGitLogArgs(int? maxCommits)
         var commits = maxCommits != null ? $" -n {maxCommits}" : null;
         return $@"log --graph --format=""%h %cr %d"" --decorate --date=relative --all --remotes=*{commits}";
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Extensions/NullableAttributes.cs b/src/GitVersion.Core/Extensions/NullableAttributes.cs
index 3df9652342..f6df1b4327 100644
--- a/src/GitVersion.Core/Extensions/NullableAttributes.cs
+++ b/src/GitVersion.Core/Extensions/NullableAttributes.cs
@@ -144,4 +144,4 @@ public MemberNotNullWhenAttribute(bool returnValue, params string[] members)
     public string[] Members { get; }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/GitVersion.Core/Extensions/ObjectExtensions.cs b/src/GitVersion.Core/Extensions/ObjectExtensions.cs
index 7a2d5d1c47..22b8e56674 100644
--- a/src/GitVersion.Core/Extensions/ObjectExtensions.cs
+++ b/src/GitVersion.Core/Extensions/ObjectExtensions.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace GitVersion.Extensions;
 
 public static class ObjectExtensions
@@ -26,4 +22,4 @@ public static IEnumerable<KeyValuePair<string, string>> GetProperties(this objec
             .Where(p => p.PropertyType == type && !p.GetIndexParameters().Any() && !p.GetCustomAttributes(typeof(ReflectionIgnoreAttribute), false).Any())
             .Select(p => new KeyValuePair<string, string>(p.Name, (string)p.GetValue(obj, null)));
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Extensions/ReadEmbeddedResourceExtensions.cs b/src/GitVersion.Core/Extensions/ReadEmbeddedResourceExtensions.cs
index 6a4224941a..a48e242c53 100644
--- a/src/GitVersion.Core/Extensions/ReadEmbeddedResourceExtensions.cs
+++ b/src/GitVersion.Core/Extensions/ReadEmbeddedResourceExtensions.cs
@@ -1,11 +1,9 @@
-using System.IO;
-
 namespace GitVersion.Extensions;
 
 public static class ReadEmbeddedResourceExtensions
 {
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="resourceName">Should include Namespace separated path to resource in assembly referenced by <typeparamref name="T"/></param>
@@ -23,4 +21,4 @@ private static Stream ReadFromEmbeddedResource<T>(this string resourceName)
 
         return assembly.GetManifestResourceStream(resourceName);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs b/src/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs
index 52f657fac8..d4d6467f3d 100644
--- a/src/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs
+++ b/src/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace GitVersion.Extensions;
@@ -14,4 +12,4 @@ public static IServiceCollection AddModule(this IServiceCollection serviceCollec
 
     public static TService GetServiceForType<TService, TType>(this IServiceProvider serviceProvider) =>
         serviceProvider.GetServices<TService>().SingleOrDefault(t => t?.GetType() == typeof(TType));
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Extensions/StringExtensions.cs b/src/GitVersion.Core/Extensions/StringExtensions.cs
index 2466e07414..b6069cd41d 100644
--- a/src/GitVersion.Core/Extensions/StringExtensions.cs
+++ b/src/GitVersion.Core/Extensions/StringExtensions.cs
@@ -1,8 +1,4 @@
-using System;
 using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 
 namespace GitVersion.Extensions;
@@ -105,4 +101,4 @@ public static bool IsEquivalentTo(this string self, string? other) =>
 
     /// <inheritdoc cref="string.IsNullOrWhiteSpace()"/>
     public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value) => string.IsNullOrWhiteSpace(value);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/CommitFilter.cs b/src/GitVersion.Core/Git/CommitFilter.cs
index 0c0d33ffc4..cb1972d8f4 100644
--- a/src/GitVersion.Core/Git/CommitFilter.cs
+++ b/src/GitVersion.Core/Git/CommitFilter.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion;
 
 public class CommitFilter
@@ -41,4 +39,4 @@ public enum CommitSortStrategies
     /// any of the above.
     /// </summary>
     Reverse = (1 << 2)
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/IBranch.cs b/src/GitVersion.Core/Git/IBranch.cs
index 6a0836a481..cb7f0f2f87 100644
--- a/src/GitVersion.Core/Git/IBranch.cs
+++ b/src/GitVersion.Core/Git/IBranch.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion;
 
 public interface IBranch : IEquatable<IBranch?>, IComparable<IBranch>, INamedReference
@@ -9,4 +7,4 @@ public interface IBranch : IEquatable<IBranch?>, IComparable<IBranch>, INamedRef
     bool IsTracking { get; }
     bool IsDetachedHead { get; }
     ICommitCollection? Commits { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/IBranchCollection.cs b/src/GitVersion.Core/Git/IBranchCollection.cs
index 8bcce0e5c8..ffb86439ad 100644
--- a/src/GitVersion.Core/Git/IBranchCollection.cs
+++ b/src/GitVersion.Core/Git/IBranchCollection.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace GitVersion;
 
 public interface IBranchCollection : IEnumerable<IBranch>
@@ -7,4 +5,4 @@ public interface IBranchCollection : IEnumerable<IBranch>
     IBranch? this[string name] { get; }
     IEnumerable<IBranch> ExcludeBranches(IEnumerable<IBranch> branchesToExclude);
     void UpdateTrackedBranch(IBranch branch, string remoteTrackingReferenceName);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/ICommit.cs b/src/GitVersion.Core/Git/ICommit.cs
index 6b4efb4e63..d9f27390fe 100644
--- a/src/GitVersion.Core/Git/ICommit.cs
+++ b/src/GitVersion.Core/Git/ICommit.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace GitVersion;
 
 public interface ICommit : IEquatable<ICommit?>, IComparable<ICommit>, IGitObject
@@ -8,4 +5,4 @@ public interface ICommit : IEquatable<ICommit?>, IComparable<ICommit>, IGitObjec
     IEnumerable<ICommit> Parents { get; }
     DateTimeOffset When { get; }
     string Message { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/ICommitCollection.cs b/src/GitVersion.Core/Git/ICommitCollection.cs
index 02322eba92..10d9723156 100644
--- a/src/GitVersion.Core/Git/ICommitCollection.cs
+++ b/src/GitVersion.Core/Git/ICommitCollection.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-
 namespace GitVersion;
 
 public interface ICommitCollection : IEnumerable<ICommit>
 {
     IEnumerable<ICommit> GetCommitsPriorTo(DateTimeOffset olderThan);
     IEnumerable<ICommit> QueryBy(CommitFilter commitFilter);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/IGitObject.cs b/src/GitVersion.Core/Git/IGitObject.cs
index 83bc5958ee..d125066ad7 100644
--- a/src/GitVersion.Core/Git/IGitObject.cs
+++ b/src/GitVersion.Core/Git/IGitObject.cs
@@ -1,9 +1,7 @@
-using System;
-
 namespace GitVersion;
 
 public interface IGitObject : IEquatable<IGitObject?>, IComparable<IGitObject>
 {
     IObjectId Id { get; }
     string Sha { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/IGitRepository.cs b/src/GitVersion.Core/Git/IGitRepository.cs
index a86438735e..73bc6f0d50 100644
--- a/src/GitVersion.Core/Git/IGitRepository.cs
+++ b/src/GitVersion.Core/Git/IGitRepository.cs
@@ -14,4 +14,4 @@ public interface IGitRepository
 
     ICommit FindMergeBase(ICommit commit, ICommit otherCommit);
     int GetNumberOfUncommittedChanges();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/IGitRepositoryInfo.cs b/src/GitVersion.Core/Git/IGitRepositoryInfo.cs
index 8d5376be3e..4e39080ee1 100644
--- a/src/GitVersion.Core/Git/IGitRepositoryInfo.cs
+++ b/src/GitVersion.Core/Git/IGitRepositoryInfo.cs
@@ -6,4 +6,4 @@ public interface IGitRepositoryInfo
     string? ProjectRootDirectory { get; }
     string? DynamicGitRepositoryPath { get; }
     string? GitRootPath { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/IMutatingGitRepository.cs b/src/GitVersion.Core/Git/IMutatingGitRepository.cs
index ec6dd4fc12..3924c4326e 100644
--- a/src/GitVersion.Core/Git/IMutatingGitRepository.cs
+++ b/src/GitVersion.Core/Git/IMutatingGitRepository.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace GitVersion;
 
 public interface IMutatingGitRepository : IGitRepository
@@ -8,4 +6,4 @@ public interface IMutatingGitRepository : IGitRepository
     void Checkout(string commitOrBranchSpec);
     void Fetch(string remote, IEnumerable<string> refSpecs, AuthenticationInfo auth, string? logMessage);
     void Clone(string? sourceUrl, string? workdirPath, AuthenticationInfo auth);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/INamedReference.cs b/src/GitVersion.Core/Git/INamedReference.cs
index 6ea1d91dfe..a138984514 100644
--- a/src/GitVersion.Core/Git/INamedReference.cs
+++ b/src/GitVersion.Core/Git/INamedReference.cs
@@ -3,4 +3,4 @@ namespace GitVersion;
 public interface INamedReference
 {
     ReferenceName Name { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/IObjectId.cs b/src/GitVersion.Core/Git/IObjectId.cs
index 765ce9d674..1140e04f1f 100644
--- a/src/GitVersion.Core/Git/IObjectId.cs
+++ b/src/GitVersion.Core/Git/IObjectId.cs
@@ -1,9 +1,7 @@
-using System;
-
 namespace GitVersion;
 
 public interface IObjectId : IEquatable<IObjectId?>, IComparable<IObjectId>
 {
     string Sha { get; }
     string ToString(int prefixLength);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/IRefSpec.cs b/src/GitVersion.Core/Git/IRefSpec.cs
index b64706ecf3..d21969e32a 100644
--- a/src/GitVersion.Core/Git/IRefSpec.cs
+++ b/src/GitVersion.Core/Git/IRefSpec.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion;
 
 public interface IRefSpec : IEquatable<IRefSpec?>, IComparable<IRefSpec>
@@ -8,4 +6,4 @@ public interface IRefSpec : IEquatable<IRefSpec?>, IComparable<IRefSpec>
     RefSpecDirection Direction { get; }
     string Source { get; }
     string Destination { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/IRefSpecCollection.cs b/src/GitVersion.Core/Git/IRefSpecCollection.cs
index 59e212a202..3ff492c0a3 100644
--- a/src/GitVersion.Core/Git/IRefSpecCollection.cs
+++ b/src/GitVersion.Core/Git/IRefSpecCollection.cs
@@ -1,7 +1,5 @@
-using System.Collections.Generic;
-
 namespace GitVersion;
 
 public interface IRefSpecCollection : IEnumerable<IRefSpec>
 {
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/IReference.cs b/src/GitVersion.Core/Git/IReference.cs
index 5f5ed48c63..7cb6132d1d 100644
--- a/src/GitVersion.Core/Git/IReference.cs
+++ b/src/GitVersion.Core/Git/IReference.cs
@@ -1,9 +1,7 @@
-using System;
-
 namespace GitVersion;
 
 public interface IReference : IEquatable<IReference?>, IComparable<IReference>, INamedReference
 {
     string TargetIdentifier { get; }
     IObjectId? ReferenceTargetId { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/IReferenceCollection.cs b/src/GitVersion.Core/Git/IReferenceCollection.cs
index f71a96ba5d..07d79d8ad7 100644
--- a/src/GitVersion.Core/Git/IReferenceCollection.cs
+++ b/src/GitVersion.Core/Git/IReferenceCollection.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace GitVersion;
 
 public interface IReferenceCollection : IEnumerable<IReference>
@@ -9,4 +7,4 @@ public interface IReferenceCollection : IEnumerable<IReference>
     void Add(string name, string canonicalRefNameOrObjectish, bool allowOverwrite = false);
     void UpdateTarget(IReference directRef, IObjectId targetId);
     IEnumerable<IReference> FromGlob(string prefix);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/IRemote.cs b/src/GitVersion.Core/Git/IRemote.cs
index 2bfe97c6d6..896b3edfda 100644
--- a/src/GitVersion.Core/Git/IRemote.cs
+++ b/src/GitVersion.Core/Git/IRemote.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace GitVersion;
 
 public interface IRemote : IEquatable<IRemote?>, IComparable<IRemote>
@@ -11,4 +8,4 @@ public interface IRemote : IEquatable<IRemote?>, IComparable<IRemote>
     IEnumerable<IRefSpec> RefSpecs { get; }
     IEnumerable<IRefSpec> FetchRefSpecs { get; }
     IEnumerable<IRefSpec> PushRefSpecs { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/IRemoteCollection.cs b/src/GitVersion.Core/Git/IRemoteCollection.cs
index 985363ac06..614177ac81 100644
--- a/src/GitVersion.Core/Git/IRemoteCollection.cs
+++ b/src/GitVersion.Core/Git/IRemoteCollection.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace GitVersion;
 
 public interface IRemoteCollection : IEnumerable<IRemote>
@@ -7,4 +5,4 @@ public interface IRemoteCollection : IEnumerable<IRemote>
     IRemote? this[string name] { get; }
     void Remove(string remoteName);
     void Update(string remoteName, string refSpec);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/ITag.cs b/src/GitVersion.Core/Git/ITag.cs
index 5389b9740e..a7e0185762 100644
--- a/src/GitVersion.Core/Git/ITag.cs
+++ b/src/GitVersion.Core/Git/ITag.cs
@@ -1,9 +1,7 @@
-using System;
-
 namespace GitVersion;
 
 public interface ITag : IEquatable<ITag?>, IComparable<ITag>, INamedReference
 {
     string TargetSha { get; }
     ICommit? PeeledTargetCommit();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/ITagCollection.cs b/src/GitVersion.Core/Git/ITagCollection.cs
index 82df491be5..c5e189c6b5 100644
--- a/src/GitVersion.Core/Git/ITagCollection.cs
+++ b/src/GitVersion.Core/Git/ITagCollection.cs
@@ -1,7 +1,5 @@
-using System.Collections.Generic;
-
 namespace GitVersion;
 
 public interface ITagCollection : IEnumerable<ITag>
 {
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/RefSpecDirection.cs b/src/GitVersion.Core/Git/RefSpecDirection.cs
index ea30c9aa32..9cca4404f6 100644
--- a/src/GitVersion.Core/Git/RefSpecDirection.cs
+++ b/src/GitVersion.Core/Git/RefSpecDirection.cs
@@ -4,4 +4,4 @@ public enum RefSpecDirection
 {
     Fetch,
     Push
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Git/ReferenceName.cs b/src/GitVersion.Core/Git/ReferenceName.cs
index b1514c172d..5009c5edcf 100644
--- a/src/GitVersion.Core/Git/ReferenceName.cs
+++ b/src/GitVersion.Core/Git/ReferenceName.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Helpers;
 
 namespace GitVersion;
@@ -77,4 +76,4 @@ private string RemoveRemote()
             : Friendly;
     }
     private static bool IsPrefixedBy(string input, string prefix) => input.StartsWith(prefix, StringComparison.Ordinal);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/GitVersionCoreModule.cs b/src/GitVersion.Core/GitVersionCoreModule.cs
index c2f61283fa..49fb64aa0a 100644
--- a/src/GitVersion.Core/GitVersionCoreModule.cs
+++ b/src/GitVersion.Core/GitVersionCoreModule.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.BuildAgents;
 using GitVersion.Common;
 using GitVersion.Configuration;
@@ -43,4 +42,4 @@ public void RegisterTypes(IServiceCollection services)
         services.AddModule(new VersionCalculationModule());
         services.AddModule(new VersionConvertersModule());
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Helpers/EncodingHelper.cs b/src/GitVersion.Core/Helpers/EncodingHelper.cs
index cd01ffdd83..4a83e24855 100644
--- a/src/GitVersion.Core/Helpers/EncodingHelper.cs
+++ b/src/GitVersion.Core/Helpers/EncodingHelper.cs
@@ -1,8 +1,3 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-
 namespace GitVersion.Helpers;
 
 public static class EncodingHelper
@@ -97,4 +92,4 @@ private static bool PreambleMatches(Encoding encoding, IList<byte> data)
 
         return !preamble.Where((preambleByte, index) => data[index] != preambleByte).Any();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Helpers/LambdaEqualityHelper.cs b/src/GitVersion.Core/Helpers/LambdaEqualityHelper.cs
index 927574a873..d8066f6095 100644
--- a/src/GitVersion.Core/Helpers/LambdaEqualityHelper.cs
+++ b/src/GitVersion.Core/Helpers/LambdaEqualityHelper.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion.Helpers;
 
 // From the LibGit2Sharp project (libgit2sharp.com)
@@ -55,4 +53,4 @@ public int GetHashCode(T instance)
 
         return hashCode;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Helpers/LambdaKeyComparer.cs b/src/GitVersion.Core/Helpers/LambdaKeyComparer.cs
index 315f406424..502a0f08e3 100644
--- a/src/GitVersion.Core/Helpers/LambdaKeyComparer.cs
+++ b/src/GitVersion.Core/Helpers/LambdaKeyComparer.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace GitVersion.Helpers;
 
 public class LambdaKeyComparer<TSource, TKey> : Comparer<TSource> where TSource : class
@@ -29,4 +26,4 @@ public override int Compare(TSource x, TSource y)
         var yKey = this.keySelector(y);
         return this.innerComparer.Compare(xKey, yKey);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Helpers/ProcessHelper.cs b/src/GitVersion.Core/Helpers/ProcessHelper.cs
index 8e1199f2ae..5d52577e3b 100644
--- a/src/GitVersion.Core/Helpers/ProcessHelper.cs
+++ b/src/GitVersion.Core/Helpers/ProcessHelper.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
 using System.Runtime.InteropServices;
-using System.Threading;
 using GitVersion.Extensions;
 
 namespace GitVersion.Helpers;
@@ -214,4 +209,4 @@ void IDisposable.Dispose()
         [DllImport("kernel32.dll")]
         private static extern int SetErrorMode(int newMode);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Helpers/RetryAction.cs b/src/GitVersion.Core/Helpers/RetryAction.cs
index ce96fef76b..319dc3d4e7 100644
--- a/src/GitVersion.Core/Helpers/RetryAction.cs
+++ b/src/GitVersion.Core/Helpers/RetryAction.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using Polly;
 using Polly.Retry;
 
@@ -70,4 +68,4 @@ private static IEnumerable<TimeSpan> Empty()
     {
         yield break;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Helpers/ServiceMessageEscapeHelper.cs b/src/GitVersion.Core/Helpers/ServiceMessageEscapeHelper.cs
index 89df924d08..8017515b98 100644
--- a/src/GitVersion.Core/Helpers/ServiceMessageEscapeHelper.cs
+++ b/src/GitVersion.Core/Helpers/ServiceMessageEscapeHelper.cs
@@ -19,4 +19,4 @@ public static class ServiceMessageEscapeHelper
 
         return value;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Helpers/StringComparerUtils.cs b/src/GitVersion.Core/Helpers/StringComparerUtils.cs
index a6fab9b350..850ee9c894 100644
--- a/src/GitVersion.Core/Helpers/StringComparerUtils.cs
+++ b/src/GitVersion.Core/Helpers/StringComparerUtils.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion.Helpers;
 
 public static class StringComparerUtils
@@ -7,4 +5,4 @@ public static class StringComparerUtils
     public static readonly StringComparer IgnoreCaseComparer = StringComparer.InvariantCultureIgnoreCase;
     public static readonly StringComparison OsDependentComparison = System.Environment.OSVersion.Platform == PlatformID.Unix ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;
     public static readonly StringComparer OsDependentComparer = System.Environment.OSVersion.Platform == PlatformID.Unix ? StringComparer.Ordinal : StringComparer.OrdinalIgnoreCase;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Helpers/StringFormatWith.cs b/src/GitVersion.Core/Helpers/StringFormatWith.cs
index 6093b1cebf..54ecec591b 100644
--- a/src/GitVersion.Core/Helpers/StringFormatWith.cs
+++ b/src/GitVersion.Core/Helpers/StringFormatWith.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Text.RegularExpressions;
 
@@ -76,4 +74,4 @@ public static string FormatWith<T>(this string template, T? source, IEnvironment
         body = Expression.Convert(body, typeof(object)); // Convert result in case the body produces a Nullable value type.
         return Expression.Lambda<Func<object?, object>>(body, param).Compile();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Logging/Abstractions/IConsole.cs b/src/GitVersion.Core/Logging/Abstractions/IConsole.cs
index d1f27d708f..78479cf3d0 100644
--- a/src/GitVersion.Core/Logging/Abstractions/IConsole.cs
+++ b/src/GitVersion.Core/Logging/Abstractions/IConsole.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion.Logging;
 
 public interface IConsole
@@ -9,4 +7,4 @@ public interface IConsole
     void Write(string msg);
     string ReadLine();
     IDisposable UseColor(ConsoleColor consoleColor);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Logging/Abstractions/ILog.cs b/src/GitVersion.Core/Logging/Abstractions/ILog.cs
index 20a2683e55..52ae0573cc 100644
--- a/src/GitVersion.Core/Logging/Abstractions/ILog.cs
+++ b/src/GitVersion.Core/Logging/Abstractions/ILog.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion.Logging;
 
 public interface ILog
@@ -8,4 +6,4 @@ public interface ILog
     void Write(Verbosity verbosity, LogLevel level, string format, params object[] args);
     IDisposable IndentLog(string operationDescription);
     void AddLogAppender(ILogAppender logAppender);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Logging/Abstractions/ILogAppender.cs b/src/GitVersion.Core/Logging/Abstractions/ILogAppender.cs
index 0da17e42ce..3cb255f142 100644
--- a/src/GitVersion.Core/Logging/Abstractions/ILogAppender.cs
+++ b/src/GitVersion.Core/Logging/Abstractions/ILogAppender.cs
@@ -3,4 +3,4 @@ namespace GitVersion.Logging;
 public interface ILogAppender
 {
     void WriteTo(LogLevel level, string message);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Logging/ConsoleAdapter.cs b/src/GitVersion.Core/Logging/ConsoleAdapter.cs
index 575673f4a9..80a7c42673 100644
--- a/src/GitVersion.Core/Logging/ConsoleAdapter.cs
+++ b/src/GitVersion.Core/Logging/ConsoleAdapter.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion.Logging;
 
 public class ConsoleAdapter : IConsole
@@ -19,4 +17,4 @@ public IDisposable UseColor(ConsoleColor consoleColor)
 
         return Disposable.Create(() => Console.ForegroundColor = old);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Logging/ConsoleAppender.cs b/src/GitVersion.Core/Logging/ConsoleAppender.cs
index 566ca90430..86831aef75 100644
--- a/src/GitVersion.Core/Logging/ConsoleAppender.cs
+++ b/src/GitVersion.Core/Logging/ConsoleAppender.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace GitVersion.Logging;
 
 public class ConsoleAppender : ILogAppender
@@ -59,4 +56,4 @@ public void WriteTo(LogLevel level, string message)
         };
         return palette;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Logging/Disposable.cs b/src/GitVersion.Core/Logging/Disposable.cs
index c682e8ef0a..358d289968 100644
--- a/src/GitVersion.Core/Logging/Disposable.cs
+++ b/src/GitVersion.Core/Logging/Disposable.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion.Logging;
 
 public static class Disposable
@@ -20,4 +18,4 @@ public void Dispose()
 
         private Action? disposer;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Logging/FileAppender.cs b/src/GitVersion.Core/Logging/FileAppender.cs
index 35c41d66eb..37c1657780 100644
--- a/src/GitVersion.Core/Logging/FileAppender.cs
+++ b/src/GitVersion.Core/Logging/FileAppender.cs
@@ -1,6 +1,3 @@
-using System;
-using System.IO;
-
 namespace GitVersion.Logging;
 
 public class FileAppender : ILogAppender
@@ -37,4 +34,4 @@ private static void WriteLogEntry(string logFilePath, string str)
         var contents = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss}\t\t{str}{System.Environment.NewLine}";
         File.AppendAllText(logFilePath, contents);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Logging/Log.cs b/src/GitVersion.Core/Logging/Log.cs
index 59efab7d16..a729ec181f 100644
--- a/src/GitVersion.Core/Logging/Log.cs
+++ b/src/GitVersion.Core/Logging/Log.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 
 namespace GitVersion.Logging;
@@ -67,4 +63,4 @@ private string FormatMessage(string message, string level)
         var obscuredMessage = this.obscurePasswordRegex.Replace(message, "$1$2:*******@");
         return string.Format(CultureInfo.InvariantCulture, "{0}{1} [{2:MM/dd/yy H:mm:ss:ff}] {3}", this.indent, level, DateTime.Now, obscuredMessage);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Logging/LogAction.cs b/src/GitVersion.Core/Logging/LogAction.cs
index bd4b01cbab..e0076f856e 100644
--- a/src/GitVersion.Core/Logging/LogAction.cs
+++ b/src/GitVersion.Core/Logging/LogAction.cs
@@ -2,4 +2,4 @@ namespace GitVersion.Logging;
 
 public delegate void LogAction(LogActionEntry actionEntry);
 
-public delegate void LogActionEntry(string format, params object[] args);
\ No newline at end of file
+public delegate void LogActionEntry(string format, params object[] args);
diff --git a/src/GitVersion.Core/Logging/LogExtensions.cs b/src/GitVersion.Core/Logging/LogExtensions.cs
index 08a30e2252..c8f0325684 100644
--- a/src/GitVersion.Core/Logging/LogExtensions.cs
+++ b/src/GitVersion.Core/Logging/LogExtensions.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace GitVersion.Logging;
 
 public static class LogExtensions
@@ -120,4 +117,4 @@ public static IDisposable WithVerbosity(this ILog log, Verbosity verbosity)
         { LogLevel.Error, Verbosity.Quiet },
         { LogLevel.Fatal, Verbosity.Quiet },
     };
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Logging/LogLevel.cs b/src/GitVersion.Core/Logging/LogLevel.cs
index e213029b4f..90f538bd1b 100644
--- a/src/GitVersion.Core/Logging/LogLevel.cs
+++ b/src/GitVersion.Core/Logging/LogLevel.cs
@@ -8,4 +8,4 @@ public enum LogLevel
     Info,
     Verbose,
     Debug
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Logging/NullLog.cs b/src/GitVersion.Core/Logging/NullLog.cs
index 79aed3165c..fb9ced94da 100644
--- a/src/GitVersion.Core/Logging/NullLog.cs
+++ b/src/GitVersion.Core/Logging/NullLog.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion.Logging;
 
 public sealed class NullLog : ILog
@@ -17,4 +15,4 @@ public void AddLogAppender(ILogAppender logAppender)
     }
 
     public string? Indent { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Logging/Verbosity.cs b/src/GitVersion.Core/Logging/Verbosity.cs
index 2a0a45ee1a..ee6b1218fd 100644
--- a/src/GitVersion.Core/Logging/Verbosity.cs
+++ b/src/GitVersion.Core/Logging/Verbosity.cs
@@ -7,4 +7,4 @@ public enum Verbosity
     Normal = 2,
     Verbose = 3,
     Diagnostic = 4
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/AssemblyInfoData.cs b/src/GitVersion.Core/Model/AssemblyInfoData.cs
index 93cfcc1b85..a3453d10ed 100644
--- a/src/GitVersion.Core/Model/AssemblyInfoData.cs
+++ b/src/GitVersion.Core/Model/AssemblyInfoData.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace GitVersion;
 
 public class AssemblyInfoData
@@ -8,4 +6,4 @@ public class AssemblyInfoData
     public bool UpdateProjectFiles;
     public bool EnsureAssemblyInfo;
     public ISet<string> Files = new HashSet<string>();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/AuthenticationInfo.cs b/src/GitVersion.Core/Model/AuthenticationInfo.cs
index 062a411cab..46cca8efd5 100644
--- a/src/GitVersion.Core/Model/AuthenticationInfo.cs
+++ b/src/GitVersion.Core/Model/AuthenticationInfo.cs
@@ -5,4 +5,4 @@ public class AuthenticationInfo
     public string? Username { get; set; }
     public string? Password { get; set; }
     public string? Token { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/BranchCommit.cs b/src/GitVersion.Core/Model/BranchCommit.cs
index f9425f6ea1..cf8daa4011 100644
--- a/src/GitVersion.Core/Model/BranchCommit.cs
+++ b/src/GitVersion.Core/Model/BranchCommit.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion;
 
 /// <summary>
@@ -33,4 +31,4 @@ public override int GetHashCode()
     public static bool operator ==(BranchCommit left, BranchCommit right) => left.Equals(right);
 
     public static bool operator !=(BranchCommit left, BranchCommit right) => !left.Equals(right);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/ConfigInfo.cs b/src/GitVersion.Core/Model/ConfigInfo.cs
index ece9bb11bd..822a0ba25d 100644
--- a/src/GitVersion.Core/Model/ConfigInfo.cs
+++ b/src/GitVersion.Core/Model/ConfigInfo.cs
@@ -7,4 +7,4 @@ public class ConfigInfo
     public string? ConfigFile;
     public Config? OverrideConfig;
     public bool ShowConfig;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/Configuration/BranchConfig.cs b/src/GitVersion.Core/Model/Configuration/BranchConfig.cs
index 1b17fd9a9f..f02556a0ab 100644
--- a/src/GitVersion.Core/Model/Configuration/BranchConfig.cs
+++ b/src/GitVersion.Core/Model/Configuration/BranchConfig.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitVersion.VersionCalculation;
 using JetBrains.Annotations;
 using YamlDotNet.Serialization;
@@ -123,4 +121,4 @@ public BranchConfig Apply([NotNull] BranchConfig overrides)
         IsReleaseBranch = false,
         IsMainline = false,
     };
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/Configuration/Config.cs b/src/GitVersion.Core/Model/Configuration/Config.cs
index b94a2f4654..3c7fa51fb3 100644
--- a/src/GitVersion.Core/Model/Configuration/Config.cs
+++ b/src/GitVersion.Core/Model/Configuration/Config.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
-using System.Text;
 using GitVersion.Configuration;
 using GitVersion.Extensions;
 using GitVersion.VersionCalculation;
@@ -123,4 +120,4 @@ public override string ToString()
     public const string HotfixBranchKey = "hotfix";
     public const string SupportBranchKey = "support";
     public const string DevelopBranchKey = "develop";
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/Configuration/EffectiveConfiguration.cs b/src/GitVersion.Core/Model/Configuration/EffectiveConfiguration.cs
index 058bc46f3a..38cb2c5baf 100644
--- a/src/GitVersion.Core/Model/Configuration/EffectiveConfiguration.cs
+++ b/src/GitVersion.Core/Model/Configuration/EffectiveConfiguration.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Extensions;
 using GitVersion.VersionCalculation;
 
@@ -128,4 +127,4 @@ public EffectiveConfiguration(
     public int PreReleaseWeight { get; private set; }
 
     public int TagPreReleaseWeight { get; private set; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/Configuration/IgnoreConfig.cs b/src/GitVersion.Core/Model/Configuration/IgnoreConfig.cs
index c2f424d745..0bf73bdca6 100644
--- a/src/GitVersion.Core/Model/Configuration/IgnoreConfig.cs
+++ b/src/GitVersion.Core/Model/Configuration/IgnoreConfig.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using GitVersion.VersionCalculation;
 using YamlDotNet.Serialization;
 
@@ -25,4 +22,4 @@ public virtual IEnumerable<IVersionFilter> ToFilters()
         if (ShAs.Any()) yield return new ShaVersionFilter(ShAs);
         if (Before.HasValue) yield return new MinDateVersionFilter(Before.Value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/Exceptions/BugException.cs b/src/GitVersion.Core/Model/Exceptions/BugException.cs
index 50e8e572b6..50ab60c127 100644
--- a/src/GitVersion.Core/Model/Exceptions/BugException.cs
+++ b/src/GitVersion.Core/Model/Exceptions/BugException.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion;
 
 public class BugException : Exception
@@ -7,4 +5,4 @@ public class BugException : Exception
     public BugException(string message) : base(message)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/Exceptions/ConfigurationException.cs b/src/GitVersion.Core/Model/Exceptions/ConfigurationException.cs
index 4e3f8e78a6..9eb11864f3 100644
--- a/src/GitVersion.Core/Model/Exceptions/ConfigurationException.cs
+++ b/src/GitVersion.Core/Model/Exceptions/ConfigurationException.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion.Configuration;
 
 [Serializable]
@@ -9,4 +7,4 @@ public ConfigurationException(string msg)
         : base(msg)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/Exceptions/GitToolsException.cs b/src/GitVersion.Core/Model/Exceptions/GitToolsException.cs
index 4c54c6a175..ecbd39cd81 100644
--- a/src/GitVersion.Core/Model/Exceptions/GitToolsException.cs
+++ b/src/GitVersion.Core/Model/Exceptions/GitToolsException.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion;
 
 [Serializable]
@@ -14,4 +12,4 @@ public GitToolsException(string message, Exception innerException)
         : base(message, innerException)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/Exceptions/GitVersionException.cs b/src/GitVersion.Core/Model/Exceptions/GitVersionException.cs
index c2dda83b45..cd74c8f98f 100644
--- a/src/GitVersion.Core/Model/Exceptions/GitVersionException.cs
+++ b/src/GitVersion.Core/Model/Exceptions/GitVersionException.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion;
 
 [Serializable]
@@ -15,4 +13,4 @@ public GitVersionException(string message, Exception innerException)
         : base(message, innerException)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/Exceptions/LockedFileException.cs b/src/GitVersion.Core/Model/Exceptions/LockedFileException.cs
index acdfb13fc0..ac742982b0 100644
--- a/src/GitVersion.Core/Model/Exceptions/LockedFileException.cs
+++ b/src/GitVersion.Core/Model/Exceptions/LockedFileException.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion;
 
 public class LockedFileException : Exception
@@ -7,4 +5,4 @@ public class LockedFileException : Exception
     public LockedFileException(Exception inner) : base(inner.Message, inner)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/Exceptions/WarningException.cs b/src/GitVersion.Core/Model/Exceptions/WarningException.cs
index 59b1065b5f..4c40ff9eca 100644
--- a/src/GitVersion.Core/Model/Exceptions/WarningException.cs
+++ b/src/GitVersion.Core/Model/Exceptions/WarningException.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitVersion;
 
 [Serializable]
@@ -9,4 +7,4 @@ public WarningException(string message)
         : base(message)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/FileWriteInfo.cs b/src/GitVersion.Core/Model/FileWriteInfo.cs
index cb6e15b94a..976dd386c1 100644
--- a/src/GitVersion.Core/Model/FileWriteInfo.cs
+++ b/src/GitVersion.Core/Model/FileWriteInfo.cs
@@ -12,4 +12,4 @@ public FileWriteInfo(string workingDirectory, string fileName, string fileExtens
     public string WorkingDirectory { get; }
     public string FileName { get; }
     public string FileExtension { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/GitVersionCacheKey.cs b/src/GitVersion.Core/Model/GitVersionCacheKey.cs
index 3e37f78a17..d12e85c9ca 100644
--- a/src/GitVersion.Core/Model/GitVersionCacheKey.cs
+++ b/src/GitVersion.Core/Model/GitVersionCacheKey.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Extensions;
 
 namespace GitVersion.Cache;
@@ -16,4 +15,4 @@ public GitVersionCacheKey(string value)
     }
 
     public string Value { get; private set; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/GitVersionContext.cs b/src/GitVersion.Core/Model/GitVersionContext.cs
index 8ee35bef80..0605e65b4a 100644
--- a/src/GitVersion.Core/Model/GitVersionContext.cs
+++ b/src/GitVersion.Core/Model/GitVersionContext.cs
@@ -37,4 +37,4 @@ public GitVersionContext(IBranch currentBranch, ICommit? currentCommit,
 
         NumberOfUncommittedChanges = numberOfUncommittedChanges;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/GitVersionOptions.cs b/src/GitVersion.Core/Model/GitVersionOptions.cs
index fb240eea68..8e81c5df45 100644
--- a/src/GitVersion.Core/Model/GitVersionOptions.cs
+++ b/src/GitVersion.Core/Model/GitVersionOptions.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.Logging;
 using GitVersion.Model;
 
@@ -25,4 +24,4 @@ public class GitVersionOptions
     public string? OutputFile;
     public ISet<OutputType> Output = new HashSet<OutputType>();
     public Verbosity Verbosity = Verbosity.Normal;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/MergeMessage.cs b/src/GitVersion.Core/Model/MergeMessage.cs
index 940265300b..1d10f7d5ac 100644
--- a/src/GitVersion.Core/Model/MergeMessage.cs
+++ b/src/GitVersion.Core/Model/MergeMessage.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.RegularExpressions;
 using GitVersion.Model.Configuration;
 
@@ -93,4 +90,4 @@ public MergeMessageFormat(string name, string pattern)
 
         public Regex Pattern { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/OutputType.cs b/src/GitVersion.Core/Model/OutputType.cs
index 7495df8a4e..e7cea06b7d 100644
--- a/src/GitVersion.Core/Model/OutputType.cs
+++ b/src/GitVersion.Core/Model/OutputType.cs
@@ -5,4 +5,4 @@ public enum OutputType
     BuildServer,
     Json,
     File
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/RepositoryInfo.cs b/src/GitVersion.Core/Model/RepositoryInfo.cs
index 394d3df465..857dece0ae 100644
--- a/src/GitVersion.Core/Model/RepositoryInfo.cs
+++ b/src/GitVersion.Core/Model/RepositoryInfo.cs
@@ -6,4 +6,4 @@ public class RepositoryInfo
     public string? TargetBranch;
     public string? CommitId;
     public string? DynamicRepositoryClonePath;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/Settings.cs b/src/GitVersion.Core/Model/Settings.cs
index 589a0385a5..22b198edc3 100644
--- a/src/GitVersion.Core/Model/Settings.cs
+++ b/src/GitVersion.Core/Model/Settings.cs
@@ -6,4 +6,4 @@ public class Settings
     public bool NoCache;
     public bool NoNormalize;
     public bool OnlyTrackedBranches = false;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/VersionVariables.cs b/src/GitVersion.Core/Model/VersionVariables.cs
index 9d415d2989..3d048829ca 100644
--- a/src/GitVersion.Core/Model/VersionVariables.cs
+++ b/src/GitVersion.Core/Model/VersionVariables.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using GitVersion.Helpers;
@@ -225,4 +220,4 @@ private static JsonSerializerOptions JsonSerializerOptions()
         };
         return serializeOptions;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/VersionVariablesJsonModel.cs b/src/GitVersion.Core/Model/VersionVariablesJsonModel.cs
index 52555a6ec4..cbb451730b 100644
--- a/src/GitVersion.Core/Model/VersionVariablesJsonModel.cs
+++ b/src/GitVersion.Core/Model/VersionVariablesJsonModel.cs
@@ -70,4 +70,4 @@ public class VersionVariablesJsonModel
     public string? UncommittedChanges { get; set; }
     [JsonConverter(typeof(VersionVariablesJsonStringConverter))]
     public string? CommitDate { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/VersionVariablesJsonNumberConverter.cs b/src/GitVersion.Core/Model/VersionVariablesJsonNumberConverter.cs
index 007b6c1989..4f86af5263 100644
--- a/src/GitVersion.Core/Model/VersionVariablesJsonNumberConverter.cs
+++ b/src/GitVersion.Core/Model/VersionVariablesJsonNumberConverter.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Buffers;
 using System.Buffers.Text;
 using System.Text.Json;
@@ -53,4 +52,4 @@ public override void Write(Utf8JsonWriter writer, [CanBeNull] string value, Json
     public override bool HandleNull => true;
 
     private static bool NotAPaddedNumber(string value) => value != null && (value == "0" || !value.StartsWith("0"));
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/VersionVariablesJsonStringConverter.cs b/src/GitVersion.Core/Model/VersionVariablesJsonStringConverter.cs
index ecd2be830d..d8ada1f109 100644
--- a/src/GitVersion.Core/Model/VersionVariablesJsonStringConverter.cs
+++ b/src/GitVersion.Core/Model/VersionVariablesJsonStringConverter.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Buffers;
 using System.Buffers.Text;
 using System.Text.Json;
@@ -36,4 +35,4 @@ public override void Write(Utf8JsonWriter writer, [CanBeNull] string value, Json
     }
 
     public override bool HandleNull => true;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/Model/WixInfo.cs b/src/GitVersion.Core/Model/WixInfo.cs
index db5644a61e..1ea011b4ed 100644
--- a/src/GitVersion.Core/Model/WixInfo.cs
+++ b/src/GitVersion.Core/Model/WixInfo.cs
@@ -3,4 +3,4 @@ namespace GitVersion;
 public class WixInfo
 {
     public bool ShouldUpdate;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/Abstractions/IBaseVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/Abstractions/IBaseVersionCalculator.cs
index cda753878d..b95118b1b0 100644
--- a/src/GitVersion.Core/VersionCalculation/Abstractions/IBaseVersionCalculator.cs
+++ b/src/GitVersion.Core/VersionCalculation/Abstractions/IBaseVersionCalculator.cs
@@ -3,4 +3,4 @@ namespace GitVersion.VersionCalculation;
 public interface IBaseVersionCalculator
 {
     BaseVersion GetBaseVersion();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/Abstractions/IIncrementStrategyFinder.cs b/src/GitVersion.Core/VersionCalculation/Abstractions/IIncrementStrategyFinder.cs
index 6dc99b2149..f7fe1130fb 100644
--- a/src/GitVersion.Core/VersionCalculation/Abstractions/IIncrementStrategyFinder.cs
+++ b/src/GitVersion.Core/VersionCalculation/Abstractions/IIncrementStrategyFinder.cs
@@ -1,9 +1,7 @@
-using System.Collections.Generic;
-
 namespace GitVersion.VersionCalculation;
 
 public interface IIncrementStrategyFinder
 {
     VersionField? DetermineIncrementedField(IGitRepository repository, GitVersionContext context, BaseVersion baseVersion);
     VersionField? GetIncrementForCommits(GitVersionContext context, IEnumerable<ICommit> commits);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/Abstractions/IMainlineVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/Abstractions/IMainlineVersionCalculator.cs
index ad72051d2b..7c230aec39 100644
--- a/src/GitVersion.Core/VersionCalculation/Abstractions/IMainlineVersionCalculator.cs
+++ b/src/GitVersion.Core/VersionCalculation/Abstractions/IMainlineVersionCalculator.cs
@@ -4,4 +4,4 @@ public interface IMainlineVersionCalculator
 {
     SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion);
     SemanticVersionBuildMetaData CreateVersionBuildMetaData(ICommit? baseVersionSource);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/Abstractions/INextVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/Abstractions/INextVersionCalculator.cs
index ec2d52aa76..03bc8082db 100644
--- a/src/GitVersion.Core/VersionCalculation/Abstractions/INextVersionCalculator.cs
+++ b/src/GitVersion.Core/VersionCalculation/Abstractions/INextVersionCalculator.cs
@@ -3,4 +3,4 @@ namespace GitVersion.VersionCalculation;
 public interface INextVersionCalculator
 {
     SemanticVersion FindVersion();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/Abstractions/IVariableProvider.cs b/src/GitVersion.Core/VersionCalculation/Abstractions/IVariableProvider.cs
index 4ab4c8305c..05500e8e7f 100644
--- a/src/GitVersion.Core/VersionCalculation/Abstractions/IVariableProvider.cs
+++ b/src/GitVersion.Core/VersionCalculation/Abstractions/IVariableProvider.cs
@@ -6,4 +6,4 @@ namespace GitVersion.VersionCalculation;
 public interface IVariableProvider
 {
     VersionVariables GetVariablesFor(SemanticVersion semanticVersion, EffectiveConfiguration config, bool isCurrentCommitTagged);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionFilter.cs b/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionFilter.cs
index 8bda86bd0d..6cf76f7c5d 100644
--- a/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionFilter.cs
+++ b/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionFilter.cs
@@ -5,4 +5,4 @@ namespace GitVersion.VersionCalculation;
 public interface IVersionFilter
 {
     bool Exclude(BaseVersion version, [NotNullWhen(true)] out string? reason);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionStrategy.cs
index b91a87c086..02cc9b4b9f 100644
--- a/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/Abstractions/IVersionStrategy.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace GitVersion.VersionCalculation;
 
 public interface IVersionStrategy
@@ -11,4 +9,4 @@ public interface IVersionStrategy
     /// An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of the base version values found by the strategy.
     /// </returns>
     IEnumerable<BaseVersion> GetVersions();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculator.cs
index 1b1ff98cbe..c6f7ce8779 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculator.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculator.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using GitVersion.Common;
 using GitVersion.Configuration;
 using GitVersion.Logging;
@@ -149,4 +146,4 @@ private class Versions
 
         public override string ToString() => $"{Version} | {IncrementedVersion}";
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/BaseVersion.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/BaseVersion.cs
index 165459e96c..2c9cfabe3b 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/BaseVersion.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/BaseVersion.cs
@@ -26,4 +26,4 @@ public override string ToString()
         var externalSource = BaseVersionSource == null ? "External Source" : BaseVersionSource.Sha;
         return $"{Source}: {SemanticVersion.ToString("f")} with commit count source {externalSource}";
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/ConfigNextVersionVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/ConfigNextVersionVersionStrategy.cs
index 2c4491806e..d7f762e6d8 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/ConfigNextVersionVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/ConfigNextVersionVersionStrategy.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitVersion.Extensions;
 
 namespace GitVersion.VersionCalculation;
@@ -23,4 +21,4 @@ public override IEnumerable<BaseVersion> GetVersions()
         var semanticVersion = SemanticVersion.Parse(nextVersion, Context.Configuration?.GitTagPrefix);
         yield return new BaseVersion("NextVersion in GitVersion configuration file", false, semanticVersion, null, null);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/FallbackVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/FallbackVersionStrategy.cs
index c214879451..d7d08e8791 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/FallbackVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/FallbackVersionStrategy.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitVersion.Common;
 
 namespace GitVersion.VersionCalculation;
@@ -26,4 +24,4 @@ public override IEnumerable<BaseVersion> GetVersions()
 
         yield return new BaseVersion("Fallback base version", false, new SemanticVersion(minor: 1), baseVersionSource, null);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs
index 8177dbd8aa..1487e4bc36 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using System.Text.RegularExpressions;
 using GitVersion.Configuration;
 using GitVersion.Extensions;
@@ -67,4 +64,4 @@ private static bool TryParse(ICommit mergeCommit, GitVersionContext context, [No
     private static string TrimRemote(string branchName) => branchName
         .RegexReplace("^refs/remotes/", string.Empty, RegexOptions.IgnoreCase)
         .RegexReplace("^origin/", string.Empty, RegexOptions.IgnoreCase);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs
index c57a21f9ab..44cdc83da5 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using GitVersion.Common;
 
 namespace GitVersion.VersionCalculation;
@@ -57,4 +54,4 @@ public VersionTaggedCommit(ICommit commit, SemanticVersion semVer, string tag)
 
         public override string ToString() => $"{this.Tag} | {this.Commit} | {this.SemVer}";
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs
index 1b1eb9cd74..32bae042ca 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using GitVersion.Common;
 using GitVersion.Configuration;
 using GitVersion.Model.Configuration;
@@ -97,4 +94,4 @@ private IEnumerable<BaseVersion> GetReleaseVersion(GitVersionContext context, IB
             .GetVersions(tagPrefixRegex, releaseBranch)
             .Select(b => new BaseVersion(b.Source, true, b.SemanticVersion, baseSource, b.BranchNameOverride));
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs
index cfd5345994..171e53175d 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GitVersion.Common;
 using GitVersion.Configuration;
 using GitVersion.Extensions;
@@ -59,4 +57,4 @@ internal IEnumerable<BaseVersion> GetVersions(string? tagPrefixRegex, IBranch? c
     private static string NameWithoutOrigin(IBranch branch) => branch.IsRemote && branch.Name.Friendly.StartsWith("origin/")
         ? branch.Name.Friendly.Substring("origin/".Length)
         : branch.Name.Friendly;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyBase.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyBase.cs
index 78b081076a..e464616b1e 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyBase.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyBase.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace GitVersion.VersionCalculation;
 
 public class VersionStrategyBase : IVersionStrategy
@@ -10,4 +7,4 @@ public class VersionStrategyBase : IVersionStrategy
 
     protected VersionStrategyBase(Lazy<GitVersionContext> versionContext) => this.versionContext = versionContext ?? throw new ArgumentNullException(nameof(versionContext));
     public virtual IEnumerable<BaseVersion> GetVersions() => throw new NotImplementedException();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyModule.cs b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyModule.cs
index bee87e2b62..9bac7bf5c4 100644
--- a/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyModule.cs
+++ b/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/VersionStrategyModule.cs
@@ -1,5 +1,3 @@
-using System.Linq;
-using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace GitVersion.VersionCalculation;
@@ -15,4 +13,4 @@ public override void RegisterTypes(IServiceCollection services)
             services.AddSingleton(typeof(IVersionStrategy), versionStrategy);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCache.cs b/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCache.cs
index 37e14cf7bb..c2cf16a9c3 100644
--- a/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCache.cs
+++ b/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCache.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using GitVersion.Cache;
 using GitVersion.Helpers;
 using GitVersion.Logging;
@@ -107,4 +103,4 @@ private string PrepareCacheDirectory()
     }
 
     private static string GetCacheFileName(GitVersionCacheKey key, string cacheDir) => Path.Combine(cacheDir, string.Concat(key.Value, ".yml"));
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCacheKeyFactory.cs b/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCacheKeyFactory.cs
index d824dbcf63..9e363efdcf 100644
--- a/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCacheKeyFactory.cs
+++ b/src/GitVersion.Core/VersionCalculation/Cache/GitVersionCacheKeyFactory.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Security.Cryptography;
-using System.Text;
 using GitVersion.Cache;
 using GitVersion.Configuration;
 using GitVersion.Extensions;
@@ -209,4 +204,4 @@ private static string GetHash(string textToHash)
         var hashedString = BitConverter.ToString(hashedBytes);
         return hashedString.Replace("-", "");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCache.cs b/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCache.cs
index 249f79d59e..33e275f90f 100644
--- a/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCache.cs
+++ b/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCache.cs
@@ -8,4 +8,4 @@ public interface IGitVersionCache
     void WriteVariablesToDiskCache(GitVersionCacheKey cacheKey, VersionVariables variablesFromCache);
     string GetCacheDirectory();
     VersionVariables? LoadVersionVariablesFromDiskCache(GitVersionCacheKey key);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCacheKeyFactory.cs b/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCacheKeyFactory.cs
index 1e584279ed..812676962d 100644
--- a/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCacheKeyFactory.cs
+++ b/src/GitVersion.Core/VersionCalculation/Cache/IGitVersionCacheKeyFactory.cs
@@ -6,4 +6,4 @@ namespace GitVersion.VersionCalculation.Cache;
 public interface IGitVersionCacheKeyFactory
 {
     GitVersionCacheKey Create(Config? overrideConfig);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/CommitMessageIncrementMode.cs b/src/GitVersion.Core/VersionCalculation/CommitMessageIncrementMode.cs
index 3e34cbfb8d..4a817ea6fc 100644
--- a/src/GitVersion.Core/VersionCalculation/CommitMessageIncrementMode.cs
+++ b/src/GitVersion.Core/VersionCalculation/CommitMessageIncrementMode.cs
@@ -5,4 +5,4 @@ public enum CommitMessageIncrementMode
     Enabled,
     Disabled,
     MergeMessageOnly
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/IncrementStrategy.cs b/src/GitVersion.Core/VersionCalculation/IncrementStrategy.cs
index 5f43930c34..45aa90e5c5 100644
--- a/src/GitVersion.Core/VersionCalculation/IncrementStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/IncrementStrategy.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Model.Configuration;
 
 namespace GitVersion;
@@ -26,4 +25,4 @@ public static class IncrementStrategyExtensions
         IncrementStrategy.Patch => VersionField.Patch,
         _ => throw new ArgumentOutOfRangeException(nameof(strategy), strategy, null)
     };
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
index f89ac2805e..18cb1ebf81 100644
--- a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
+++ b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
@@ -1,7 +1,4 @@
-using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 
@@ -160,4 +157,4 @@ private static IEnumerable<ICommit> GetCommitsReacheableFromHead(IGitRepository
 
         return repo.Commits.QueryBy(filter);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs
index d459916e0b..55fdf48934 100644
--- a/src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs
+++ b/src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using GitVersion.Common;
 using GitVersion.Configuration;
 using GitVersion.Extensions;
@@ -288,4 +285,4 @@ private static ICommit GetMergedHead(ICommit mergeCommit)
             throw new NotSupportedException("Mainline development does not support more than one merge source in a single commit yet");
         return parents.Single();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/MinDateVersionFilter.cs b/src/GitVersion.Core/VersionCalculation/MinDateVersionFilter.cs
index 2ad846f2e7..e892705ac4 100644
--- a/src/GitVersion.Core/VersionCalculation/MinDateVersionFilter.cs
+++ b/src/GitVersion.Core/VersionCalculation/MinDateVersionFilter.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics.CodeAnalysis;
 
 namespace GitVersion.VersionCalculation;
@@ -24,4 +23,4 @@ public bool Exclude(BaseVersion version, [NotNullWhen(true)] out string? reason)
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs
index fd0ccbec73..4e251b3312 100644
--- a/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs
+++ b/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Linq;
 using GitVersion.Common;
 using GitVersion.Configuration;
 using GitVersion.Extensions;
@@ -154,4 +152,4 @@ private static void EnsureHeadIsNotDetached(GitVersionContext context)
     private static bool MajorMinorPatchEqual(SemanticVersion lastTag, SemanticVersion baseVersion) => lastTag.Major == baseVersion.Major &&
                                                                                                       lastTag.Minor == baseVersion.Minor &&
                                                                                                       lastTag.Patch == baseVersion.Patch;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
index 7b4c65f574..dc8617577a 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
@@ -316,4 +315,4 @@ public enum VersionField
     Patch,
     Minor,
     Major
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
index 350190c464..5ce02a78d4 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 using GitVersion.Helpers;
@@ -153,4 +152,4 @@ private static string FormatMetaDataPart(string value)
             value = Regex.Replace(value, "[^0-9A-Za-z-.]", "-");
         return value;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionExtensions.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionExtensions.cs
index d2a234806a..da61bbd8a7 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionExtensions.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionExtensions.cs
@@ -17,4 +17,4 @@ public static void OverrideVersionManuallyIfNeeded(this SemanticVersion version,
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs
index dbf6cfe962..2b892437dd 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionFormatValues.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Globalization;
 using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
@@ -99,4 +98,4 @@ private string GetWeightedPreReleaseNumber()
 
         return weightedPreReleaseNumber;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
index 63a4f913db..72758a01fb 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Linq;
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 using GitVersion.Helpers;
@@ -177,4 +175,4 @@ private string GetLegacyName()
 
     public bool HasTag() =>
         !Name.IsNullOrEmpty() || (Number.HasValue && PromotedFromCommits != true);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/ShaVersionFilter.cs b/src/GitVersion.Core/VersionCalculation/ShaVersionFilter.cs
index 921c000fd0..7967cfbbcd 100644
--- a/src/GitVersion.Core/VersionCalculation/ShaVersionFilter.cs
+++ b/src/GitVersion.Core/VersionCalculation/ShaVersionFilter.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 
 namespace GitVersion.VersionCalculation;
 
@@ -26,4 +23,4 @@ public bool Exclude(BaseVersion version, [NotNullWhen(true)] out string? reason)
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/VariableProvider.cs b/src/GitVersion.Core/VersionCalculation/VariableProvider.cs
index b2be307107..05e2c436de 100644
--- a/src/GitVersion.Core/VersionCalculation/VariableProvider.cs
+++ b/src/GitVersion.Core/VersionCalculation/VariableProvider.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Text.RegularExpressions;
 using GitVersion.Configuration;
 using GitVersion.Extensions;
@@ -160,4 +159,4 @@ private void WarnIfUsingObsoleteFormatValues(string formatString)
             this.log.Write(LogLevel.Warn, $"Use format variable '{nameof(SemanticVersionFormatValues.InformationalVersion)}' instead of '{obsoletePropertyName}' which is obsolete and will be removed in a future release.");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/VersionCalculationModule.cs b/src/GitVersion.Core/VersionCalculation/VersionCalculationModule.cs
index ac301762e7..4b6f93e908 100644
--- a/src/GitVersion.Core/VersionCalculation/VersionCalculationModule.cs
+++ b/src/GitVersion.Core/VersionCalculation/VersionCalculationModule.cs
@@ -15,4 +15,4 @@ public void RegisterTypes(IServiceCollection services)
         services.AddSingleton<INextVersionCalculator, NextVersionCalculator>();
         services.AddSingleton<IIncrementStrategyFinder, IncrementStrategyFinder>();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionCalculation/VersioningMode.cs b/src/GitVersion.Core/VersionCalculation/VersioningMode.cs
index 9c9cd2c2a5..d4f5b4d9fe 100644
--- a/src/GitVersion.Core/VersionCalculation/VersioningMode.cs
+++ b/src/GitVersion.Core/VersionCalculation/VersioningMode.cs
@@ -5,4 +5,4 @@ public enum VersioningMode
     ContinuousDelivery,
     ContinuousDeployment,
     Mainline
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoContext.cs b/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoContext.cs
index 2b04fb8270..f0e02c5592 100644
--- a/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoContext.cs
+++ b/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoContext.cs
@@ -12,4 +12,4 @@ public AssemblyInfoContext(string? workingDirectory, bool ensureAssemblyInfo, pa
     public string? WorkingDirectory { get; }
     public bool EnsureAssemblyInfo { get; }
     public string[] AssemblyInfoFiles { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoFileUpdater.cs b/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoFileUpdater.cs
index ecd6db6aa2..dd0063098a 100644
--- a/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoFileUpdater.cs
+++ b/src/GitVersion.Core/VersionConverters/AssemblyInfo/AssemblyInfoFileUpdater.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 using GitVersion.Logging;
@@ -221,4 +217,4 @@ private bool EnsureVersionAssemblyInfoFile(string fullPath, bool ensureAssemblyI
         this.log.Warning($"No version assembly info template available to create source file '{fullPath}'");
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs b/src/GitVersion.Core/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs
index 0053d9309c..4f45d08b79 100644
--- a/src/GitVersion.Core/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs
+++ b/src/GitVersion.Core/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Xml.Linq;
 using GitVersion.Extensions;
 using GitVersion.Logging;
@@ -221,4 +217,4 @@ private bool IsSupportedProjectFile(string fileName)
                fileName.EndsWith(".fsproj") ||
                fileName.EndsWith(".vbproj");
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoContext.cs b/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoContext.cs
index 8eac2d68e4..29587ef0fd 100644
--- a/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoContext.cs
+++ b/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoContext.cs
@@ -12,4 +12,4 @@ public GitVersionInfoContext(string? workingDirectory, string fileName, string f
     public string? WorkingDirectory { get; }
     public string FileName { get; }
     public string FileExtension { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoGenerator.cs b/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoGenerator.cs
index 81977e987a..ce3e9ffdcf 100644
--- a/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoGenerator.cs
+++ b/src/GitVersion.Core/VersionConverters/GitVersionInfo/GitVersionInfoGenerator.cs
@@ -1,6 +1,3 @@
-using System;
-using System.IO;
-using System.Linq;
 using GitVersion.OutputVariables;
 
 namespace GitVersion.VersionConverters.GitVersionInfo;
@@ -60,4 +57,4 @@ private static string GetIndentation(string fileExtension)
         var tabs = fileExtension.ToLowerInvariant().EndsWith("vb") ? 2 : 1;
         return new string(' ', tabs * 4);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionConverters/IConverterContext.cs b/src/GitVersion.Core/VersionConverters/IConverterContext.cs
index cd567a57f2..30b1ba28e1 100644
--- a/src/GitVersion.Core/VersionConverters/IConverterContext.cs
+++ b/src/GitVersion.Core/VersionConverters/IConverterContext.cs
@@ -3,4 +3,4 @@ namespace GitVersion.VersionConverters;
 public interface IConverterContext
 {
     public string? WorkingDirectory { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionConverters/IVersionConverter.cs b/src/GitVersion.Core/VersionConverters/IVersionConverter.cs
index b192a83f60..ff0428d6b8 100644
--- a/src/GitVersion.Core/VersionConverters/IVersionConverter.cs
+++ b/src/GitVersion.Core/VersionConverters/IVersionConverter.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.OutputVariables;
 
 namespace GitVersion.VersionConverters;
@@ -6,4 +5,4 @@ namespace GitVersion.VersionConverters;
 public interface IVersionConverter<in T> : IDisposable where T : IConverterContext
 {
     public void Execute(VersionVariables variables, T context);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputContext.cs b/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputContext.cs
index cee39d10be..d5ead0d3b9 100644
--- a/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputContext.cs
+++ b/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputContext.cs
@@ -12,4 +12,4 @@ public OutputContext(string? workingDirectory, string? outputFile, bool? updateB
     public string? WorkingDirectory { get; }
     public string? OutputFile { get; }
     public bool? UpdateBuildNumber { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputGenerator.cs b/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputGenerator.cs
index 13ec3abdcc..565f8c6d62 100644
--- a/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputGenerator.cs
+++ b/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputGenerator.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using GitVersion.BuildAgents;
 using GitVersion.Helpers;
 using GitVersion.Logging;
@@ -63,4 +61,4 @@ public void Execute(VersionVariables variables, OutputContext context)
     public void Dispose()
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionConverters/TemplateManager.cs b/src/GitVersion.Core/VersionConverters/TemplateManager.cs
index 1446a9fa76..c3f740dd7f 100644
--- a/src/GitVersion.Core/VersionConverters/TemplateManager.cs
+++ b/src/GitVersion.Core/VersionConverters/TemplateManager.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using GitVersion.Extensions;
 
 namespace GitVersion.VersionConverters;
@@ -80,4 +76,4 @@ private static IEnumerable<string> GetEmbeddedTemplates(TemplateType templateTyp
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionConverters/VersionConvertersModule.cs b/src/GitVersion.Core/VersionConverters/VersionConvertersModule.cs
index fdf1ac9736..938c3a2f13 100644
--- a/src/GitVersion.Core/VersionConverters/VersionConvertersModule.cs
+++ b/src/GitVersion.Core/VersionConverters/VersionConvertersModule.cs
@@ -16,4 +16,4 @@ public void RegisterTypes(IServiceCollection services)
         services.AddSingleton<IAssemblyInfoFileUpdater, AssemblyInfoFileUpdater>();
         services.AddSingleton<IProjectFileUpdater, ProjectFileUpdater>();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionContext.cs b/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionContext.cs
index b01aed1b8c..232e20aaaa 100644
--- a/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionContext.cs
+++ b/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionContext.cs
@@ -6,4 +6,4 @@ public WixVersionContext(string? workingDirectory) =>
         WorkingDirectory = workingDirectory;
 
     public string? WorkingDirectory { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionFileUpdater.cs b/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionFileUpdater.cs
index 4506850e94..caf63db257 100644
--- a/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionFileUpdater.cs
+++ b/src/GitVersion.Core/VersionConverters/WixUpdater/WixVersionFileUpdater.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using System.Text;
-using System.Xml;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 
@@ -55,4 +51,4 @@ private static string GetWixFormatFromVersionVariables(VersionVariables variable
     }
 
     public void Dispose() => this.log.Info($"Done writing {this.wixVersionFile}");
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/Git/Branch.cs b/src/GitVersion.LibGit2Sharp/Git/Branch.cs
index f775bffe37..4d0d6f9aa7 100644
--- a/src/GitVersion.LibGit2Sharp/Git/Branch.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/Branch.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Helpers;
 
 namespace GitVersion;
@@ -36,4 +35,4 @@ internal Branch(LibGit2Sharp.Branch branch)
 
     public bool IsRemote => this.innerBranch.IsRemote;
     public bool IsTracking => this.innerBranch.IsTracking;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/Git/BranchCollection.cs b/src/GitVersion.LibGit2Sharp/Git/BranchCollection.cs
index f6e7c6ba45..c561f9b308 100644
--- a/src/GitVersion.LibGit2Sharp/Git/BranchCollection.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/BranchCollection.cs
@@ -1,6 +1,4 @@
 using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace GitVersion;
 
@@ -24,4 +22,4 @@ public IEnumerable<IBranch> ExcludeBranches(IEnumerable<IBranch> branchesToExclu
         this.Where(b => branchesToExclude.All(bte => !b.Equals(bte)));
     public void UpdateTrackedBranch(IBranch branch, string remoteTrackingReferenceName) =>
         this.innerCollection.Update((Branch)branch, b => b.TrackedBranch = remoteTrackingReferenceName);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/Git/Commit.cs b/src/GitVersion.LibGit2Sharp/Git/Commit.cs
index f97666ca9a..ba98413123 100644
--- a/src/GitVersion.LibGit2Sharp/Git/Commit.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/Commit.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using GitVersion.Helpers;
 
 namespace GitVersion;
@@ -30,4 +27,4 @@ internal Commit(LibGit2Sharp.Commit innerCommit) : base(innerCommit)
     public DateTimeOffset When { get; }
 
     public string Message => this.innerCommit.Message;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/Git/CommitCollection.cs b/src/GitVersion.LibGit2Sharp/Git/CommitCollection.cs
index 5b5100c550..6d431d1ce6 100644
--- a/src/GitVersion.LibGit2Sharp/Git/CommitCollection.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/CommitCollection.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
 using LibGit2Sharp;
 
 namespace GitVersion;
@@ -40,4 +36,4 @@ public IEnumerable<ICommit> QueryBy(CommitFilter commitFilter)
         var commitLog = ((IQueryableCommitLog)this.innerCollection).QueryBy(filter);
         return new CommitCollection(commitLog);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/Git/GitObject.cs b/src/GitVersion.LibGit2Sharp/Git/GitObject.cs
index 74e3358fcf..4e8dbd78c1 100644
--- a/src/GitVersion.LibGit2Sharp/Git/GitObject.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/GitObject.cs
@@ -21,4 +21,4 @@ internal GitObject(LibGit2Sharp.GitObject innerGitObject)
 
     public IObjectId Id { get; }
     public string Sha { get; }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/Git/GitRepository.cs b/src/GitVersion.LibGit2Sharp/Git/GitRepository.cs
index 1655720175..908f5614c3 100644
--- a/src/GitVersion.LibGit2Sharp/Git/GitRepository.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/GitRepository.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using GitVersion.Extensions;
 using GitVersion.Helpers;
 using GitVersion.Logging;
@@ -225,4 +222,4 @@ private static CloneOptions GetCloneOptions(AuthenticationInfo auth) =>
         }
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs b/src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs
index 71db455895..0c66d77ecc 100644
--- a/src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs
@@ -1,6 +1,3 @@
-using System;
-using System.IO;
-using System.Linq;
 using GitVersion.Extensions;
 using Microsoft.Extensions.Options;
 
@@ -111,4 +108,4 @@ private static bool GitRepoHasMatchingRemote(string possiblePath, string targetU
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/Git/ObjectId.cs b/src/GitVersion.LibGit2Sharp/Git/ObjectId.cs
index 1456161c39..295841e94f 100644
--- a/src/GitVersion.LibGit2Sharp/Git/ObjectId.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/ObjectId.cs
@@ -23,4 +23,4 @@ public ObjectId(string sha) : this(new LibGit2Sharp.ObjectId(sha))
     public string Sha => this.innerObjectId.Sha;
 
     public string ToString(int prefixLength) => this.innerObjectId.ToString(prefixLength);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/Git/RefSpec.cs b/src/GitVersion.LibGit2Sharp/Git/RefSpec.cs
index 2955957396..f620bce18e 100644
--- a/src/GitVersion.LibGit2Sharp/Git/RefSpec.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/RefSpec.cs
@@ -19,4 +19,4 @@ public class RefSpec : IRefSpec
     public RefSpecDirection Direction => (RefSpecDirection)this.innerRefSpec.Direction;
     public string Source => this.innerRefSpec.Source;
     public string Destination => this.innerRefSpec.Destination;
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/Git/RefSpecCollection.cs b/src/GitVersion.LibGit2Sharp/Git/RefSpecCollection.cs
index b415b5b995..b9689079b0 100644
--- a/src/GitVersion.LibGit2Sharp/Git/RefSpecCollection.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/RefSpecCollection.cs
@@ -1,7 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace GitVersion;
 
 internal sealed class RefSpecCollection : IRefSpecCollection
@@ -10,4 +6,4 @@ internal sealed class RefSpecCollection : IRefSpecCollection
     internal RefSpecCollection(LibGit2Sharp.RefSpecCollection collection) => this.innerCollection = collection;
     public IEnumerator<IRefSpec> GetEnumerator() => this.innerCollection.Select(tag => new RefSpec(tag)).GetEnumerator();
     IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs b/src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs
index 283c826b1c..389e1fadc4 100644
--- a/src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs
@@ -1,7 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace GitVersion;
 
 internal sealed class ReferenceCollection : IReferenceCollection
@@ -29,4 +25,4 @@ public IReference? this[string name]
     public IReference? Head => this["HEAD"];
 
     public IEnumerable<IReference> FromGlob(string prefix) => this.innerCollection.FromGlob(prefix).Select(reference => new Reference(reference));
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/Git/Remote.cs b/src/GitVersion.LibGit2Sharp/Git/Remote.cs
index 0732a6f30f..70a24a514e 100644
--- a/src/GitVersion.LibGit2Sharp/Git/Remote.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/Remote.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
 using GitVersion.Helpers;
 
 namespace GitVersion;
@@ -34,4 +32,4 @@ public IEnumerable<IRefSpec> RefSpecs
     public IEnumerable<IRefSpec> FetchRefSpecs => RefSpecs.Where(x => x.Direction == RefSpecDirection.Fetch);
 
     public IEnumerable<IRefSpec> PushRefSpecs => RefSpecs.Where(x => x.Direction == RefSpecDirection.Push);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/Git/RemoteCollection.cs b/src/GitVersion.LibGit2Sharp/Git/RemoteCollection.cs
index 9f7caeafec..72f81f2b57 100644
--- a/src/GitVersion.LibGit2Sharp/Git/RemoteCollection.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/RemoteCollection.cs
@@ -1,7 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace GitVersion;
 
 internal sealed class RemoteCollection : IRemoteCollection
@@ -23,4 +19,4 @@ public IRemote? this[string name]
 
     public void Remove(string remoteName) => this.innerCollection.Remove(remoteName);
     public void Update(string remoteName, string refSpec) => this.innerCollection.Update(remoteName, r => r.FetchRefSpecs.Add(refSpec));
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/Git/Tag.cs b/src/GitVersion.LibGit2Sharp/Git/Tag.cs
index a67eb03048..17ea7eec0d 100644
--- a/src/GitVersion.LibGit2Sharp/Git/Tag.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/Tag.cs
@@ -34,4 +34,4 @@ internal Tag(LibGit2Sharp.Tag tag)
 
         return target is LibGit2Sharp.Commit commit ? new Commit(commit) : null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/Git/TagCollection.cs b/src/GitVersion.LibGit2Sharp/Git/TagCollection.cs
index 8f02fcdd05..cac4fea10e 100644
--- a/src/GitVersion.LibGit2Sharp/Git/TagCollection.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/TagCollection.cs
@@ -1,7 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace GitVersion;
 
 internal sealed class TagCollection : ITagCollection
@@ -12,4 +8,4 @@ internal sealed class TagCollection : ITagCollection
     public IEnumerator<ITag> GetEnumerator() => this.innerCollection.Select(tag => new Tag(tag)).GetEnumerator();
 
     IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/GitVersionLibGit2SharpModule.cs b/src/GitVersion.LibGit2Sharp/GitVersionLibGit2SharpModule.cs
index 307328fcab..1886324ece 100644
--- a/src/GitVersion.LibGit2Sharp/GitVersionLibGit2SharpModule.cs
+++ b/src/GitVersion.LibGit2Sharp/GitVersionLibGit2SharpModule.cs
@@ -10,4 +10,4 @@ public void RegisterTypes(IServiceCollection services)
         services.AddSingleton<IMutatingGitRepository, GitRepository>();
         services.AddSingleton<IGitRepositoryInfo, GitRepositoryInfo>();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.LibGit2Sharp/RepositoryExtensions.cs b/src/GitVersion.LibGit2Sharp/RepositoryExtensions.cs
index 28c0edea01..c0687802f6 100644
--- a/src/GitVersion.LibGit2Sharp/RepositoryExtensions.cs
+++ b/src/GitVersion.LibGit2Sharp/RepositoryExtensions.cs
@@ -1,4 +1,3 @@
-using System;
 using LibGit2Sharp;
 using Microsoft.Extensions.Options;
 
@@ -34,4 +33,4 @@ public static T RunSafe<T>(Func<T> operation)
             throw new LockedFileException(ex);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild.Tests/FileHelperTests.cs b/src/GitVersion.MsBuild.Tests/FileHelperTests.cs
index 9e816536a5..1cf24b9c52 100644
--- a/src/GitVersion.MsBuild.Tests/FileHelperTests.cs
+++ b/src/GitVersion.MsBuild.Tests/FileHelperTests.cs
@@ -41,4 +41,4 @@ public void GetFileWriteInfoShouldCreateRandomNamedFileWhenNoIntermediateOutputP
         Assert.That(fileInfo.FileName, Does.StartWith("GeneratedVersionInformation_MyProject_").And.EndsWith(".g.cs"));
         Assert.That(fileInfo.FileExtension, Is.EqualTo("cs"));
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild.Tests/Helpers/EventArgsFormatting.cs b/src/GitVersion.MsBuild.Tests/Helpers/EventArgsFormatting.cs
index 1fa0b06ba7..d2e4407417 100644
--- a/src/GitVersion.MsBuild.Tests/Helpers/EventArgsFormatting.cs
+++ b/src/GitVersion.MsBuild.Tests/Helpers/EventArgsFormatting.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Globalization;
-using System.Text;
 using Microsoft.Build.Framework;
 
 namespace GitVersion.MsBuild.Tests.Helpers;
@@ -279,4 +277,4 @@ private static string[] SplitStringOnNewLines(string s)
     /// </summary>
     /// <remarks>Currently we're not supporting "\r".</remarks>
     private static readonly string[] s_newLines = { "\r\n", "\n" };
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild.Tests/Helpers/GitToolsTestingExtensions.cs b/src/GitVersion.MsBuild.Tests/Helpers/GitToolsTestingExtensions.cs
index 7a3f2c0b4e..cffcf366cd 100644
--- a/src/GitVersion.MsBuild.Tests/Helpers/GitToolsTestingExtensions.cs
+++ b/src/GitVersion.MsBuild.Tests/Helpers/GitToolsTestingExtensions.cs
@@ -1,4 +1,3 @@
-using System;
 using GitTools.Testing;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
@@ -42,4 +41,4 @@ private static IServiceProvider ConfigureServices(Action<IServiceCollection> ser
         servicesOverrides?.Invoke(services);
         return services.BuildServiceProvider();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixture.cs b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixture.cs
index 3b16796130..4fef8ebbc7 100644
--- a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixture.cs
+++ b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixture.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
 using Buildalyzer;
 using Buildalyzer.Environment;
 using GitTools.Testing;
@@ -76,4 +73,4 @@ public void CreateTestProject(Action<ProjectCreator> extendProject)
 
         project.Save();
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixtureResult.cs b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixtureResult.cs
index ccbd5b3b9c..7dcb21f890 100644
--- a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixtureResult.cs
+++ b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildExeFixtureResult.cs
@@ -1,4 +1,3 @@
-using System;
 using Buildalyzer;
 using GitTools.Testing;
 
@@ -13,4 +12,4 @@ public sealed class MsBuildExeFixtureResult : IDisposable
     public string Output { get; set; }
     public string ProjectPath { get; set; }
     public void Dispose() => this.fixture.Dispose();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixture.cs b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixture.cs
index 5f7a364b05..18acfa8762 100644
--- a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixture.cs
+++ b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixture.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using GitTools.Testing;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests;
@@ -82,4 +78,4 @@ private static void SetEnvironmentVariables(KeyValuePair<string, string>[] envs)
             System.Environment.SetEnvironmentVariable(env.Key, env.Value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixtureResult.cs b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixtureResult.cs
index f6a332a405..5af70dfe20 100644
--- a/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixtureResult.cs
+++ b/src/GitVersion.MsBuild.Tests/Helpers/MsBuildTaskFixtureResult.cs
@@ -1,4 +1,3 @@
-using System;
 using GitTools.Testing;
 using Microsoft.Build.Framework;
 
@@ -19,4 +18,4 @@ public sealed class MsBuildTaskFixtureResult<T> : IDisposable where T : ITask
     public string Log { get; set; }
 
     public void Dispose() => this.fixture.Dispose();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild.Tests/InvalidFileCheckerTests.cs b/src/GitVersion.MsBuild.Tests/InvalidFileCheckerTests.cs
index b0a20b5438..ff71223c0f 100644
--- a/src/GitVersion.MsBuild.Tests/InvalidFileCheckerTests.cs
+++ b/src/GitVersion.MsBuild.Tests/InvalidFileCheckerTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.MsBuild.Tests.Mocks;
 using Microsoft.Build.Framework;
@@ -246,4 +244,4 @@ End Class
 
         FileHelper.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.vb" } }, this.projectFile);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild.Tests/Mocks/MockEngine.cs b/src/GitVersion.MsBuild.Tests/Mocks/MockEngine.cs
index f4f01c73da..9c1301a966 100644
--- a/src/GitVersion.MsBuild.Tests/Mocks/MockEngine.cs
+++ b/src/GitVersion.MsBuild.Tests/Mocks/MockEngine.cs
@@ -1,8 +1,5 @@
-using System;
 using System.Collections;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Text;
 using GitVersion.MsBuild.Tests.Helpers;
 using Microsoft.Build.Framework;
 using Shouldly;
@@ -125,4 +122,4 @@ public object UnregisterTaskObject(object key, RegisteredTaskObjectLifetime life
         this.objectCache.TryRemove(key, out var obj);
         return obj;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild.Tests/Mocks/MockTaskItem.cs b/src/GitVersion.MsBuild.Tests/Mocks/MockTaskItem.cs
index 43a033f0a5..5c03f84ae4 100644
--- a/src/GitVersion.MsBuild.Tests/Mocks/MockTaskItem.cs
+++ b/src/GitVersion.MsBuild.Tests/Mocks/MockTaskItem.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections;
 using Microsoft.Build.Framework;
 
 namespace GitVersion.MsBuild.Tests.Mocks;
@@ -21,4 +19,4 @@ internal class MockTaskItem : ITaskItem
     public void RemoveMetadata(string metadataName) => throw new NotImplementedException();
 
     public void SetMetadata(string metadataName, string metadataValue) => throw new NotImplementedException();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild.Tests/Tasks/GenerateGitVersionInformationTest.cs b/src/GitVersion.MsBuild.Tests/Tasks/GenerateGitVersionInformationTest.cs
index 7444c60d57..8f0bf78490 100644
--- a/src/GitVersion.MsBuild.Tests/Tasks/GenerateGitVersionInformationTest.cs
+++ b/src/GitVersion.MsBuild.Tests/Tasks/GenerateGitVersionInformationTest.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.IO;
 using GitVersion.MsBuild.Tasks;
 using GitVersion.MsBuild.Tests.Helpers;
 using GitVersion.OutputVariables;
@@ -127,4 +125,4 @@ private static void AddGenerateGitVersionInformationTask(ProjectCreator project,
             .Target(MsBuildExeFixture.OutputTarget, dependsOnTargets: targetToRun)
             .TaskMessage($"{outputProperty}: $({outputProperty})", MessageImportance.High);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild.Tests/Tasks/GetVersionTaskTests.cs b/src/GitVersion.MsBuild.Tests/Tasks/GetVersionTaskTests.cs
index bf5946e0d6..eefc8cd80e 100644
--- a/src/GitVersion.MsBuild.Tests/Tasks/GetVersionTaskTests.cs
+++ b/src/GitVersion.MsBuild.Tests/Tasks/GetVersionTaskTests.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
 using GitVersion.MsBuild.Tasks;
 using GitVersion.MsBuild.Tests.Helpers;
 using GitVersion.OutputVariables;
@@ -115,4 +113,4 @@ private static void AddGetVersionTask(ProjectCreator project, string targetToRun
             .Target(MsBuildExeFixture.OutputTarget, dependsOnTargets: targetToRun)
             .TaskMessage($"GitVersion_{outputProperty}: $(GitVersion_{outputProperty})", MessageImportance.High);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs b/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs
index fb8e1c155f..6a500fe9df 100644
--- a/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs
+++ b/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using GitTools.Testing;
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
@@ -123,4 +119,4 @@ private static void CreateConfiguration(string repoFolder, string content)
         var configFilePath = Path.Combine(repoFolder, Configuration.ConfigFileLocator.DefaultFileName);
         File.WriteAllText(configFilePath, content);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild.Tests/Tasks/UpdateAssemblyInfoTaskTest.cs b/src/GitVersion.MsBuild.Tests/Tasks/UpdateAssemblyInfoTaskTest.cs
index a7cfe8cc7b..c99e31e47f 100644
--- a/src/GitVersion.MsBuild.Tests/Tasks/UpdateAssemblyInfoTaskTest.cs
+++ b/src/GitVersion.MsBuild.Tests/Tasks/UpdateAssemblyInfoTaskTest.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.IO;
 using GitVersion.MsBuild.Tasks;
 using GitVersion.MsBuild.Tests.Helpers;
 using Microsoft.Build.Framework;
@@ -111,4 +109,4 @@ private static void AddUpdateAssemblyInfoTask(ProjectCreator project, string tar
             .Target(MsBuildExeFixture.OutputTarget, dependsOnTargets: targetToRun)
             .TaskMessage($"{outputProperty}: $({outputProperty})", MessageImportance.High);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild.Tests/Tasks/WriteVersionInfoTest.cs b/src/GitVersion.MsBuild.Tests/Tasks/WriteVersionInfoTest.cs
index 0af1aae6d9..1ad6b6d8e2 100644
--- a/src/GitVersion.MsBuild.Tests/Tasks/WriteVersionInfoTest.cs
+++ b/src/GitVersion.MsBuild.Tests/Tasks/WriteVersionInfoTest.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using GitVersion.MsBuild.Tasks;
 using GitVersion.MsBuild.Tests.Helpers;
 using Microsoft.Build.Utilities.ProjectCreation;
@@ -13,14 +12,14 @@ public class WriteVersionInfoTest : TestTaskBase
     protected string GitHubEnvFilePath { get; set; }
 
     [OneTimeSetUp]
-    public void OneTimeSetUp() => GitHubEnvFilePath = System.IO.Path.GetTempFileName();
+    public void OneTimeSetUp() => GitHubEnvFilePath = Path.GetTempFileName();
 
     [OneTimeTearDown]
     public void OneTimeTearDown()
     {
-        if (System.IO.File.Exists(GitHubEnvFilePath))
+        if (File.Exists(GitHubEnvFilePath))
         {
-            System.IO.File.Delete(GitHubEnvFilePath);
+            File.Delete(GitHubEnvFilePath);
         }
     }
 
@@ -89,7 +88,7 @@ public void WriteVersionInfoTaskShouldLogOutputVariablesToBuildOutputInGitHubAct
 
         result.Success.ShouldBe(true);
         result.Errors.ShouldBe(0);
-        string content = System.IO.File.ReadAllText(GitHubEnvFilePath);
+        string content = File.ReadAllText(GitHubEnvFilePath);
         content.ShouldContain("GitVersion_SemVer=1.0.1");
     }
 
@@ -140,4 +139,4 @@ private static void AddWriteVersionInfoToBuildLogTask(ProjectCreator project, st
             })
             .Target(MsBuildExeFixture.OutputTarget, dependsOnTargets: targetToRun);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild/GitVersionTaskBase.cs b/src/GitVersion.MsBuild/GitVersionTaskBase.cs
index 36361497c6..4af337e7d7 100644
--- a/src/GitVersion.MsBuild/GitVersionTaskBase.cs
+++ b/src/GitVersion.MsBuild/GitVersionTaskBase.cs
@@ -20,4 +20,4 @@ public abstract class GitVersionTaskBase : ITask
     public bool Execute() => OnExecute();
 
     protected abstract bool OnExecute();
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs b/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs
index 0889dbb390..31baaf3f2b 100644
--- a/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs
+++ b/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using GitVersion.Logging;
 using GitVersion.MsBuild.Tasks;
 using GitVersion.OutputVariables;
@@ -67,4 +65,4 @@ public void WriteVersionInfoToBuildLog(WriteVersionInfoToBuildLog task)
         var versionVariables = VersionVariables.FromFile(task.VersionFile, fileSystem, log);
         gitVersionOutputTool.OutputVariables(versionVariables, false);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild/GitVersionTaskModule.cs b/src/GitVersion.MsBuild/GitVersionTaskModule.cs
index ea6a8011c7..3113e07bb6 100644
--- a/src/GitVersion.MsBuild/GitVersionTaskModule.cs
+++ b/src/GitVersion.MsBuild/GitVersionTaskModule.cs
@@ -31,4 +31,4 @@ public void RegisterTypes(IServiceCollection services)
         services.AddModule(new BuildServerModule());
         services.AddSingleton(sp => sp.GetService<IBuildAgentResolver>()?.Resolve());
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild/GitVersionTasks.cs b/src/GitVersion.MsBuild/GitVersionTasks.cs
index 497ca4790a..a746d8e915 100644
--- a/src/GitVersion.MsBuild/GitVersionTasks.cs
+++ b/src/GitVersion.MsBuild/GitVersionTasks.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.BuildAgents;
 using GitVersion.Extensions;
 using GitVersion.Logging;
@@ -80,4 +79,4 @@ private static IServiceProvider BuildServiceProvider(GitVersionTaskBase task)
 
         return sp;
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild/Helpers/FileHelper.cs b/src/GitVersion.MsBuild/Helpers/FileHelper.cs
index 087ef7cce5..9fadac94d8 100644
--- a/src/GitVersion.MsBuild/Helpers/FileHelper.cs
+++ b/src/GitVersion.MsBuild/Helpers/FileHelper.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Text.RegularExpressions;
 using Microsoft.Build.Framework;
 
@@ -150,4 +146,4 @@ public static FileWriteInfo GetFileWriteInfo(this string intermediateOutputPath,
         }
         return new FileWriteInfo(workingDirectory, fileName, fileExtension);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild/Helpers/MsBuildAdapter.cs b/src/GitVersion.MsBuild/Helpers/MsBuildAdapter.cs
index a0ba18b43c..7f38a85589 100644
--- a/src/GitVersion.MsBuild/Helpers/MsBuildAdapter.cs
+++ b/src/GitVersion.MsBuild/Helpers/MsBuildAdapter.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Logging;
 using Microsoft.Build.Utilities;
 
@@ -29,4 +28,4 @@ public IDisposable UseColor(ConsoleColor consoleColor)
 
         return Disposable.Create(() => Console.ForegroundColor = old);
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild/Helpers/MsBuildAppender.cs b/src/GitVersion.MsBuild/Helpers/MsBuildAppender.cs
index d4a857fc76..7c6d0fa103 100644
--- a/src/GitVersion.MsBuild/Helpers/MsBuildAppender.cs
+++ b/src/GitVersion.MsBuild/Helpers/MsBuildAppender.cs
@@ -1,4 +1,3 @@
-using System;
 using GitVersion.Logging;
 using Microsoft.Build.Utilities;
 
@@ -43,4 +42,4 @@ private void WriteLogEntry(LogLevel level, string str)
                 throw new ArgumentOutOfRangeException(nameof(level), level, null);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild/IGitVersionTaskExecutor.cs b/src/GitVersion.MsBuild/IGitVersionTaskExecutor.cs
index 63627de2b1..520496d583 100644
--- a/src/GitVersion.MsBuild/IGitVersionTaskExecutor.cs
+++ b/src/GitVersion.MsBuild/IGitVersionTaskExecutor.cs
@@ -8,4 +8,4 @@ public interface IGitVersionTaskExecutor
     void UpdateAssemblyInfo(UpdateAssemblyInfo task);
     void GenerateGitVersionInformation(GenerateGitVersionInformation task);
     void WriteVersionInfoToBuildLog(WriteVersionInfoToBuildLog task);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild/Tasks/GenerateGitVersionInformation.cs b/src/GitVersion.MsBuild/Tasks/GenerateGitVersionInformation.cs
index d830574d30..ebebf91f66 100644
--- a/src/GitVersion.MsBuild/Tasks/GenerateGitVersionInformation.cs
+++ b/src/GitVersion.MsBuild/Tasks/GenerateGitVersionInformation.cs
@@ -18,4 +18,4 @@ public class GenerateGitVersionInformation : GitVersionTaskBase
 
     protected override bool OnExecute() => GitVersionTasks.GenerateGitVersionInformation(this);
 
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild/Tasks/GetVersion.cs b/src/GitVersion.MsBuild/Tasks/GetVersion.cs
index bc2e4ed155..74f56e2df5 100644
--- a/src/GitVersion.MsBuild/Tasks/GetVersion.cs
+++ b/src/GitVersion.MsBuild/Tasks/GetVersion.cs
@@ -105,4 +105,4 @@ public class GetVersion : GitVersionTaskBase
     public string UncommittedChanges { get; set; }
 
     protected override bool OnExecute() => GitVersionTasks.GetVersion(this);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild/Tasks/UpdateAssemblyInfo.cs b/src/GitVersion.MsBuild/Tasks/UpdateAssemblyInfo.cs
index 226bfb811b..127ebbd1de 100644
--- a/src/GitVersion.MsBuild/Tasks/UpdateAssemblyInfo.cs
+++ b/src/GitVersion.MsBuild/Tasks/UpdateAssemblyInfo.cs
@@ -1,4 +1,3 @@
-using System;
 using Microsoft.Build.Framework;
 
 namespace GitVersion.MsBuild.Tasks;
@@ -21,4 +20,4 @@ public class UpdateAssemblyInfo : GitVersionTaskBase
     public string AssemblyInfoTempFilePath { get; set; }
 
     protected override bool OnExecute() => GitVersionTasks.UpdateAssemblyInfo(this);
-}
\ No newline at end of file
+}
diff --git a/src/GitVersion.MsBuild/Tasks/WriteVersionInfoToBuildLog.cs b/src/GitVersion.MsBuild/Tasks/WriteVersionInfoToBuildLog.cs
index c9b07e6165..b92f7dd187 100644
--- a/src/GitVersion.MsBuild/Tasks/WriteVersionInfoToBuildLog.cs
+++ b/src/GitVersion.MsBuild/Tasks/WriteVersionInfoToBuildLog.cs
@@ -3,4 +3,4 @@ namespace GitVersion.MsBuild.Tasks;
 public class WriteVersionInfoToBuildLog : GitVersionTaskBase
 {
     protected override bool OnExecute() => GitVersionTasks.WriteVersionInfoToBuildLog(this);
-}
\ No newline at end of file
+}

From 26a70b94e4c0a3f62f96909ab74c10bfe91ce87f Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Fri, 8 Oct 2021 09:37:00 +0200
Subject: [PATCH 16/30] (build) update cake to 1.3.0

---
 build/Directory.Packages.props              |  4 ++--
 build/build/BuildLifetime.cs                | 18 +++++++++++-------
 build/common/Utilities/Arguments.cs         |  1 +
 build/common/Utilities/BuildLifetimeBase.cs |  4 ++++
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/build/Directory.Packages.props b/build/Directory.Packages.props
index 1fbe7751a3..98c8464423 100644
--- a/build/Directory.Packages.props
+++ b/build/Directory.Packages.props
@@ -1,8 +1,8 @@
 <Project>
     <ItemGroup>
-        <PackageReference Include="Cake.Common" Version="1.2.0" />
+        <PackageReference Include="Cake.Common" Version="1.3.0" />
         <PackageReference Include="Cake.Compression" Version="0.2.6" />
-        <PackageReference Include="Cake.Frosting" Version="1.2.0" />
+        <PackageReference Include="Cake.Frosting" Version="1.3.0" />
         <PackageReference Include="Cake.Incubator" Version="6.0.0" />
 
         <PackageReference Include="Cake.Docker" Version="1.0.0" />
diff --git a/build/build/BuildLifetime.cs b/build/build/BuildLifetime.cs
index 3ed6d01272..0d314664d7 100644
--- a/build/build/BuildLifetime.cs
+++ b/build/build/BuildLifetime.cs
@@ -14,7 +14,7 @@ public override void Setup(BuildContext context)
 
         context.Credentials = Credentials.GetCredentials(context);
 
-        SetMsBuildSettingsVersion(context.MsBuildSettings, context.Version!);
+        SetMsBuildSettingsVersion(context);
 
         context.StartGroup("Build Setup");
         LogBuildInformation(context);
@@ -22,13 +22,17 @@ public override void Setup(BuildContext context)
         context.EndGroup();
     }
 
-    private static void SetMsBuildSettingsVersion(DotNetCoreMSBuildSettings msBuildSettings, BuildVersion version)
+    private static void SetMsBuildSettingsVersion(BuildContext context)
     {
-        msBuildSettings.WithProperty("Version", version.SemVersion);
-        msBuildSettings.WithProperty("AssemblyVersion", version.Version);
-        msBuildSettings.WithProperty("PackageVersion", version.NugetVersion);
-        msBuildSettings.WithProperty("FileVersion", version.Version);
-        msBuildSettings.WithProperty("InformationalVersion", version.GitVersion.InformationalVersion);
+        var msBuildSettings = context.MsBuildSettings;
+        var version = context.Version!;
+
+        msBuildSettings.SetVersion(version.SemVersion);
+        msBuildSettings.SetAssemblyVersion(version.Version);
+        msBuildSettings.SetPackageVersion(version.NugetVersion);
+        msBuildSettings.SetFileVersion(version.Version);
+        msBuildSettings.SetInformationalVersion(version.GitVersion.InformationalVersion);
+        msBuildSettings.SetContinuousIntegrationBuild(!context.IsLocalBuild);
         msBuildSettings.WithProperty("RepositoryBranch", version.GitVersion.BranchName);
         msBuildSettings.WithProperty("RepositoryCommit", version.GitVersion.Sha);
         msBuildSettings.WithProperty("NoPackageAnalysis", "true");
diff --git a/build/common/Utilities/Arguments.cs b/build/common/Utilities/Arguments.cs
index e3f2eefc58..57231705f9 100644
--- a/build/common/Utilities/Arguments.cs
+++ b/build/common/Utilities/Arguments.cs
@@ -2,6 +2,7 @@ namespace Common.Utilities;
 
 public class Arguments
 {
+    public const string Target = "target";
     public const string Configuration = "configuration";
     public const string Architecture = "arch";
     public const string DotnetTarget = "dotnet_target";
diff --git a/build/common/Utilities/BuildLifetimeBase.cs b/build/common/Utilities/BuildLifetimeBase.cs
index 7f8a6bb285..9e68a865b4 100644
--- a/build/common/Utilities/BuildLifetimeBase.cs
+++ b/build/common/Utilities/BuildLifetimeBase.cs
@@ -50,6 +50,10 @@ public override void Teardown(T context, ITeardownContext info)
     }
     protected void LogBuildInformation(T context)
     {
+        if (context.HasArgument(Arguments.Target))
+        {
+            context.Information("Target:            {0}", context.Argument<string>(Arguments.Target));
+        }
         context.Information("Version:           {0}", context.Version?.SemVersion);
         context.Information("Build Agent:       {0}", context.GetBuildAgent());
         context.Information("OS:                {0}", context.GetOS());

From 19ec4da39d2a73e4994d5ac573501ee0dd511764 Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Sat, 9 Oct 2021 17:29:56 +0200
Subject: [PATCH 17/30] (codeql) -  manually build

---
 .github/workflows/ci.yml              | 32 ++++++++++----------
 .github/workflows/codeql-analysis.yml | 42 +++++++++++++++++++++++++--
 2 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8d2f015350..dc9451f18a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,8 +49,8 @@ jobs:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
-      name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1.8.2
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '6.0.x'
         include-prerelease: true
@@ -90,8 +90,8 @@ jobs:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
-      name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1.8.2
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '6.0.x'
         include-prerelease: true
@@ -147,8 +147,8 @@ jobs:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
-      name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1.8.2
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '6.0.x'
         include-prerelease: true
@@ -194,8 +194,8 @@ jobs:
         name: nuget
         path: ${{ github.workspace }}/artifacts/packages/nuget
     -
-      name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1.8.2
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '6.0.x'
         include-prerelease: true
@@ -256,8 +256,8 @@ jobs:
       with:
         install: true
     -
-      name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1.8.2
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '6.0.x'
         include-prerelease: true
@@ -316,8 +316,8 @@ jobs:
       with:
         install: true
     -
-      name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1.8.2
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '6.0.x'
         include-prerelease: true
@@ -408,8 +408,8 @@ jobs:
         name: nuget
         path: ${{ github.workspace }}/artifacts/packages/nuget
     -
-      name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1.8.2
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '6.0.x'
         include-prerelease: true
@@ -464,8 +464,8 @@ jobs:
         name: native-macOS
         path: ${{ github.workspace }}/artifacts/packages/native
     -
-      name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1.8.2
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '6.0.x'
         include-prerelease: true
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index f6278e0e49..7a20d71524 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -29,16 +29,52 @@ jobs:
         language: [ 'csharp' ]
 
     steps:
-    - name: Checkout repository
+    -
+      name: Checkout repository
       uses: actions/checkout@v2.3.4
+    -
+      name: Fetch all history for all tags and branches
+      run: git fetch --prune --unshallow
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
 
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+    -
+      name: Cache cake frosting
+      id: cache-cake
+      uses: actions/cache@v2.1.6
+      with:
+        path: run
+        key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
+
+    -
+      name: Install .NET Core SDK 3.1.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '3.1.x'
+
+    -
+      name: Install .NET SDK 5.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '5.0.x'
+    -
+      name: Install .NET SDK 6.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+        include-prerelease: true
+    -
+      name: '[Prepare]'
+      if: steps.cache-cake.outputs.cache-hit != 'true'
+      run: dotnet build build/CI.sln --configuration=Release
+
+    -
+      name: '[Build]'
+      shell: pwsh
+      run: dotnet run/build.dll --target=Build
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1

From 4e4bd86ef3ef4480b3f3b538ceee7108ecda5a90 Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Sat, 9 Oct 2021 19:40:06 +0200
Subject: [PATCH 18/30] #2872 - added README.md file to nuget package

---
 README.md                                   |  4 --
 build/build/Startup.cs                      |  1 +
 build/build/Tasks/Package/PackageNuget.cs   |  1 +
 build/build/Tasks/Package/PackagePrepare.cs |  2 +-
 build/nuspec/GitVersion.CommandLine.nuspec  |  1 +
 build/nuspec/README.md                      | 63 +++++++++++++++++++++
 src/Directory.Build.props                   |  7 +--
 src/NuGet.Config                            |  6 --
 8 files changed, 70 insertions(+), 15 deletions(-)
 create mode 100644 build/nuspec/README.md
 delete mode 100644 src/NuGet.Config

diff --git a/README.md b/README.md
index e3cc21ee15..5b751c27b8 100644
--- a/README.md
+++ b/README.md
@@ -52,14 +52,10 @@ from The Noun Project.
 [semver]:                          http://semver.org
 [gitter]:                          https://gitter.im/GitTools/GitVersion?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 [gitter-badge]:                    https://badges.gitter.im/Join+Chat.svg
-[appveyor]:                        https://ci.appveyor.com/project/GitTools/gitversion/branch/main
-[appveyor-badge]:                  https://ci.appveyor.com/api/projects/status/sxje0wht0cscmn7w/branch/main?svg=true
 [azure-pipeline]:                  https://dev.azure.com/GitTools/GitVersion/_build/latest?definitionId=1
 [azure-pipeline-badge]:            https://dev.azure.com/GitTools/GitVersion/_apis/build/status/GitTools.GitVersion
 [github-actions]:                  https://github.com/GitTools/GitVersion/actions
 [github-actions-badge]:            https://github.com/GitTools/GitVersion/workflows/Build/badge.svg
-[travis]:                          https://travis-ci.org/GitTools/GitVersion
-[travis-badge]:                    https://travis-ci.org/GitTools/GitVersion.svg?branch=main
 [codecov]:                         https://codecov.io/gh/GitTools/GitVersion
 [codecov-badge]:                   https://codecov.io/gh/GitTools/GitVersion/branch/main/graph/badge.svg
 [docs]:                            https://gitversion.net/docs/
diff --git a/build/build/Startup.cs b/build/build/Startup.cs
index a250ebb6da..07daa5b922 100644
--- a/build/build/Startup.cs
+++ b/build/build/Startup.cs
@@ -13,6 +13,7 @@ public void Configure(IServiceCollection services)
 
         services.UseWorkingDirectory(Extensions.GetRootDirectory());
 
+        services.UseTool(new Uri("nuget:?package=NuGet.CommandLine&version=5.11.0"));
         services.UseTool(new Uri("dotnet:?package=Codecov.Tool&version=1.13.0"));
         services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.6.11"));
     }
diff --git a/build/build/Tasks/Package/PackageNuget.cs b/build/build/Tasks/Package/PackageNuget.cs
index b21d25b9dd..a75da18d25 100644
--- a/build/build/Tasks/Package/PackageNuget.cs
+++ b/build/build/Tasks/Package/PackageNuget.cs
@@ -58,6 +58,7 @@ private static void PackageUsingNuspec(BuildContextBase context)
             Files = context.GetFiles(artifactPath + "/**/*.*")
                 .Select(file => new NuSpecContent { Source = file.FullPath, Target = file.FullPath.Replace(artifactPath, "") })
                 .Concat(context.GetFiles("docs/**/package_icon.png").Select(file => new NuSpecContent { Source = file.FullPath, Target = "package_icon.png" }))
+                .Concat(context.GetFiles("build/nuspec/README.md").Select(file => new NuSpecContent { Source = file.FullPath, Target = "README.md" }))
                 .ToArray()
         };
 
diff --git a/build/build/Tasks/Package/PackagePrepare.cs b/build/build/Tasks/Package/PackagePrepare.cs
index 649bd73cdf..74be27f80a 100644
--- a/build/build/Tasks/Package/PackagePrepare.cs
+++ b/build/build/Tasks/Package/PackagePrepare.cs
@@ -59,7 +59,7 @@ private static DirectoryPath PackPrepareNative(BuildContext context, string runt
             Configuration = context.MsBuildConfiguration,
             OutputDirectory = outputPath,
             MSBuildSettings = context.MsBuildSettings,
-            ArgumentCustomization = arg => arg.Append("/p:PublishSingleFile=true"),
+            ArgumentCustomization = arg => arg.Append("/p:PublishSingleFile=true --self-contained"),
         };
 
         context.DotNetCorePublish("./src/GitVersion.App/GitVersion.App.csproj", settings);
diff --git a/build/nuspec/GitVersion.CommandLine.nuspec b/build/nuspec/GitVersion.CommandLine.nuspec
index d9a4850144..8fac567a70 100644
--- a/build/nuspec/GitVersion.CommandLine.nuspec
+++ b/build/nuspec/GitVersion.CommandLine.nuspec
@@ -16,5 +16,6 @@
     <tags>Git Versioning GitVersion GitFlowVersion GitFlow GitHubFlow SemVer</tags>
     <developmentDependency>true</developmentDependency>
     <releaseNotes>https://github.com/GitTools/GitVersion/releases</releaseNotes>
+    <readme>README.md</readme>
   </metadata>
 </package>
diff --git a/build/nuspec/README.md b/build/nuspec/README.md
new file mode 100644
index 0000000000..0dcc25704a
--- /dev/null
+++ b/build/nuspec/README.md
@@ -0,0 +1,63 @@
+![GitVersion – From git log to SemVer in no time][banner]
+
+Versioning when using Git, solved. GitVersion looks at your git history and
+works out the [Semantic Version][semver] of the commit being built.
+
+[![Gitter][gitter-badge]][gitter]
+
+| Artifact                   |                Stable                                              |   |
+| :------------------------- | :----------------------------------------------------------------- | - |
+| **GitVersion.Tool**        |                           [![NuGet][gvgt-badge]][gvgt]             |
+| **GitVersion.CommandLine** |                           [![NuGet][gvcl-badge]][gvcl]             |
+| **GitVersion.MsBuild**     |                            [![NuGet][gvt-badge]][gvt]              | Known as [GitVersionTask] before v5.6.0 |
+
+## Compatibility
+
+GitVersion works on Windows, Linux, and Mac.
+
+## Quick Links
+
+*   [Documentation][docs]
+*   [Contributing][contribute]
+*   [Why GitVersion][why]
+*   [Usage][usage]
+*   [How it works][how]
+*   [FAQ][faq]
+*   [Who is using GitVersion][who]
+
+## GitVersion in action!
+
+![README][gv-in-action]
+
+You are seeing:
+
+*   Pull requests being built as pre-release builds
+*   A branch called `release-1.0.0` producing beta v1 packages
+
+## Icon
+
+<a href="https://thenounproject.com/term/tree/13389/" target="_blank">Tree</a>
+designed by <a href="http://thenounproject.com/david.chapman" target="_blank">David Chapman</a>
+from The Noun Project.
+
+[semver]:                          http://semver.org
+[gitter]:                          https://gitter.im/GitTools/GitVersion?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+[gitter-badge]:                    https://badges.gitter.im/Join+Chat.svg
+[docs]:                            https://gitversion.net/docs/
+[gh-rel]:                          https://github.com/GitTools/GitVersion/releases/latest
+[gh-rel-badge]:                    https://img.shields.io/github/release/gittools/gitversion.svg?logo=github
+[gvt]:                             https://www.nuget.org/packages/GitVersion.MsBuild
+[gvt-badge]:                       https://img.shields.io/nuget/v/GitVersion.MsBuild.svg?logo=nuget
+[gitversiontask]:                  https://www.nuget.org/packages/GitVersionTask/
+[gvcl]:                            https://www.nuget.org/packages/GitVersion.CommandLine
+[gvcl-badge]:                      https://img.shields.io/nuget/v/GitVersion.CommandLine.svg?logo=nuget
+[gvgt]:                            https://www.nuget.org/packages/GitVersion.Tool
+[gvgt-badge]:                      https://img.shields.io/nuget/v/GitVersion.Tool.svg?logo=nuget
+[contribute]:                      https://github.com/GitTools/GitVersion/blob/main/CONTRIBUTING.md
+[why]:                             https://gitversion.net/docs/learn/why
+[usage]:                           https://gitversion.net/docs/usage
+[how]:                             https://gitversion.net/docs/learn/how-it-works
+[faq]:                             https://gitversion.net/docs/learn/faq
+[who]:                             https://gitversion.net/docs/learn/who
+[gv-in-action]:                    https://raw.github.com/GitTools/GitVersion/master/docs/input/docs/img/README.png
+[banner]:                          https://github.com/GitTools/graphics/raw/master/GitVersion/banner-1280x640.png
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 8df069d167..bef4937014 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -10,6 +10,7 @@
         <PackageTags>Git;Versioning;GitVersion;GitFlowVersion;GitFlow;GitHubFlow;SemVer</PackageTags>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageIcon>package_icon.png</PackageIcon>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageReleaseNotes>https://github.com/GitTools/GitVersion/releases</PackageReleaseNotes>
 
         <RepositoryUrl>https://github.com/GitTools/GitVersion</RepositoryUrl>
@@ -76,10 +77,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <None Include="../../docs/input/docs/img/package_icon.png">
-            <Pack>true</Pack>
-            <PackagePath>/</PackagePath>
-        </None>
+        <None Include="../../docs/input/docs/img/package_icon.png" Pack="true" PackagePath="/"/>
+        <None Include="../../build/nuspec/README.md" Pack="true" PackagePath="/"/>
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
diff --git a/src/NuGet.Config b/src/NuGet.Config
deleted file mode 100644
index 3f0e003403..0000000000
--- a/src/NuGet.Config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
-</configuration>
\ No newline at end of file

From ab4ddaf9be30fe72d191e6aaa63debfc2a36a472 Mon Sep 17 00:00:00 2001
From: Nils Andresen <nils@nils-andresen.de>
Date: Tue, 12 Oct 2021 10:28:25 +0200
Subject: [PATCH 19/30] Merge pull request #2877 from nils-a/feature/GH-2876

[Feature] Do not fail AppVeyor builds on force-push
---
 src/GitVersion.Core/BuildAgents/AppVeyor.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/GitVersion.Core/BuildAgents/AppVeyor.cs b/src/GitVersion.Core/BuildAgents/AppVeyor.cs
index f714b3bf52..7ba0ca232c 100644
--- a/src/GitVersion.Core/BuildAgents/AppVeyor.cs
+++ b/src/GitVersion.Core/BuildAgents/AppVeyor.cs
@@ -27,8 +27,16 @@ public override string GenerateSetVersionMessage(VersionVariables variables)
         };
 
         var stringContent = new StringContent(JsonSerializer.Serialize(body), Encoding.UTF8, "application/json");
-        var response = httpClient.PutAsync("api/build", stringContent).GetAwaiter().GetResult();
-        response.EnsureSuccessStatusCode();
+
+        try
+        {
+            var response = httpClient.PutAsync("api/build", stringContent).GetAwaiter().GetResult();
+            response.EnsureSuccessStatusCode();
+        }
+        catch (Exception ex)
+        {
+            return $"Failed to set AppVeyor build number to '{variables.FullSemVer}'. The error was: {ex.Message}";
+        }
 
         return $"Set AppVeyor build number to '{variables.FullSemVer}'.";
     }

From d94f35cbdc4de396347c8839f8d064523eb0e388 Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Tue, 12 Oct 2021 10:46:12 +0200
Subject: [PATCH 20/30] added descriptions to the Verbosity enum

---
 src/GitVersion.Core/Logging/Verbosity.cs      | 22 +++++++++++++++++++
 .../Git/BranchCollection.cs                   |  2 --
 .../Mocks/MockEngine.cs                       |  1 -
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/GitVersion.Core/Logging/Verbosity.cs b/src/GitVersion.Core/Logging/Verbosity.cs
index ee6b1218fd..ca8f05fe02 100644
--- a/src/GitVersion.Core/Logging/Verbosity.cs
+++ b/src/GitVersion.Core/Logging/Verbosity.cs
@@ -1,10 +1,32 @@
 namespace GitVersion.Logging;
 
+/// <summary>
+/// Represents verbosity.
+/// </summary>
 public enum Verbosity
 {
+    /// <summary>
+    /// Quiet verbosity.
+    /// </summary>
     Quiet = 0,
+
+    /// <summary>
+    /// Minimal verbosity.
+    /// </summary>
     Minimal = 1,
+
+    /// <summary>
+    /// Normal verbosity.
+    /// </summary>
     Normal = 2,
+
+    /// <summary>
+    /// Verbose verbosity.
+    /// </summary>
     Verbose = 3,
+
+    /// <summary>
+    /// Diagnostic verbosity.
+    /// </summary>
     Diagnostic = 4
 }
diff --git a/src/GitVersion.LibGit2Sharp/Git/BranchCollection.cs b/src/GitVersion.LibGit2Sharp/Git/BranchCollection.cs
index c561f9b308..adabf1335d 100644
--- a/src/GitVersion.LibGit2Sharp/Git/BranchCollection.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/BranchCollection.cs
@@ -1,5 +1,3 @@
-using System.Collections;
-
 namespace GitVersion;
 
 internal sealed class BranchCollection : IBranchCollection
diff --git a/src/GitVersion.MsBuild.Tests/Mocks/MockEngine.cs b/src/GitVersion.MsBuild.Tests/Mocks/MockEngine.cs
index 9c1301a966..3cda263564 100644
--- a/src/GitVersion.MsBuild.Tests/Mocks/MockEngine.cs
+++ b/src/GitVersion.MsBuild.Tests/Mocks/MockEngine.cs
@@ -1,4 +1,3 @@
-using System.Collections;
 using System.Collections.Concurrent;
 using GitVersion.MsBuild.Tests.Helpers;
 using Microsoft.Build.Framework;

From 570c37344e04ec5c77318dbed9868b8d9e10610f Mon Sep 17 00:00:00 2001
From: Chris Davis <74455480+chris-codeflow@users.noreply.github.com>
Date: Thu, 14 Oct 2021 09:14:20 +0100
Subject: [PATCH 21/30] Improve ToString implementation

- Correct the SemanticVersion XML comment for the default SemVer ("s") format.
- Align the IFormattable.ToString method signature with the .NET Standard 2.0 implementation.
- Throw FormatException exceptions from ToString instead of ArgumentException.
- Refactor all the ToString tests to use NUnit TestCase attributes.
---
 .../SemanticVersionTests.cs                   | 242 ++++++------------
 .../SemanticVersioning/SemanticVersion.cs     |  11 +-
 .../SemanticVersionBuildMetaData.cs           |   9 +-
 .../SemanticVersionPreReleaseTag.cs           |  10 +-
 4 files changed, 98 insertions(+), 174 deletions(-)

diff --git a/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
index 049fc4f679..985372d0a4 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
@@ -8,7 +8,6 @@ namespace GitVersion.Core.Tests;
 [TestFixture]
 public class SemanticVersionTests : TestBase
 {
-
     [TestCase("1.2.3", 1, 2, 3, null, null, null, null, null, null, null, null)]
     [TestCase("1.2", 1, 2, 0, null, null, null, null, null, null, "1.2.0", null)]
     [TestCase("1.2.3-beta", 1, 2, 3, "beta", null, null, null, null, null, null, null)]
@@ -79,183 +78,100 @@ public void VersionSorting()
     }
 
     [Test]
-    public void ToStringJTests()
+    public void ToStringWithInvalidFormatTest()
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("j"));
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("j"));
-        var fullSemVer = new SemanticVersion
+        var semVer = BuildSemVer(1, 2, 3, "rc", 1, 1);
+        Should.Throw<FormatException>(() => 
         {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3", fullSemVer.ToString("j"));
+            semVer.ToString("invalid");
+        });
     }
-    [Test]
-    public void ToStringSTests()
+
+    [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
+    [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta.4")]
+    [TestCase(1, 2, 3, "", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-4")]
+    public string ToStringTests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("s"));
-        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("s"));
-        var fullSemVer = new SemanticVersion
-        {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-beta.4", fullSemVer.ToString("s"));
-        var fullSemVerNoPreReleaseName = new SemanticVersion
-        {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-4", fullSemVerNoPreReleaseName.ToString("s"));
+        var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
+        return semVer.ToString();
     }
-    [Test]
-    public void ToStringLTests()
+
+    [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
+    [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta.4")]
+    [TestCase(1, 2, 3, "", 4, 10, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-4")]
+    public string ToStringWithSFormatTests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("l"));
-        Assert.AreEqual("1.2.3-beta4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("l"));
-        var fullSemVer = new SemanticVersion
-        {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-beta4", fullSemVer.ToString("l"));
+        var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
+        return semVer.ToString("s");
     }
-    [Test]
-    public void ToStringLpTests()
+
+    [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3")]
+    public string ToStringWithFormatJTests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("lp"));
-        Assert.AreEqual("1.2.3-beta0004", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("lp"));
-        var fullSemVer = new SemanticVersion
-        {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-beta0004", fullSemVer.ToString("lp"));
+        var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
+        return semVer.ToString("j");
     }
-    [Test]
-    public void ToStringTests()
+
+    [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta4")]
+    [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta4")]
+    public string ToStringWithFormatLTests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString());
-        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString());
-        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4+5", null).ToString());
-        var fullSemVer = new SemanticVersion
-        {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-beta.4", fullSemVer.ToString());
-        var fullSemVerNoPreReleaseName = new SemanticVersion
-        {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-4", fullSemVerNoPreReleaseName.ToString());
+        var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
+        return semVer.ToString("l");
     }
-    [Test]
-    public void ToStringFTests()
+
+    [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta0004")]
+    [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta0004")]
+    public string ToStringWithFormatLpTests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("f"));
-        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("f"));
-        Assert.AreEqual("1.2.3-beta.4+5", SemanticVersion.Parse("1.2.3-beta.4+5", null).ToString("f"));
-        var fullSemVer = new SemanticVersion
-        {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-beta.4+5", fullSemVer.ToString("f"));
+        var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
+        return semVer.ToString("lp");
     }
-    [Test]
-    public void ToStringITests()
+
+    [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
+    [TestCase(1, 2, 3, "beta", 4, 5, null, null, null, ExpectedResult = "1.2.3-beta.4+5")]
+    [TestCase(1, 2, 3, "", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-4+5")]
+    public string ToStringWithFormatFTests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
     {
-        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("i"));
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("i"));
-        Assert.AreEqual("1.2.3-beta.4+5", SemanticVersion.Parse("1.2.3-beta.4+5", null).ToString("i"));
-        var fullSemVer = new SemanticVersion
+        var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
+        return semVer.ToString("f");
+    }
+
+    [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
+    [TestCase(1, 2, 3, "beta", 4, 5, null, null, null, ExpectedResult = "1.2.3-beta.4+5")]
+    [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta.4+5.Branch.theBranch.Sha.theSha.theOtherMetaData")]
+    public string ToStringWithFormatITests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
+    {
+        var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
+        return semVer.ToString("i");
+    }
+
+    private static SemanticVersion BuildSemVer(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName = null, string sha = null, string otherMetadata = null)
+    {
+        var semVer = new SemanticVersion(major, minor, patch);
+        if (preReleaseName != null)
         {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
+            semVer.PreReleaseTag = new SemanticVersionPreReleaseTag(preReleaseName, preReleaseVersion);
+        }
+        if (buildCount.HasValue)
+        {
+            semVer.BuildMetaData = new SemanticVersionBuildMetaData
             {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-beta.4+5.Branch.TheBranch.Sha.theSha.TheOtherMetaData", fullSemVer.ToString("i"));
+                CommitsSinceTag = buildCount.Value,
+                Sha = sha,
+                Branch = branchName,
+                OtherMetaData = otherMetadata
+            };
+        }
+
+        return semVer;
     }
 }
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
index dc8617577a..c185956ff6 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 
@@ -221,10 +222,12 @@ public int CompareTo(SemanticVersion? value, bool includePrerelease)
         return 0;
     }
 
-    public override string ToString() => ToString(null);
+    public override string ToString() => ToString("s");
+
+    public string ToString(string format) => ToString(format, CultureInfo.CurrentCulture);
 
     /// <summary>
-    /// <para>s - Default SemVer [1.2.3-beta.4+5]</para>
+    /// <para>s - Default SemVer [1.2.3-beta.4]</para>
     /// <para>f - Full SemVer [1.2.3-beta.4+5]</para>
     /// <para>i - Informational SemVer [1.2.3-beta.4+5.Branch.main.BranchType.main.Sha.000000]</para>
     /// <para>j - Just the SemVer part [1.2.3]</para>
@@ -232,7 +235,7 @@ public int CompareTo(SemanticVersion? value, bool includePrerelease)
     /// <para>l - Legacy SemVer tag for systems which do not support SemVer 2.0 properly [1.2.3-beta4]</para>
     /// <para>lp - Legacy SemVer tag for systems which do not support SemVer 2.0 properly (padded) [1.2.3-beta0004]</para>
     /// </summary>
-    public string ToString(string? format, IFormatProvider? formatProvider = null)
+    public string ToString(string format, IFormatProvider formatProvider = null)
     {
         if (format.IsNullOrEmpty())
             format = "s";
@@ -271,7 +274,7 @@ public string ToString(string? format, IFormatProvider? formatProvider = null)
                     return !buildMetadata.IsNullOrEmpty() ? $"{ToString("s")}+{buildMetadata}" : ToString("s");
                 }
             default:
-                throw new ArgumentException($"Unrecognised format '{format}'", nameof(format));
+                throw new FormatException($"Unknown format '{format}'.");
         }
     }
 
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
index 5ce02a78d4..b0ec26205f 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
@@ -1,3 +1,4 @@
+using System.Globalization;
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 using GitVersion.Helpers;
@@ -59,7 +60,9 @@ public SemanticVersionBuildMetaData(SemanticVersionBuildMetaData? buildMetaData)
 
     public override int GetHashCode() => EqualityHelper.GetHashCode(this);
 
-    public override string ToString() => ToString(null);
+    public override string ToString() => ToString("b");
+
+    public string ToString(string format) => ToString(format, CultureInfo.CurrentCulture);
 
     /// <summary>
     /// <para>b - Formats just the build number</para>
@@ -67,7 +70,7 @@ public SemanticVersionBuildMetaData(SemanticVersionBuildMetaData? buildMetaData)
     /// <para>f - Formats the full build metadata</para>
     /// <para>p - Formats the padded build number. Can specify an integer for padding, default is 4. (i.e., p5)</para>
     /// </summary>
-    public string ToString(string? format, IFormatProvider? formatProvider = null)
+    public string ToString(string format, IFormatProvider formatProvider)
     {
         if (formatProvider != null)
         {
@@ -100,7 +103,7 @@ public string ToString(string? format, IFormatProvider? formatProvider = null)
             "b" => this.CommitsSinceTag.ToString(),
             "s" => $"{this.CommitsSinceTag}{(this.Sha.IsNullOrEmpty() ? null : ".Sha." + this.Sha)}".TrimStart('.'),
             "f" => $"{this.CommitsSinceTag}{(this.Branch.IsNullOrEmpty() ? null : ".Branch." + FormatMetaDataPart(this.Branch))}{(this.Sha.IsNullOrEmpty() ? null : ".Sha." + this.Sha)}{(this.OtherMetaData.IsNullOrEmpty() ? null : "." + FormatMetaDataPart(this.OtherMetaData))}".TrimStart('.'),
-            _ => throw new ArgumentException("Unrecognised format", nameof(format))
+            _ => throw new FormatException($"Unknown format '{format}'.")
         };
     }
 
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
index 72758a01fb..cf07a75608 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
@@ -1,3 +1,4 @@
+using System.Globalization;
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 using GitVersion.Helpers;
@@ -99,7 +100,6 @@ public int CompareTo(SemanticVersionPreReleaseTag? other)
             return -1;
         }
 
-
         var nameComparison = StringComparerUtils.IgnoreCaseComparer.Compare(Name, other?.Name);
         if (nameComparison != 0)
             return nameComparison;
@@ -107,7 +107,9 @@ public int CompareTo(SemanticVersionPreReleaseTag? other)
         return Nullable.Compare(Number, other?.Number);
     }
 
-    public override string? ToString() => ToString(null);
+    public override string ToString() => ToString("t");
+
+    public string ToString(string format) => ToString(format, CultureInfo.CurrentCulture);
 
     /// <summary>
     /// Default formats:
@@ -115,7 +117,7 @@ public int CompareTo(SemanticVersionPreReleaseTag? other)
     /// <para>l - Legacy SemVer tag with the tag number padded. [beta1]</para>
     /// <para>lp - Legacy SemVer tag with the tag number padded. [beta0001]. Can specify an integer to control padding (i.e., lp5)</para>
     /// </summary>
-    public string? ToString(string? format, IFormatProvider? formatProvider = null)
+    public string ToString(string format, IFormatProvider formatProvider = null)
     {
         if (formatProvider != null)
         {
@@ -147,7 +149,7 @@ public int CompareTo(SemanticVersionPreReleaseTag? other)
         {
             "t" => (Number.HasValue ? Name.IsNullOrEmpty() ? $"{Number}" : $"{Name}.{Number}" : Name),
             "l" => (Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString()) : FormatLegacy(GetLegacyName())),
-            _ => throw new ArgumentException("Unknown format", nameof(format))
+            _ => throw new FormatException($"Unknown format '{format}'.")
         };
     }
 

From 11b095232d32817255221d3768603d5b3c0161a2 Mon Sep 17 00:00:00 2001
From: Chris Davis <74455480+chris-codeflow@users.noreply.github.com>
Date: Thu, 14 Oct 2021 09:56:56 +0100
Subject: [PATCH 22/30] Remove default value for 'formatProvider' in
 SemanticVersion.ToString

- Align SemanticVersion.ToString implementation of IFormattable.ToString with .NET Standard 2.0 definition.
---
 .../VersionCalculation/SemanticVersioning/SemanticVersion.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
index c185956ff6..1e1f477b98 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
@@ -235,7 +235,7 @@ public int CompareTo(SemanticVersion? value, bool includePrerelease)
     /// <para>l - Legacy SemVer tag for systems which do not support SemVer 2.0 properly [1.2.3-beta4]</para>
     /// <para>lp - Legacy SemVer tag for systems which do not support SemVer 2.0 properly (padded) [1.2.3-beta0004]</para>
     /// </summary>
-    public string ToString(string format, IFormatProvider formatProvider = null)
+    public string ToString(string format, IFormatProvider formatProvider)
     {
         if (format.IsNullOrEmpty())
             format = "s";

From 1d69c89ddbca1c0bc3c668fe35d616cb837d780a Mon Sep 17 00:00:00 2001
From: Chris Davis <74455480+chris-codeflow@users.noreply.github.com>
Date: Thu, 14 Oct 2021 10:14:56 +0100
Subject: [PATCH 23/30] Remove default value for 'formatProvider' in
 SemanticVersionPreReleaseTag.ToString

- Align SemanticVersion.ToString implementation of IFormattable.ToString with .NET Standard 2.0 definition.
---
 .../SemanticVersioning/SemanticVersionPreReleaseTag.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
index cf07a75608..15673189c2 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
@@ -117,7 +117,7 @@ public int CompareTo(SemanticVersionPreReleaseTag? other)
     /// <para>l - Legacy SemVer tag with the tag number padded. [beta1]</para>
     /// <para>lp - Legacy SemVer tag with the tag number padded. [beta0001]. Can specify an integer to control padding (i.e., lp5)</para>
     /// </summary>
-    public string ToString(string format, IFormatProvider formatProvider = null)
+    public string ToString(string format, IFormatProvider formatProvider)
     {
         if (formatProvider != null)
         {

From 19dffc2247d42f438edaceba0b0b08b268f80673 Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Thu, 14 Oct 2021 12:23:58 +0200
Subject: [PATCH 24/30] (build) fix formatting issues in build project

---
 .editorconfig                                   |  2 +-
 build/Directory.Build.props                     |  3 +++
 build/artifacts/artifacts.csproj                |  5 -----
 build/build/build.csproj                        | 11 +++--------
 build/chores/BuildContext.cs                    |  3 ---
 build/chores/BuildLifetime.cs                   |  2 --
 build/chores/Program.cs                         |  1 -
 build/chores/Startup.cs                         |  1 -
 build/chores/Tasks/Default.cs                   |  2 --
 build/chores/Tasks/ToolsInstall.cs              |  2 --
 build/chores/Tasks/ToolsUpdate.cs               |  3 ---
 .../DotNetCoreFormatAliases.cs                  |  2 --
 .../Addins/GitVersion/GitVersionRunner.cs       | 17 ++++-------------
 build/common/Utilities/ImportUsings.cs          |  2 --
 build/docker/docker.csproj                      |  5 -----
 build/docs/docs.csproj                          |  5 -----
 build/publish/publish.csproj                    |  7 +------
 build/release/release.csproj                    |  7 +------
 18 files changed, 13 insertions(+), 67 deletions(-)
 delete mode 100644 build/common/Utilities/ImportUsings.cs

diff --git a/.editorconfig b/.editorconfig
index bdb14fea78..5eae16f5c8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -21,7 +21,7 @@ dotnet_separate_import_directive_groups = false
 dotnet_sort_system_directives_first = true
 
 # Avoid "this." and "Me." if not necessary
-dotnet_style_qualification_for_field = true:warning
+dotnet_style_qualification_for_field = false:silent
 dotnet_style_qualification_for_property = false:silent
 dotnet_style_qualification_for_method = false:silent
 dotnet_style_qualification_for_event = false:silent
diff --git a/build/Directory.Build.props b/build/Directory.Build.props
index 74888a5083..b0502c8074 100644
--- a/build/Directory.Build.props
+++ b/build/Directory.Build.props
@@ -34,5 +34,8 @@
         <Using Include="Cake.Docker" />
         <Using Include="Cake.Frosting" />
     </ItemGroup>
+    <ItemGroup>
+        <Using Include="Common.Utilities.Constants" Alias="Constants"/>
+    </ItemGroup>
 
 </Project>
diff --git a/build/artifacts/artifacts.csproj b/build/artifacts/artifacts.csproj
index 7f8c61a261..354ec021f2 100644
--- a/build/artifacts/artifacts.csproj
+++ b/build/artifacts/artifacts.csproj
@@ -6,9 +6,4 @@
     <ItemGroup>
         <ProjectReference Include="..\common\common.csproj" />
     </ItemGroup>
-    <ItemGroup>
-      <Compile Include="..\common\Utilities\ImportUsings.cs">
-        <Link>ImportUsings.cs</Link>
-      </Compile>
-    </ItemGroup>
 </Project>
diff --git a/build/build/build.csproj b/build/build/build.csproj
index 50cd719276..55494cff57 100644
--- a/build/build/build.csproj
+++ b/build/build/build.csproj
@@ -4,15 +4,10 @@
         <RootNamespace>Build</RootNamespace>
     </PropertyGroup>
     <ItemGroup>
-        <ProjectReference Include="..\common\common.csproj"/>
+        <ProjectReference Include="..\common\common.csproj" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Cake.Codecov" Version="1.0.1"/>
-        <PackageReference Include="Cake.Coverlet" Version="2.5.4"/>
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="..\common\Utilities\ImportUsings.cs">
-            <Link>ImportUsings.cs</Link>
-        </Compile>
+        <PackageReference Include="Cake.Codecov" Version="1.0.1" />
+        <PackageReference Include="Cake.Coverlet" Version="2.5.4" />
     </ItemGroup>
 </Project>
diff --git a/build/chores/BuildContext.cs b/build/chores/BuildContext.cs
index 11fc7b73da..92660009f3 100644
--- a/build/chores/BuildContext.cs
+++ b/build/chores/BuildContext.cs
@@ -1,6 +1,3 @@
-using Cake.Core;
-using Cake.Frosting;
-
 namespace Chores;
 
 public class BuildContext : FrostingContext
diff --git a/build/chores/BuildLifetime.cs b/build/chores/BuildLifetime.cs
index 70e39067c5..12dc380a02 100644
--- a/build/chores/BuildLifetime.cs
+++ b/build/chores/BuildLifetime.cs
@@ -1,5 +1,3 @@
-using Cake.Core;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Chores;
diff --git a/build/chores/Program.cs b/build/chores/Program.cs
index 1dd908aa02..e25d09e313 100644
--- a/build/chores/Program.cs
+++ b/build/chores/Program.cs
@@ -1,4 +1,3 @@
-using Cake.Frosting;
 using Chores;
 
 return new CakeHost()
diff --git a/build/chores/Startup.cs b/build/chores/Startup.cs
index 86a8f0464c..d326a2531c 100644
--- a/build/chores/Startup.cs
+++ b/build/chores/Startup.cs
@@ -1,4 +1,3 @@
-using Cake.Frosting;
 using Common.Lifetime;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/build/chores/Tasks/Default.cs b/build/chores/Tasks/Default.cs
index fad7404b6d..0df4f50886 100644
--- a/build/chores/Tasks/Default.cs
+++ b/build/chores/Tasks/Default.cs
@@ -1,5 +1,3 @@
-using Cake.Frosting;
-
 namespace Chores.Tasks;
 
 [TaskDescription("Shows this output")]
diff --git a/build/chores/Tasks/ToolsInstall.cs b/build/chores/Tasks/ToolsInstall.cs
index 0606be2b34..34304cea5d 100644
--- a/build/chores/Tasks/ToolsInstall.cs
+++ b/build/chores/Tasks/ToolsInstall.cs
@@ -1,5 +1,3 @@
-using System.Linq;
-using Cake.Frosting;
 using Cake.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/build/chores/Tasks/ToolsUpdate.cs b/build/chores/Tasks/ToolsUpdate.cs
index 2714ecba38..5b36dcc3fe 100644
--- a/build/chores/Tasks/ToolsUpdate.cs
+++ b/build/chores/Tasks/ToolsUpdate.cs
@@ -1,6 +1,3 @@
-using System.Linq;
-using Cake.Common.Tools.DotNetCore;
-using Cake.Frosting;
 using Cake.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatAliases.cs b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatAliases.cs
index 32e892246e..52b83dba40 100644
--- a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatAliases.cs
+++ b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatAliases.cs
@@ -1,5 +1,3 @@
-using Cake.Core.Annotations;
-
 namespace Common.Addins.Cake.DotNetCoreFormat;
 
 /// <summary>
diff --git a/build/common/Addins/GitVersion/GitVersionRunner.cs b/build/common/Addins/GitVersion/GitVersionRunner.cs
index be5b3392e7..8581c8c283 100644
--- a/build/common/Addins/GitVersion/GitVersionRunner.cs
+++ b/build/common/Addins/GitVersion/GitVersionRunner.cs
@@ -23,10 +23,7 @@ public GitVersionRunner(
         ICakeEnvironment environment,
         IProcessRunner processRunner,
         IToolLocator tools,
-        ICakeLog log) : base(fileSystem, environment, processRunner, tools)
-    {
-        this.log = log;
-    }
+        ICakeLog log) : base(fileSystem, environment, processRunner, tools) => this.log = log;
 
     /// <summary>
     /// Runs GitVersion and processes the results.
@@ -62,7 +59,7 @@ public GitVersion Run(GitVersionSettings settings)
         var jsonEndIndex = output.IndexOf("}", StringComparison.Ordinal);
         var json = output.Substring(jsonStartIndex, jsonEndIndex - jsonStartIndex + 1);
 
-        return JsonConvert.DeserializeObject<GitVersion>(json);
+        return JsonConvert.DeserializeObject<GitVersion>(json) ?? new GitVersion();
     }
 
     private ProcessArgumentBuilder GetArguments(GitVersionSettings settings)
@@ -163,17 +160,11 @@ private ProcessArgumentBuilder GetArguments(GitVersionSettings settings)
     /// Gets the name of the tool.
     /// </summary>
     /// <returns>The name of the tool.</returns>
-    protected override string GetToolName()
-    {
-        return "GitVersion";
-    }
+    protected override string GetToolName() => "GitVersion";
 
     /// <summary>
     /// Gets the possible names of the tool executable.
     /// </summary>
     /// <returns>The tool executable name.</returns>
-    protected override IEnumerable<string> GetToolExecutableNames()
-    {
-        return new[] { "GitVersion.exe", "dotnet-gitversion", "dotnet-gitversion.exe", "gitversion" };
-    }
+    protected override IEnumerable<string> GetToolExecutableNames() => new[] { "GitVersion.exe", "dotnet-gitversion", "dotnet-gitversion.exe", "gitversion" };
 }
diff --git a/build/common/Utilities/ImportUsings.cs b/build/common/Utilities/ImportUsings.cs
deleted file mode 100644
index 26a8b0be62..0000000000
--- a/build/common/Utilities/ImportUsings.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-// ReSharper disable once RedundantUsingDirective.Global
-global using Constants = Common.Utilities.Constants;
diff --git a/build/docker/docker.csproj b/build/docker/docker.csproj
index 610b2fe633..4b1cccd25e 100644
--- a/build/docker/docker.csproj
+++ b/build/docker/docker.csproj
@@ -6,9 +6,4 @@
     <ItemGroup>
         <ProjectReference Include="..\common\common.csproj" />
     </ItemGroup>
-    <ItemGroup>
-        <Compile Include="..\common\Utilities\ImportUsings.cs">
-            <Link>ImportUsings.cs</Link>
-        </Compile>
-    </ItemGroup>
 </Project>
diff --git a/build/docs/docs.csproj b/build/docs/docs.csproj
index 70c811d7b5..659239e7ea 100644
--- a/build/docs/docs.csproj
+++ b/build/docs/docs.csproj
@@ -10,9 +10,4 @@
         <PackageReference Include="Cake.Git" Version="1.1.0" />
         <PackageReference Include="Cake.Wyam" Version="2.2.12" />
     </ItemGroup>
-    <ItemGroup>
-        <Compile Include="..\common\Utilities\ImportUsings.cs">
-            <Link>ImportUsings.cs</Link>
-        </Compile>
-    </ItemGroup>
 </Project>
diff --git a/build/publish/publish.csproj b/build/publish/publish.csproj
index da4a7cdf4d..930e120ed3 100644
--- a/build/publish/publish.csproj
+++ b/build/publish/publish.csproj
@@ -4,11 +4,6 @@
         <RootNamespace>Publish</RootNamespace>
     </PropertyGroup>
     <ItemGroup>
-        <ProjectReference Include="..\common\common.csproj"/>
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="..\common\Utilities\ImportUsings.cs">
-            <Link>ImportUsings.cs</Link>
-        </Compile>
+        <ProjectReference Include="..\common\common.csproj" />
     </ItemGroup>
 </Project>
diff --git a/build/release/release.csproj b/build/release/release.csproj
index 23d37bde01..e915d85fd3 100644
--- a/build/release/release.csproj
+++ b/build/release/release.csproj
@@ -4,11 +4,6 @@
         <RootNamespace>Release</RootNamespace>
     </PropertyGroup>
     <ItemGroup>
-        <ProjectReference Include="..\common\common.csproj"/>
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="..\common\Utilities\ImportUsings.cs">
-            <Link>ImportUsings.cs</Link>
-        </Compile>
+        <ProjectReference Include="..\common\common.csproj" />
     </ItemGroup>
 </Project>

From e0b0ff7ece0d663fdd15187b93ab8637a874bf0d Mon Sep 17 00:00:00 2001
From: Artur <arturcic@gmail.com>
Date: Thu, 14 Oct 2021 13:03:58 +0200
Subject: [PATCH 25/30] (build) fix formatting issues in src project

---
 .../Configuration/BranchConfigurationCalculator.cs     |  5 +----
 .../Configuration/ConfigurationBuilder.cs              |  5 +----
 src/GitVersion.Core/Extensions/StringExtensions.cs     |  4 ++--
 .../SemanticVersioning/SemanticVersionBuildMetaData.cs | 10 ++--------
 .../SemanticVersioning/SemanticVersionPreReleaseTag.cs | 10 ++--------
 src/GitVersion.LibGit2Sharp/Git/CommitCollection.cs    |  6 ++----
 6 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/src/GitVersion.Core/Configuration/BranchConfigurationCalculator.cs b/src/GitVersion.Core/Configuration/BranchConfigurationCalculator.cs
index 3fbf5faac3..e87b361381 100644
--- a/src/GitVersion.Core/Configuration/BranchConfigurationCalculator.cs
+++ b/src/GitVersion.Core/Configuration/BranchConfigurationCalculator.cs
@@ -253,9 +253,6 @@ public bool Equals(IBranch b1, IBranch b2)
             return b1.Name.WithoutRemote.Equals(b2.Name.WithoutRemote);
         }
 
-        public int GetHashCode(IBranch b)
-        {
-            return b.Name.WithoutRemote.GetHashCode();
-        }
+        public int GetHashCode(IBranch b) => b.Name.WithoutRemote.GetHashCode();
     }
 }
diff --git a/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs b/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs
index 58ab331eca..58f62c6878 100644
--- a/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs
+++ b/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs
@@ -278,9 +278,6 @@ private static Config CreateDefaultConfiguration()
 
         return config;
 
-        void AddBranchConfig(string name, BranchConfig overrides)
-        {
-            config.Branches[name] = BranchConfig.CreateDefaultBranchConfig(name).Apply(overrides);
-        }
+        void AddBranchConfig(string name, BranchConfig overrides) => config.Branches[name] = BranchConfig.CreateDefaultBranchConfig(name).Apply(overrides);
     }
 }
diff --git a/src/GitVersion.Core/Extensions/StringExtensions.cs b/src/GitVersion.Core/Extensions/StringExtensions.cs
index b6069cd41d..693a836f9e 100644
--- a/src/GitVersion.Core/Extensions/StringExtensions.cs
+++ b/src/GitVersion.Core/Extensions/StringExtensions.cs
@@ -96,9 +96,9 @@ public static void AppendLineFormat(this StringBuilder stringBuilder, string for
     public static bool IsEquivalentTo(this string self, string? other) =>
         string.Equals(self, other, StringComparison.OrdinalIgnoreCase);
 
-    /// <inheritdoc cref="string.IsNullOrEmpty()"/>
+    /// <inheritdoc cref="string.IsNullOrEmpty"/>
     public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value) => string.IsNullOrEmpty(value);
 
-    /// <inheritdoc cref="string.IsNullOrWhiteSpace()"/>
+    /// <inheritdoc cref="string.IsNullOrWhiteSpace"/>
     public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value) => string.IsNullOrWhiteSpace(value);
 }
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
index 5ce02a78d4..aac3e61e99 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
@@ -110,15 +110,9 @@ public string ToString(string? format, IFormatProvider? formatProvider = null)
     public static bool operator !=(SemanticVersionBuildMetaData? left, SemanticVersionBuildMetaData? right) =>
         !Equals(left, right);
 
-    public static implicit operator string?(SemanticVersionBuildMetaData? preReleaseTag)
-    {
-        return preReleaseTag?.ToString();
-    }
+    public static implicit operator string?(SemanticVersionBuildMetaData? preReleaseTag) => preReleaseTag?.ToString();
 
-    public static implicit operator SemanticVersionBuildMetaData(string preReleaseTag)
-    {
-        return Parse(preReleaseTag);
-    }
+    public static implicit operator SemanticVersionBuildMetaData(string preReleaseTag) => Parse(preReleaseTag);
 
     public static SemanticVersionBuildMetaData Parse(string? buildMetaData)
     {
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
index 72758a01fb..90c6940e6d 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
@@ -55,15 +55,9 @@ public SemanticVersionPreReleaseTag(SemanticVersionPreReleaseTag? preReleaseTag)
     public static bool operator <=(SemanticVersionPreReleaseTag? left, SemanticVersionPreReleaseTag? right) =>
         StringComparerUtils.IgnoreCaseComparer.Compare(left?.Name, right?.Name) != 1;
 
-    public static implicit operator string?(SemanticVersionPreReleaseTag? preReleaseTag)
-    {
-        return preReleaseTag?.ToString()!;
-    }
+    public static implicit operator string?(SemanticVersionPreReleaseTag? preReleaseTag) => preReleaseTag?.ToString()!;
 
-    public static implicit operator SemanticVersionPreReleaseTag(string? preReleaseTag)
-    {
-        return Parse(preReleaseTag);
-    }
+    public static implicit operator SemanticVersionPreReleaseTag(string? preReleaseTag) => Parse(preReleaseTag);
 
     public static SemanticVersionPreReleaseTag Parse(string? preReleaseTag)
     {
diff --git a/src/GitVersion.LibGit2Sharp/Git/CommitCollection.cs b/src/GitVersion.LibGit2Sharp/Git/CommitCollection.cs
index 6d431d1ce6..fd6c0aacb9 100644
--- a/src/GitVersion.LibGit2Sharp/Git/CommitCollection.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/CommitCollection.cs
@@ -14,15 +14,13 @@ internal sealed class CommitCollection : ICommitCollection
     public IEnumerable<ICommit> GetCommitsPriorTo(DateTimeOffset olderThan) => this.SkipWhile(c => c.When > olderThan);
     public IEnumerable<ICommit> QueryBy(CommitFilter commitFilter)
     {
-        static object? GetReacheableFrom(object? item)
-        {
-            return item switch
+        static object? GetReacheableFrom(object? item) =>
+            item switch
             {
                 Commit c => (LibGit2Sharp.Commit)c,
                 Branch b => (LibGit2Sharp.Branch)b,
                 _ => null
             };
-        }
 
         var includeReachableFrom = GetReacheableFrom(commitFilter.IncludeReachableFrom);
         var excludeReachableFrom = GetReacheableFrom(commitFilter.ExcludeReachableFrom);

From 175163182a8ef3155df074fb2b00f663054b2ff2 Mon Sep 17 00:00:00 2001
From: Chris Davis <74455480+chris-codeflow@users.noreply.github.com>
Date: Thu, 14 Oct 2021 09:14:20 +0100
Subject: [PATCH 26/30] Improve ToString implementation

- Correct the SemanticVersion XML comment for the default SemVer ("s") format.
- Align the IFormattable.ToString method signature with the .NET Standard 2.0 implementation.
- Throw FormatException exceptions from ToString instead of ArgumentException.
- Refactor all the ToString tests to use NUnit TestCase attributes.
---
 .../SemanticVersionTests.cs                   | 242 ++++++------------
 .../SemanticVersioning/SemanticVersion.cs     |  11 +-
 .../SemanticVersionBuildMetaData.cs           |   9 +-
 .../SemanticVersionPreReleaseTag.cs           |  10 +-
 4 files changed, 98 insertions(+), 174 deletions(-)

diff --git a/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
index 049fc4f679..985372d0a4 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
@@ -8,7 +8,6 @@ namespace GitVersion.Core.Tests;
 [TestFixture]
 public class SemanticVersionTests : TestBase
 {
-
     [TestCase("1.2.3", 1, 2, 3, null, null, null, null, null, null, null, null)]
     [TestCase("1.2", 1, 2, 0, null, null, null, null, null, null, "1.2.0", null)]
     [TestCase("1.2.3-beta", 1, 2, 3, "beta", null, null, null, null, null, null, null)]
@@ -79,183 +78,100 @@ public void VersionSorting()
     }
 
     [Test]
-    public void ToStringJTests()
+    public void ToStringWithInvalidFormatTest()
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("j"));
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("j"));
-        var fullSemVer = new SemanticVersion
+        var semVer = BuildSemVer(1, 2, 3, "rc", 1, 1);
+        Should.Throw<FormatException>(() => 
         {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3", fullSemVer.ToString("j"));
+            semVer.ToString("invalid");
+        });
     }
-    [Test]
-    public void ToStringSTests()
+
+    [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
+    [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta.4")]
+    [TestCase(1, 2, 3, "", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-4")]
+    public string ToStringTests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("s"));
-        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("s"));
-        var fullSemVer = new SemanticVersion
-        {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-beta.4", fullSemVer.ToString("s"));
-        var fullSemVerNoPreReleaseName = new SemanticVersion
-        {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-4", fullSemVerNoPreReleaseName.ToString("s"));
+        var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
+        return semVer.ToString();
     }
-    [Test]
-    public void ToStringLTests()
+
+    [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
+    [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta.4")]
+    [TestCase(1, 2, 3, "", 4, 10, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-4")]
+    public string ToStringWithSFormatTests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("l"));
-        Assert.AreEqual("1.2.3-beta4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("l"));
-        var fullSemVer = new SemanticVersion
-        {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-beta4", fullSemVer.ToString("l"));
+        var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
+        return semVer.ToString("s");
     }
-    [Test]
-    public void ToStringLpTests()
+
+    [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3")]
+    public string ToStringWithFormatJTests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("lp"));
-        Assert.AreEqual("1.2.3-beta0004", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("lp"));
-        var fullSemVer = new SemanticVersion
-        {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-beta0004", fullSemVer.ToString("lp"));
+        var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
+        return semVer.ToString("j");
     }
-    [Test]
-    public void ToStringTests()
+
+    [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta4")]
+    [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta4")]
+    public string ToStringWithFormatLTests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString());
-        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString());
-        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4+5", null).ToString());
-        var fullSemVer = new SemanticVersion
-        {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-beta.4", fullSemVer.ToString());
-        var fullSemVerNoPreReleaseName = new SemanticVersion
-        {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-4", fullSemVerNoPreReleaseName.ToString());
+        var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
+        return semVer.ToString("l");
     }
-    [Test]
-    public void ToStringFTests()
+
+    [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta0004")]
+    [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta0004")]
+    public string ToStringWithFormatLpTests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
     {
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("f"));
-        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("f"));
-        Assert.AreEqual("1.2.3-beta.4+5", SemanticVersion.Parse("1.2.3-beta.4+5", null).ToString("f"));
-        var fullSemVer = new SemanticVersion
-        {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
-            {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-beta.4+5", fullSemVer.ToString("f"));
+        var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
+        return semVer.ToString("lp");
     }
-    [Test]
-    public void ToStringITests()
+
+    [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
+    [TestCase(1, 2, 3, "beta", 4, 5, null, null, null, ExpectedResult = "1.2.3-beta.4+5")]
+    [TestCase(1, 2, 3, "", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-4+5")]
+    public string ToStringWithFormatFTests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
     {
-        Assert.AreEqual("1.2.3-beta.4", SemanticVersion.Parse("1.2.3-beta.4", null).ToString("i"));
-        Assert.AreEqual("1.2.3", SemanticVersion.Parse("1.2.3", null).ToString("i"));
-        Assert.AreEqual("1.2.3-beta.4+5", SemanticVersion.Parse("1.2.3-beta.4+5", null).ToString("i"));
-        var fullSemVer = new SemanticVersion
+        var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
+        return semVer.ToString("f");
+    }
+
+    [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
+    [TestCase(1, 2, 3, "beta", 4, null, null, null, null, ExpectedResult = "1.2.3-beta.4")]
+    [TestCase(1, 2, 3, "beta", 4, 5, null, null, null, ExpectedResult = "1.2.3-beta.4+5")]
+    [TestCase(1, 2, 3, "beta", 4, 5, "theBranch", "theSha", "theOtherMetaData", ExpectedResult = "1.2.3-beta.4+5.Branch.theBranch.Sha.theSha.theOtherMetaData")]
+    public string ToStringWithFormatITests(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName, string sha, string otherMetadata)
+    {
+        var semVer = BuildSemVer(major, minor, patch, preReleaseName, preReleaseVersion, buildCount, branchName, sha, otherMetadata);
+        return semVer.ToString("i");
+    }
+
+    private static SemanticVersion BuildSemVer(int major, int minor, int patch, string preReleaseName, int preReleaseVersion, int? buildCount, string branchName = null, string sha = null, string otherMetadata = null)
+    {
+        var semVer = new SemanticVersion(major, minor, patch);
+        if (preReleaseName != null)
         {
-            Major = 1,
-            Minor = 2,
-            Patch = 3,
-            PreReleaseTag = new SemanticVersionPreReleaseTag("beta", 4),
-            BuildMetaData = new SemanticVersionBuildMetaData
+            semVer.PreReleaseTag = new SemanticVersionPreReleaseTag(preReleaseName, preReleaseVersion);
+        }
+        if (buildCount.HasValue)
+        {
+            semVer.BuildMetaData = new SemanticVersionBuildMetaData
             {
-                Sha = "theSha",
-                Branch = "TheBranch",
-                CommitsSinceTag = 5,
-                OtherMetaData = "TheOtherMetaData"
-            }
-        };
-        Assert.AreEqual("1.2.3-beta.4+5.Branch.TheBranch.Sha.theSha.TheOtherMetaData", fullSemVer.ToString("i"));
+                CommitsSinceTag = buildCount.Value,
+                Sha = sha,
+                Branch = branchName,
+                OtherMetaData = otherMetadata
+            };
+        }
+
+        return semVer;
     }
 }
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
index dc8617577a..c185956ff6 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 
@@ -221,10 +222,12 @@ public int CompareTo(SemanticVersion? value, bool includePrerelease)
         return 0;
     }
 
-    public override string ToString() => ToString(null);
+    public override string ToString() => ToString("s");
+
+    public string ToString(string format) => ToString(format, CultureInfo.CurrentCulture);
 
     /// <summary>
-    /// <para>s - Default SemVer [1.2.3-beta.4+5]</para>
+    /// <para>s - Default SemVer [1.2.3-beta.4]</para>
     /// <para>f - Full SemVer [1.2.3-beta.4+5]</para>
     /// <para>i - Informational SemVer [1.2.3-beta.4+5.Branch.main.BranchType.main.Sha.000000]</para>
     /// <para>j - Just the SemVer part [1.2.3]</para>
@@ -232,7 +235,7 @@ public int CompareTo(SemanticVersion? value, bool includePrerelease)
     /// <para>l - Legacy SemVer tag for systems which do not support SemVer 2.0 properly [1.2.3-beta4]</para>
     /// <para>lp - Legacy SemVer tag for systems which do not support SemVer 2.0 properly (padded) [1.2.3-beta0004]</para>
     /// </summary>
-    public string ToString(string? format, IFormatProvider? formatProvider = null)
+    public string ToString(string format, IFormatProvider formatProvider = null)
     {
         if (format.IsNullOrEmpty())
             format = "s";
@@ -271,7 +274,7 @@ public string ToString(string? format, IFormatProvider? formatProvider = null)
                     return !buildMetadata.IsNullOrEmpty() ? $"{ToString("s")}+{buildMetadata}" : ToString("s");
                 }
             default:
-                throw new ArgumentException($"Unrecognised format '{format}'", nameof(format));
+                throw new FormatException($"Unknown format '{format}'.");
         }
     }
 
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
index aac3e61e99..2dd3f8e588 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionBuildMetaData.cs
@@ -1,3 +1,4 @@
+using System.Globalization;
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 using GitVersion.Helpers;
@@ -59,7 +60,9 @@ public SemanticVersionBuildMetaData(SemanticVersionBuildMetaData? buildMetaData)
 
     public override int GetHashCode() => EqualityHelper.GetHashCode(this);
 
-    public override string ToString() => ToString(null);
+    public override string ToString() => ToString("b");
+
+    public string ToString(string format) => ToString(format, CultureInfo.CurrentCulture);
 
     /// <summary>
     /// <para>b - Formats just the build number</para>
@@ -67,7 +70,7 @@ public SemanticVersionBuildMetaData(SemanticVersionBuildMetaData? buildMetaData)
     /// <para>f - Formats the full build metadata</para>
     /// <para>p - Formats the padded build number. Can specify an integer for padding, default is 4. (i.e., p5)</para>
     /// </summary>
-    public string ToString(string? format, IFormatProvider? formatProvider = null)
+    public string ToString(string format, IFormatProvider formatProvider)
     {
         if (formatProvider != null)
         {
@@ -100,7 +103,7 @@ public string ToString(string? format, IFormatProvider? formatProvider = null)
             "b" => this.CommitsSinceTag.ToString(),
             "s" => $"{this.CommitsSinceTag}{(this.Sha.IsNullOrEmpty() ? null : ".Sha." + this.Sha)}".TrimStart('.'),
             "f" => $"{this.CommitsSinceTag}{(this.Branch.IsNullOrEmpty() ? null : ".Branch." + FormatMetaDataPart(this.Branch))}{(this.Sha.IsNullOrEmpty() ? null : ".Sha." + this.Sha)}{(this.OtherMetaData.IsNullOrEmpty() ? null : "." + FormatMetaDataPart(this.OtherMetaData))}".TrimStart('.'),
-            _ => throw new ArgumentException("Unrecognised format", nameof(format))
+            _ => throw new FormatException($"Unknown format '{format}'.")
         };
     }
 
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
index 90c6940e6d..43c2d6652e 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
@@ -1,3 +1,4 @@
+using System.Globalization;
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
 using GitVersion.Helpers;
@@ -93,7 +94,6 @@ public int CompareTo(SemanticVersionPreReleaseTag? other)
             return -1;
         }
 
-
         var nameComparison = StringComparerUtils.IgnoreCaseComparer.Compare(Name, other?.Name);
         if (nameComparison != 0)
             return nameComparison;
@@ -101,7 +101,9 @@ public int CompareTo(SemanticVersionPreReleaseTag? other)
         return Nullable.Compare(Number, other?.Number);
     }
 
-    public override string? ToString() => ToString(null);
+    public override string ToString() => ToString("t");
+
+    public string ToString(string format) => ToString(format, CultureInfo.CurrentCulture);
 
     /// <summary>
     /// Default formats:
@@ -109,7 +111,7 @@ public int CompareTo(SemanticVersionPreReleaseTag? other)
     /// <para>l - Legacy SemVer tag with the tag number padded. [beta1]</para>
     /// <para>lp - Legacy SemVer tag with the tag number padded. [beta0001]. Can specify an integer to control padding (i.e., lp5)</para>
     /// </summary>
-    public string? ToString(string? format, IFormatProvider? formatProvider = null)
+    public string ToString(string format, IFormatProvider formatProvider = null)
     {
         if (formatProvider != null)
         {
@@ -141,7 +143,7 @@ public int CompareTo(SemanticVersionPreReleaseTag? other)
         {
             "t" => (Number.HasValue ? Name.IsNullOrEmpty() ? $"{Number}" : $"{Name}.{Number}" : Name),
             "l" => (Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString()) : FormatLegacy(GetLegacyName())),
-            _ => throw new ArgumentException("Unknown format", nameof(format))
+            _ => throw new FormatException($"Unknown format '{format}'.")
         };
     }
 

From 94ac0b6a2aec3ca4ba1a300e65cb92ef5c156045 Mon Sep 17 00:00:00 2001
From: Chris Davis <74455480+chris-codeflow@users.noreply.github.com>
Date: Thu, 14 Oct 2021 09:56:56 +0100
Subject: [PATCH 27/30] Remove default value for 'formatProvider' in
 SemanticVersion.ToString

- Align SemanticVersion.ToString implementation of IFormattable.ToString with .NET Standard 2.0 definition.
---
 .../VersionCalculation/SemanticVersioning/SemanticVersion.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
index c185956ff6..1e1f477b98 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersion.cs
@@ -235,7 +235,7 @@ public int CompareTo(SemanticVersion? value, bool includePrerelease)
     /// <para>l - Legacy SemVer tag for systems which do not support SemVer 2.0 properly [1.2.3-beta4]</para>
     /// <para>lp - Legacy SemVer tag for systems which do not support SemVer 2.0 properly (padded) [1.2.3-beta0004]</para>
     /// </summary>
-    public string ToString(string format, IFormatProvider formatProvider = null)
+    public string ToString(string format, IFormatProvider formatProvider)
     {
         if (format.IsNullOrEmpty())
             format = "s";

From 3ffbf8e5dea0149647202280b6ad27666a196762 Mon Sep 17 00:00:00 2001
From: Chris Davis <74455480+chris-codeflow@users.noreply.github.com>
Date: Thu, 14 Oct 2021 10:14:56 +0100
Subject: [PATCH 28/30] Remove default value for 'formatProvider' in
 SemanticVersionPreReleaseTag.ToString

- Align SemanticVersion.ToString implementation of IFormattable.ToString with .NET Standard 2.0 definition.
---
 .../SemanticVersioning/SemanticVersionPreReleaseTag.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
index 43c2d6652e..11d8977ac7 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
@@ -111,7 +111,7 @@ public int CompareTo(SemanticVersionPreReleaseTag? other)
     /// <para>l - Legacy SemVer tag with the tag number padded. [beta1]</para>
     /// <para>lp - Legacy SemVer tag with the tag number padded. [beta0001]. Can specify an integer to control padding (i.e., lp5)</para>
     /// </summary>
-    public string ToString(string format, IFormatProvider formatProvider = null)
+    public string ToString(string format, IFormatProvider formatProvider)
     {
         if (formatProvider != null)
         {

From e78e99846c32a311feb5f22a429e8aa6a1c4bc2b Mon Sep 17 00:00:00 2001
From: Chris Davis <74455480+chris-codeflow@users.noreply.github.com>
Date: Thu, 14 Oct 2021 22:37:07 +0100
Subject: [PATCH 29/30] Resolve dotnet format warnings

---
 .../VersionCalculation/SemanticVersionTests.cs               | 5 +----
 .../SemanticVersioning/SemanticVersionPreReleaseTag.cs       | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
index 985372d0a4..520d7c2686 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs
@@ -81,10 +81,7 @@ public void VersionSorting()
     public void ToStringWithInvalidFormatTest()
     {
         var semVer = BuildSemVer(1, 2, 3, "rc", 1, 1);
-        Should.Throw<FormatException>(() => 
-        {
-            semVer.ToString("invalid");
-        });
+        Should.Throw<FormatException>(() => semVer.ToString("invalid"));
     }
 
     [TestCase(1, 2, 3, null, null, null, null, null, null, ExpectedResult = "1.2.3")]
diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
index 11d8977ac7..d67356cd04 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
@@ -141,7 +141,7 @@ public string ToString(string format, IFormatProvider formatProvider)
 
         return format switch
         {
-            "t" => (Number.HasValue ? Name.IsNullOrEmpty() ? $"{Number}" : $"{Name}.{Number}" : Name),
+            "t" => (Number.HasValue ? Name.IsNullOrEmpty() ? $"{Number}" : $"{Name}.{Number}" : Name!),
             "l" => (Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString()) : FormatLegacy(GetLegacyName())),
             _ => throw new FormatException($"Unknown format '{format}'.")
         };

From de8cbcfa6f30be99e54ab0d119052ccdbd6e0b2b Mon Sep 17 00:00:00 2001
From: Chris Davis <74455480+chris-codeflow@users.noreply.github.com>
Date: Thu, 14 Oct 2021 22:48:25 +0100
Subject: [PATCH 30/30] Correctly resolve dotnet format warning

---
 .../SemanticVersioning/SemanticVersionPreReleaseTag.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
index d67356cd04..83c3f6da19 100644
--- a/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
+++ b/src/GitVersion.Core/VersionCalculation/SemanticVersioning/SemanticVersionPreReleaseTag.cs
@@ -141,7 +141,7 @@ public string ToString(string format, IFormatProvider formatProvider)
 
         return format switch
         {
-            "t" => (Number.HasValue ? Name.IsNullOrEmpty() ? $"{Number}" : $"{Name}.{Number}" : Name!),
+            "t" => (Number.HasValue ? Name.IsNullOrEmpty() ? $"{Number}" : $"{Name}.{Number}" : Name ?? string.Empty),
             "l" => (Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString()) : FormatLegacy(GetLegacyName())),
             _ => throw new FormatException($"Unknown format '{format}'.")
         };