From ba16677320dd3ba6d5cf8cd461d0d3c09abdfee3 Mon Sep 17 00:00:00 2001
From: Artur Stolear <artur.stolear@gmail.com>
Date: Wed, 12 Nov 2025 03:46:52 +0100
Subject: [PATCH 01/10] Updates dotnet and docker versions

Updates the latest .NET LTS version to 10.0.
Includes .NET 8.0 in the supported versions array.
Sets the latest Docker distribution to Ubuntu 24.04.
---
 build/common/Utilities/Constants.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs
index 49eac5f818..2a6ad5f6ff 100644
--- a/build/common/Utilities/Constants.cs
+++ b/build/common/Utilities/Constants.cs
@@ -6,8 +6,8 @@ public static class Constants
     public const string RepoOwner = "GitTools";
     public const string Repository = "GitVersion";
 
-    public const string DotnetLtsLatest = "8.0";
-    public static readonly string[] DotnetVersions = [DotnetLtsLatest, "9.0"];
+    public const string DotnetLtsLatest = "10.0";
+    public static readonly string[] DotnetVersions = [DotnetLtsLatest, "9.0", "8.0"];
 
     public const string DefaultBranch = "main";
     public const string DefaultConfiguration = "Release";
@@ -30,7 +30,7 @@ public static class Constants
     public const string FedoraLatest = "fedora.42";
     public const string UbuntuLatest = "ubuntu.24.04";
 
-    public const string DockerDistroLatest = DebianLatest;
+    public const string DockerDistroLatest = UbuntuLatest;
 
     public static readonly string[] DockerDistros =
     [

From 7cd7c4288e5a016bef0562e882631f296199c55a Mon Sep 17 00:00:00 2001
From: Artur Stolear <artur.stolear@gmail.com>
Date: Wed, 12 Nov 2025 04:10:19 +0100
Subject: [PATCH 02/10] updates .net TFM to net10.0

updates the target framework moniker to .net 10.0 for all build configurations.
---
 build/.run/Artifacts DotnetTool Test.run.xml  |  2 +-
 build/.run/Artifacts Executable Test.run.xml  |  4 ++--
 build/.run/Artifacts MsBuildCore Test.run.xml |  2 +-
 build/.run/Artifacts MsBuildFull Test.run.xml |  4 ++--
 build/.run/Artifacts Native Test.run.xml      |  2 +-
 build/.run/Artifacts Prepare.run.xml          |  2 +-
 build/.run/Artifacts Test.run.xml             |  2 +-
 build/.run/Build Docs.run.xml                 |  4 ++--
 build/.run/Build Prepare.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 Config.run.xml             |  4 ++--
 build/.run/Default Docker.run.xml             |  4 ++--
 build/.run/Default Docs.run.xml               |  4 ++--
 build/.run/Default Publish.run.xml            |  4 ++--
 build/.run/Docker Build.run.xml               |  2 +-
 build/.run/Docker Manifest.run.xml            |  2 +-
 build/.run/Docker Publish.run.xml             |  2 +-
 build/.run/Docker Test.run.xml                |  2 +-
 build/.run/DockerHub Readme Publish.run.xml   |  4 ++--
 build/.run/Generate Schemas.run.xml           |  8 ++++---
 build/.run/Package Archive.run.xml            |  4 ++--
 build/.run/Package Chocolatey.run.xml         |  4 ++--
 build/.run/Package Nuget.run.xml              |  4 ++--
 build/.run/Package Prepare.run.xml            |  4 ++--
 build/.run/Package.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/PublishCoverage.run.xml            |  2 +-
 build/.run/SetMatrix.run.xml                  |  4 ++--
 build/.run/Test.run.xml                       |  4 ++--
 build/.run/UnitTest (8.0).run.xml             | 16 +++++++++----
 build/.run/UnitTest (9.0).run.xml             |  4 ++--
 build/.run/UnitTest (Lts Latest).run.xml      | 23 +++++++++++++++++++
 build/.run/Validate Version.run.xml           |  4 ++--
 build/Directory.Build.props                   |  2 +-
 42 files changed, 106 insertions(+), 75 deletions(-)
 create mode 100644 build/.run/UnitTest (Lts Latest).run.xml

diff --git a/build/.run/Artifacts DotnetTool Test.run.xml b/build/.run/Artifacts DotnetTool Test.run.xml
index ffb49db890..ac637febb2 100644
--- a/build/.run/Artifacts DotnetTool Test.run.xml	
+++ b/build/.run/Artifacts DotnetTool Test.run.xml	
@@ -15,7 +15,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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Artifacts Executable Test.run.xml b/build/.run/Artifacts Executable Test.run.xml
index 85538064f0..6e783555c6 100644
--- a/build/.run/Artifacts Executable Test.run.xml	
+++ b/build/.run/Artifacts Executable Test.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 8478f08108..9c99fb04c5 100644
--- a/build/.run/Artifacts MsBuildCore Test.run.xml	
+++ b/build/.run/Artifacts MsBuildCore Test.run.xml	
@@ -15,7 +15,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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Artifacts MsBuildFull Test.run.xml b/build/.run/Artifacts MsBuildFull Test.run.xml
index 537874156c..b7f3868d0f 100644
--- a/build/.run/Artifacts MsBuildFull Test.run.xml	
+++ b/build/.run/Artifacts MsBuildFull Test.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 b7ea118f83..db24e6631a 100644
--- a/build/.run/Artifacts Native Test.run.xml	
+++ b/build/.run/Artifacts Native Test.run.xml	
@@ -15,7 +15,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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Artifacts Prepare.run.xml b/build/.run/Artifacts Prepare.run.xml
index 43c9e42042..2ca9aae938 100644
--- a/build/.run/Artifacts Prepare.run.xml	
+++ b/build/.run/Artifacts Prepare.run.xml	
@@ -15,7 +15,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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Artifacts Test.run.xml b/build/.run/Artifacts Test.run.xml
index b9807ea4a4..74ba913fd5 100644
--- a/build/.run/Artifacts Test.run.xml	
+++ b/build/.run/Artifacts Test.run.xml	
@@ -15,7 +15,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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Build Docs.run.xml b/build/.run/Build Docs.run.xml
index 43431e74bb..06a7e06e57 100644
--- a/build/.run/Build Docs.run.xml	
+++ b/build/.run/Build Docs.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Build Prepare.run.xml b/build/.run/Build Prepare.run.xml
index 2e820c42fe..11b58ba567 100644
--- a/build/.run/Build Prepare.run.xml	
+++ b/build/.run/Build Prepare.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 e178484aae..0dc4e8dcaf 100644
--- a/build/.run/Build.run.xml
+++ b/build/.run/Build.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 d1c8841cc2..a868440dcb 100644
--- a/build/.run/Clean.run.xml
+++ b/build/.run/Clean.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 560927676b..1766cb3588 100644
--- a/build/.run/Code Format.run.xml	
+++ b/build/.run/Code Format.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 fe2a2c7a99..e4d3a3d141 100644
--- a/build/.run/Default Artifacts.run.xml	
+++ b/build/.run/Default Artifacts.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 6abaa465f3..e57f500364 100644
--- a/build/.run/Default Build.run.xml	
+++ b/build/.run/Default Build.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Default Config.run.xml b/build/.run/Default Config.run.xml
index 1d2cb9fab3..110139461a 100644
--- a/build/.run/Default Config.run.xml	
+++ b/build/.run/Default Config.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 461aaa85bc..679c299eaf 100644
--- a/build/.run/Default Docker.run.xml	
+++ b/build/.run/Default Docker.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 b4ea267b7b..c4e4f37498 100644
--- a/build/.run/Default Docs.run.xml	
+++ b/build/.run/Default Docs.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Default Publish.run.xml b/build/.run/Default Publish.run.xml
index 03f349b259..0312d93626 100644
--- a/build/.run/Default Publish.run.xml	
+++ b/build/.run/Default Publish.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 b2da1eadd5..dddb517c18 100644
--- a/build/.run/Docker Build.run.xml	
+++ b/build/.run/Docker Build.run.xml	
@@ -15,7 +15,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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Docker Manifest.run.xml b/build/.run/Docker Manifest.run.xml
index deb625e045..7bac96983b 100644
--- a/build/.run/Docker Manifest.run.xml	
+++ b/build/.run/Docker Manifest.run.xml	
@@ -15,7 +15,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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Docker Publish.run.xml b/build/.run/Docker Publish.run.xml
index 25a5f9d7a7..3bea5a43de 100644
--- a/build/.run/Docker Publish.run.xml	
+++ b/build/.run/Docker Publish.run.xml	
@@ -15,7 +15,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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Docker Test.run.xml b/build/.run/Docker Test.run.xml
index f7664d6759..d821ef967d 100644
--- a/build/.run/Docker Test.run.xml	
+++ b/build/.run/Docker Test.run.xml	
@@ -15,7 +15,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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/DockerHub Readme Publish.run.xml b/build/.run/DockerHub Readme Publish.run.xml
index 4ac6c97d64..dcae856c01 100644
--- a/build/.run/DockerHub Readme Publish.run.xml	
+++ b/build/.run/DockerHub Readme Publish.run.xml	
@@ -17,9 +17,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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Generate Schemas.run.xml b/build/.run/Generate Schemas.run.xml
index e009ddc54a..cacf21449e 100644
--- a/build/.run/Generate Schemas.run.xml	
+++ b/build/.run/Generate Schemas.run.xml	
@@ -7,18 +7,20 @@
     <envs>
       <env name="DOTNET_ROLL_FORWARD" value="Major" />
     </envs>
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/docs/docs.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
-      <option name="RunConfigurationTask" enabled="false" run_configuration_name="Build Prepare" run_configuration_type="DotNetProject" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/build/.run/Package Archive.run.xml b/build/.run/Package Archive.run.xml
index fa6cca1b56..bea73dddb4 100644
--- a/build/.run/Package Archive.run.xml	
+++ b/build/.run/Package Archive.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 88b86ef25c..85c6b81350 100644
--- a/build/.run/Package Chocolatey.run.xml	
+++ b/build/.run/Package 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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 841a3a4fc8..b53ba74eb4 100644
--- a/build/.run/Package Nuget.run.xml	
+++ b/build/.run/Package 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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Package Prepare.run.xml b/build/.run/Package Prepare.run.xml
index 9c72d75e52..37df46f54a 100644
--- a/build/.run/Package Prepare.run.xml	
+++ b/build/.run/Package Prepare.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 ecb147deb9..28628d18e8 100644
--- a/build/.run/Package.run.xml
+++ b/build/.run/Package.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 d0bd79cb9e..ddd3ea3588 100644
--- a/build/.run/Preview Docs.run.xml	
+++ b/build/.run/Preview Docs.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 1dae103da1..0dc1784c12 100644
--- a/build/.run/Publish Chocolatey.run.xml	
+++ b/build/.run/Publish Chocolatey.run.xml	
@@ -16,9 +16,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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 22ceca648b..520df9453c 100644
--- a/build/.run/Publish Docs.run.xml	
+++ b/build/.run/Publish Docs.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 1e1bb97cb2..60c309b33f 100644
--- a/build/.run/Publish Nuget.run.xml	
+++ b/build/.run/Publish Nuget.run.xml	
@@ -16,9 +16,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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 a6b1e66b5a..683971553a 100644
--- a/build/.run/Publish Release.run.xml	
+++ b/build/.run/Publish Release.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/PublishCoverage.run.xml b/build/.run/PublishCoverage.run.xml
index 1b2c752e41..e9b2e989db 100644
--- a/build/.run/PublishCoverage.run.xml
+++ b/build/.run/PublishCoverage.run.xml
@@ -16,7 +16,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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/SetMatrix.run.xml b/build/.run/SetMatrix.run.xml
index 2ee4920e9a..b493f9b517 100644
--- a/build/.run/SetMatrix.run.xml
+++ b/build/.run/SetMatrix.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.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 2a2db6d92e..189aad3587 100644
--- a/build/.run/Test.run.xml
+++ b/build/.run/Test.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/UnitTest (8.0).run.xml b/build/.run/UnitTest (8.0).run.xml
index 2c39db1e1c..dfeefaa35d 100644
--- a/build/.run/UnitTest (8.0).run.xml	
+++ b/build/.run/UnitTest (8.0).run.xml	
@@ -1,20 +1,26 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="UnitTest (Lts Latest)" type="DotNetProject" factoryName=".NET Project" folderName="Unit Test">
+  <configuration default="false" name="UnitTest (8.0)" type="DotNetProject" factoryName=".NET Project" folderName="Unit Test">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
-    <option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_version=lts-latest" />
+    <option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_version=8.0" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <envs>
+      <env name="DOTNET_ROLL_FORWARD" value="Major" />
+    </envs>
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/build/.run/UnitTest (9.0).run.xml b/build/.run/UnitTest (9.0).run.xml
index e9702af0a9..9b6dbafd7b 100644
--- a/build/.run/UnitTest (9.0).run.xml	
+++ b/build/.run/UnitTest (9.0).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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/UnitTest (Lts Latest).run.xml b/build/.run/UnitTest (Lts Latest).run.xml
new file mode 100644
index 0000000000..d10fff56d7
--- /dev/null
+++ b/build/.run/UnitTest (Lts Latest).run.xml	
@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="UnitTest (Lts Latest)" type="DotNetProject" factoryName=".NET Project" folderName="Unit Test">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
+    <option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_version=lts-latest" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
+    <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="net10.0" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/build/.run/Validate Version.run.xml b/build/.run/Validate Version.run.xml
index 527061c25e..fc7fc77ccd 100644
--- a/build/.run/Validate Version.run.xml	
+++ b/build/.run/Validate Version.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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/Directory.Build.props b/build/Directory.Build.props
index 9b2f07e792..717a7004bf 100644
--- a/build/Directory.Build.props
+++ b/build/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
         <OutputPath>..\..\run\</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

From 34d49c3a755ac6e9d0a20ca50e8a2044bc6fd400 Mon Sep 17 00:00:00 2001
From: Artur Stolear <artur.stolear@gmail.com>
Date: Wed, 12 Nov 2025 04:10:59 +0100
Subject: [PATCH 03/10] updates to net10.0

updates the target framework to net10.0 for the cli.
---
 new-cli/.run/Calculate.run.xml           | 13 ++++++++-----
 new-cli/.run/Config Help.run.xml         | 13 ++++++++-----
 new-cli/.run/Config Init.run.xml         | 13 ++++++++-----
 new-cli/.run/Config Show.run.xml         | 13 ++++++++-----
 new-cli/.run/Help.run.xml                | 13 ++++++++-----
 new-cli/.run/Normalize.run.xml           | 13 ++++++++-----
 new-cli/.run/Output AssemblyInfo.run.xml |  6 +++---
 new-cli/.run/Output Help.run.xml         | 13 ++++++++-----
 new-cli/.run/Output Project.run.xml      | 13 ++++++++-----
 new-cli/.run/Output Wix.run.xml          | 13 ++++++++-----
 new-cli/.run/TestCommand.run.xml         | 12 +++++-------
 new-cli/.run/Tester.run.xml              | 13 ++++++++-----
 new-cli/.run/Version.run.xml             | 13 ++++++++-----
 new-cli/Directory.Build.props            |  2 +-
 14 files changed, 97 insertions(+), 66 deletions(-)

diff --git a/new-cli/.run/Calculate.run.xml b/new-cli/.run/Calculate.run.xml
index 018cb7f4fc..49ed2806d4 100644
--- a/new-cli/.run/Calculate.run.xml
+++ b/new-cli/.run/Calculate.run.xml
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Calculate" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="@docs/calculate.rsp" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.Cli/GitVersion.Cli.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="net9.0" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="Unloaded" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/new-cli/.run/Config Help.run.xml b/new-cli/.run/Config Help.run.xml
index 4e0be82dd7..c1364f1f17 100644
--- a/new-cli/.run/Config Help.run.xml	
+++ b/new-cli/.run/Config Help.run.xml	
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Config Help" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="@docs/config-help.rsp" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.Cli/GitVersion.Cli.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="net9.0" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="Unloaded" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/new-cli/.run/Config Init.run.xml b/new-cli/.run/Config Init.run.xml
index f188a379c1..d23d840cf4 100644
--- a/new-cli/.run/Config Init.run.xml	
+++ b/new-cli/.run/Config Init.run.xml	
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Config Init" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="@docs/config-init.rsp" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.Cli/GitVersion.Cli.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="net9.0" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="Unloaded" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/new-cli/.run/Config Show.run.xml b/new-cli/.run/Config Show.run.xml
index 72e1fdcd29..2f42e2fb96 100644
--- a/new-cli/.run/Config Show.run.xml	
+++ b/new-cli/.run/Config Show.run.xml	
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Config Show" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="@docs/config-show.rsp" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.Cli/GitVersion.Cli.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="net9.0" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="Unloaded" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/new-cli/.run/Help.run.xml b/new-cli/.run/Help.run.xml
index 1baa8e5ef1..0e04d9b19b 100644
--- a/new-cli/.run/Help.run.xml
+++ b/new-cli/.run/Help.run.xml
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Help" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="@docs/help.rsp" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.Cli/GitVersion.Cli.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="net9.0" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="Unloaded" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/new-cli/.run/Normalize.run.xml b/new-cli/.run/Normalize.run.xml
index f77ee611de..409877c7bd 100644
--- a/new-cli/.run/Normalize.run.xml
+++ b/new-cli/.run/Normalize.run.xml
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Normalize" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="@docs/normalize.rsp" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.Cli/GitVersion.Cli.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="net9.0" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="Unloaded" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/new-cli/.run/Output AssemblyInfo.run.xml b/new-cli/.run/Output AssemblyInfo.run.xml
index 514f75ccfe..9c0fec9e66 100644
--- a/new-cli/.run/Output AssemblyInfo.run.xml	
+++ b/new-cli/.run/Output AssemblyInfo.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Output AssemblyInfo" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="@docs/output-assemblyinfo.rsp" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/new-cli/.run/Output Help.run.xml b/new-cli/.run/Output Help.run.xml
index eb86159ea7..88eee97bf0 100644
--- a/new-cli/.run/Output Help.run.xml	
+++ b/new-cli/.run/Output Help.run.xml	
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Output Help" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="@docs/output-help.rsp" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.Cli/GitVersion.Cli.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="net9.0" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="Unloaded" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/new-cli/.run/Output Project.run.xml b/new-cli/.run/Output Project.run.xml
index 23976608fd..eaa5556d42 100644
--- a/new-cli/.run/Output Project.run.xml	
+++ b/new-cli/.run/Output Project.run.xml	
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Output Project" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="@docs/output-project.rsp" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.Cli/GitVersion.Cli.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="net9.0" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="Unloaded" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/new-cli/.run/Output Wix.run.xml b/new-cli/.run/Output Wix.run.xml
index 7c35b9079a..b1deb9978b 100644
--- a/new-cli/.run/Output Wix.run.xml	
+++ b/new-cli/.run/Output Wix.run.xml	
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Output Wix" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="@docs/output-wix.rsp" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.Cli/GitVersion.Cli.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="net9.0" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="Unloaded" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/new-cli/.run/TestCommand.run.xml b/new-cli/.run/TestCommand.run.xml
index 6d8c05c0fb..1b005c19e9 100644
--- a/new-cli/.run/TestCommand.run.xml
+++ b/new-cli/.run/TestCommand.run.xml
@@ -1,23 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="TestCommand" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="test -i test.txt" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="ENV_FILE_PATHS" value="" />
     <option name="REDIRECT_INPUT_PATH" value="" />
-    <option name="PTY_MODE" value="Auto" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
     <option name="AUTO_ATTACH_CHILDREN" value="0" />
-    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.Cli/GitVersion.Cli.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="net9.0" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="Unloaded" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/new-cli/.run/Tester.run.xml b/new-cli/.run/Tester.run.xml
index d59e277cea..8c1cfab800 100644
--- a/new-cli/.run/Tester.run.xml
+++ b/new-cli/.run/Tester.run.xml
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Tester" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Core.Tester/bin/Debug/net9.0/gv" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Core.Tester/bin/Debug/net10.0/gv" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/GitVersion.Core.Tester/bin/Debug/net9.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/GitVersion.Core.Tester/bin/Debug/net10.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.Core.Tester/GitVersion.Core.Tester.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net9.0" />
+    <option name="PROJECT_KIND" value="Unloaded" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/new-cli/.run/Version.run.xml b/new-cli/.run/Version.run.xml
index 1c5607e906..9db7b44afd 100644
--- a/new-cli/.run/Version.run.xml
+++ b/new-cli/.run/Version.run.xml
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Version" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="@docs/version.rsp" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.Cli/GitVersion.Cli.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="net9.0" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="Unloaded" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/new-cli/Directory.Build.props b/new-cli/Directory.Build.props
index 986cfabbd7..a7365ac71a 100644
--- a/new-cli/Directory.Build.props
+++ b/new-cli/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <RootNamespace>GitVersion</RootNamespace>
 
         <LangVersion>latest</LangVersion>

From 4d8395d1dae4b6222ef179ac171814c3e51582dc Mon Sep 17 00:00:00 2001
From: Artur Stolear <artur.stolear@gmail.com>
Date: Wed, 12 Nov 2025 04:25:38 +0100
Subject: [PATCH 04/10] adds net10.0 target framework

adds net10.0 as a target framework to msbuild.
---
 .github/workflows/_unit_tests.yml                   |  2 +-
 docs/input/docs/usage/msbuild.md                    |  2 +-
 qodana.yaml                                         |  2 +-
 src/.run/cli (help).run.xml                         | 13 ++++++++-----
 src/.run/cli (showconfig).run.xml                   | 13 ++++++++-----
 src/.run/cli (version).run.xml                      | 11 +++++++----
 src/.run/cli.run.xml                                | 11 +++++++----
 src/.run/schema.run.xml                             | 13 ++++++++-----
 src/Directory.Build.props                           |  2 +-
 src/Directory.Packages.props                        |  2 ++
 .../GitVersion.MsBuild.Tests.csproj                 |  2 ++
 src/GitVersion.MsBuild/GitVersion.MsBuild.csproj    |  1 +
 .../msbuild/tools/GitVersion.MsBuild.targets        |  3 ++-
 .../Output/ProjectFileUpdaterTests.cs               |  4 ++--
 tests/scripts/test-msbuild-task.sh                  |  2 +-
 15 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/_unit_tests.yml b/.github/workflows/_unit_tests.yml
index 502f1d507e..286445f3bf 100644
--- a/.github/workflows/_unit_tests.yml
+++ b/.github/workflows/_unit_tests.yml
@@ -42,6 +42,6 @@ jobs:
     -
       name: Test Summary
       uses: test-summary/action@v2.4
-      if: ${{ always() && matrix.dotnet_version == '9.0' }}
+      if: ${{ always() && matrix.dotnet_version == '10.0' }}
       with:
         paths: artifacts/test-results/*.results.xml
diff --git a/docs/input/docs/usage/msbuild.md b/docs/input/docs/usage/msbuild.md
index 5cacea82fd..b183cdf278 100644
--- a/docs/input/docs/usage/msbuild.md
+++ b/docs/input/docs/usage/msbuild.md
@@ -239,7 +239,7 @@ If you want to override the target framework that GitVersion uses to determine t
 ```xml
 <PropertyGroup>
   ...
-  <GitVersionTargetFramework>net8.0</GitVersionTargetFramework>
+  <GitVersionTargetFramework>net10.0</GitVersionTargetFramework>
   ...
 </PropertyGroup>
 ```
diff --git a/qodana.yaml b/qodana.yaml
index 3385aa8609..0628d209ff 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -112,7 +112,7 @@ exclude:
 #Execute shell command before Qodana execution (Applied in CI/CD pipeline)
 bootstrap: curl -fsSL https://dot.net/v1/dotnet-install.sh | bash -s -- --jsonfile /data/project/global.json -i /usr/share/dotnet && dotnet build src/GitVersion.slnx
 dotnet:
-  frameworks: net8.0;net9.0
+  frameworks: net8.0;net9.0;net10.0
   solution: src/GitVersion.slnx
 
 #Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
diff --git a/src/.run/cli (help).run.xml b/src/.run/cli (help).run.xml
index 38d1df084c..a8457356e3 100644
--- a/src/.run/cli (help).run.xml	
+++ b/src/.run/cli (help).run.xml	
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="cli (help)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="-help" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../.." />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net10.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.App/GitVersion.App.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_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/src/.run/cli (showconfig).run.xml b/src/.run/cli (showconfig).run.xml
index ef335cde5a..3201347d14 100644
--- a/src/.run/cli (showconfig).run.xml	
+++ b/src/.run/cli (showconfig).run.xml	
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="cli (showconfig)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="-showconfig" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net10.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.App/GitVersion.App.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_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/src/.run/cli (version).run.xml b/src/.run/cli (version).run.xml
index 023092b8a6..9afb33fcc3 100644
--- a/src/.run/cli (version).run.xml	
+++ b/src/.run/cli (version).run.xml	
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="cli (version)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="-version" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../.." />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.App/GitVersion.App.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_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/src/.run/cli.run.xml b/src/.run/cli.run.xml
index 5721110b54..150a725934 100644
--- a/src/.run/cli.run.xml
+++ b/src/.run/cli.run.xml
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="cli" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net9.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net10.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="-nocache -l console" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net9.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net10.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.App/GitVersion.App.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/src/.run/schema.run.xml b/src/.run/schema.run.xml
index 263e4061bb..ef06b18565 100644
--- a/src/.run/schema.run.xml
+++ b/src/.run/schema.run.xml
@@ -1,18 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="schema" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Schema/bin/Debug/net9.0/schema" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Schema/bin/Debug/net10.0/schema" />
     <option name="PROGRAM_PARAMETERS" value="--OutputDirectory schemas --Version 6.1" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/GitVersion.Schema/bin/Debug/net10.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.Schema/GitVersion.Schema.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_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net9.0" />
+    <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 1249fad91a..73f358a5d4 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
         <EndYear>$([System.DateTime]::Today.Year)</EndYear>
         <Authors>GitTools and Contributors</Authors>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 307f97342f..fa3709448c 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -6,6 +6,7 @@
     <!-- common packages -->
     <PackageVersion Include="JsonSchema.Net" Version="7.3.4" />
     <PackageVersion Include="LibGit2Sharp" Version="0.31.0" />
+    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
@@ -39,6 +40,7 @@
     <PackageVersion Include="Shouldly" Version="4.3.0" />
     <PackageVersion Include="System.Collections.Immutable" Version="10.0.0" />
     <PackageVersion Include="System.Drawing.Common" Version="10.0.0" />
+    <PackageVersion Include="System.Formats.Nrbf" Version="10.0.0" />
     <PackageVersion Include="System.IO.Abstractions" Version="22.0.16" />
     <PackageVersion Include="System.Reflection.Metadata" Version="10.0.0" />
     <PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.0" />
diff --git a/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj b/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj
index 50661ee216..c84d626d89 100644
--- a/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj
+++ b/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj
@@ -5,6 +5,7 @@
         <PackageReference Include="LibGit2Sharp" />
         <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
         <PackageReference Include="Microsoft.Build" />
+        <PackageReference Include="Microsoft.Build.Tasks.Core" />
         <PackageReference Include="Microsoft.Build.Utilities.Core" />
         <PackageReference Include="Microsoft.CodeAnalysis.Common" />
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
@@ -13,6 +14,7 @@
         <PackageReference Include="Microsoft.IO.Redist" />
         <PackageReference Include="MSBuild.ProjectCreation" />
         <PackageReference Include="System.Drawing.Common" />
+        <PackageReference Include="System.Formats.Nrbf" />
         <PackageReference Include="System.Security.Cryptography.Xml" />
         <PackageReference Include="System.Text.Json" />
     </ItemGroup>
diff --git a/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj b/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj
index 2de6d91a22..da67b011a6 100644
--- a/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj
+++ b/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj
@@ -41,6 +41,7 @@
 
         <None Include="$(ExePublishPath)/net8.0/publish/**/*;$(BinPath)/net8.0/GitVersion.MsBuild.*" Pack="true" PackagePath="tools/net8.0" />
         <None Include="$(ExePublishPath)/net9.0/publish/**/*;$(BinPath)/net9.0/GitVersion.MsBuild.*" Pack="true" PackagePath="tools/net9.0" />
+        <None Include="$(ExePublishPath)/net10.0/publish/**/*;$(BinPath)/net10.0/GitVersion.MsBuild.*" Pack="true" PackagePath="tools/net10.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets b/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets
index 680bf52a1a..b8f08113ea 100644
--- a/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets
+++ b/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets
@@ -11,7 +11,8 @@
         <!-- Validates the target framework and sets the GitVersionTargetFramework property to the target framework that is compatible with the target framework of the project -->
         <GitVersionTargetFramework Condition="'$(GitVersionTargetFramework)' == '' and $([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net8.0')) == 'true'">net8.0</GitVersionTargetFramework>
         <GitVersionTargetFramework Condition="'$(GitVersionTargetFramework)' == '' and $([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net9.0')) == 'true'">net9.0</GitVersionTargetFramework>
-        <!-- Fall back to net8.0 if the target framework is not compatible with net9.0 and net8.0 -->
+        <GitVersionTargetFramework Condition="'$(GitVersionTargetFramework)' == '' and $([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net10.0')) == 'true'">net10.0</GitVersionTargetFramework>
+        <!-- Fall back to net8.0 if the target framework is not compatible with net10.0, net9.0 and net8.0 -->
         <GitVersionTargetFramework Condition="'$(GitVersionTargetFramework)' == ''">net8.0</GitVersionTargetFramework>
         <GitVersionFileExe Condition="'$(GitVersionFileExe)' == ''">dotnet --roll-forward Major &quot;$([MSBuild]::EnsureTrailingSlash($(MSBuildThisFileDirectory)$(GitVersionTargetFramework)))gitversion.dll&quot;</GitVersionFileExe>
         <GitVersionAssemblyFile Condition="'$(GitVersionAssemblyFile)' == ''">$([MSBuild]::EnsureTrailingSlash($(MSBuildThisFileDirectory)$(GitVersionTargetFramework)))GitVersion.MsBuild.dll</GitVersionAssemblyFile>
diff --git a/src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs b/src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs
index aac07abadb..4f6a1fc3db 100644
--- a/src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs
+++ b/src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs
@@ -15,7 +15,7 @@ namespace GitVersion.Core.Tests;
 [Parallelizable(ParallelScope.None)]
 public class ProjectFileUpdaterTests : TestBase
 {
-    private const string TargetFramework = "net8.0";
+    private const string TargetFramework = "net10.0";
     private IVariableProvider variableProvider;
     private ILog log;
     private IFileSystem fileSystem;
@@ -271,7 +271,7 @@ public void UpdateProjectFileAddsVersionToFile(string sdk, string projectName)
         var xml = $"""
                   <Project Sdk="{sdk}">
                     <PropertyGroup>
-                      <TargetFramework>net8.0</TargetFramework>
+                      <TargetFramework>net10.0</TargetFramework>
                     </PropertyGroup>
                   </Project>
                   """;
diff --git a/tests/scripts/test-msbuild-task.sh b/tests/scripts/test-msbuild-task.sh
index b75db70371..12c0a030b5 100644
--- a/tests/scripts/test-msbuild-task.sh
+++ b/tests/scripts/test-msbuild-task.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/sh
-# sh /scripts/test-msbuild-task.sh --version 6.0.0 --nugetPath /nuget --repoPath /repo/tests/integration --targetframework net8.0
+# sh /scripts/test-msbuild-task.sh --version 6.0.0 --nugetPath /nuget --repoPath /repo/tests/integration --targetframework net10.0
 while test "$#" -gt 0
 do
     case $1 in

From 5b12277a00c31bd28a4366aa48def51d13e958d5 Mon Sep 17 00:00:00 2001
From: Artur Stolear <artur.stolear@gmail.com>
Date: Wed, 12 Nov 2025 09:45:16 +0100
Subject: [PATCH 05/10] use extensions members

---
 .../RoslynExtensions.cs                       |  42 ++--
 .../Extensions/ServiceCollectionExtensions.cs |  21 +-
 src/Directory.Build.props                     |   1 +
 .../ArgumentParserExtensions.cs               |  99 ++++----
 .../FileSystemGlobbing/MatcherExtensions.cs   | 101 ++++----
 .../Configuration/Extensions.cs               |  27 ++-
 .../GitRepositoryTestingExtensions.cs         | 196 +++++++++-------
 .../GitVersionVariablesExtensions.cs          |  16 +-
 .../Extensions/MockCollectionExtensions.cs    |  11 +-
 .../Extensions/ShouldlyExtensions.cs          |  35 +--
 .../Formatting/EdgeCaseTests.cs               |  89 ++++---
 .../Formatting/InputSanitizerTests.cs         |  82 -------
 .../Formatting/SanitizeEnvVarNameTests.cs     | 108 ++++-----
 .../Formatting/SanitizeFormatTests.cs         |  81 +++++++
 .../Formatting/SanitizeMemberNameTests.cs     | 126 +++++-----
 .../VersionInMergedBranchNameScenarios.cs     |  13 +-
 .../MergeMessageBaseVersionStrategyTests.cs   |   1 +
 .../IgnoreConfigurationExtensions.cs          |  26 ---
 .../Core/EffectiveConfigurationExtensions.cs  |  30 ---
 .../AssemblyVersionsGeneratorExtensions.cs    |  43 ++--
 .../Extensions/ConfigurationExtensions.cs     | 217 +++++++++---------
 .../Extensions/DictionaryExtensions.cs        |  17 +-
 .../Extensions/FileSystemExtensions.cs        |  58 ++++-
 .../Extensions/IncrementStrategyExtensions.cs |  17 +-
 .../ReadEmbeddedResourceExtensions.cs         |  29 +--
 .../ReferenceNameExtensions.cs                |   0
 .../Extensions/ServiceCollectionExtensions.cs |  16 +-
 .../Extensions/VersionFieldExtensions.cs      |  13 +-
 .../Formatting/StringFormatWithExtension.cs   |  75 +++---
 src/GitVersion.Core/Git/CommitExtensions.cs   |   8 -
 src/GitVersion.Core/Git/ICommit.cs            |   2 +
 .../Logging/Abstractions/ILog.cs              |   2 +-
 src/GitVersion.Core/Logging/Log.cs            |   2 +-
 src/GitVersion.Core/Logging/LogExtensions.cs  | 148 ++++++------
 src/GitVersion.Core/Logging/NullLog.cs        |   2 +-
 src/GitVersion.Core/MergeMessage.cs           |   2 +-
 src/GitVersion.Core/PublicAPI.Shipped.txt     |  13 --
 src/GitVersion.Core/PublicAPI.Unshipped.txt   |  54 +++++
 .../IncrementStrategyFinder.cs                |   2 +-
 .../Mainline/EnrichIncrement.cs               |   2 +-
 .../MainlineVersionStrategy.cs                |   2 +-
 .../MergeMessageVersionStrategy.cs            |   3 +-
 src/GitVersion.LibGit2Sharp/Git/Commit.cs     |   2 +
 .../LibGit2SharpExtensions.cs                 |  11 +-
 .../PublicAPI.Unshipped.txt                   |   2 +
 .../Helpers/GitRepositoryTestingExtensions.cs |  43 ----
 .../Tasks/TestTaskBase.cs                     |   3 +-
 .../Helpers/AssemblyInfoFileHelper.cs         |  31 +--
 src/GitVersion.Schema/Extensions.cs           |  17 +-
 .../Extensions/GitTestExtensions.cs           |  92 ++++----
 .../Extensions/StringExtensions.cs            |  17 +-
 .../Helpers/StringBuilderExtensions.cs        |  14 +-
 52 files changed, 1058 insertions(+), 1006 deletions(-)
 delete mode 100644 src/GitVersion.Core.Tests/Formatting/InputSanitizerTests.cs
 create mode 100644 src/GitVersion.Core.Tests/Formatting/SanitizeFormatTests.cs
 delete mode 100644 src/GitVersion.Core/Configuration/IgnoreConfigurationExtensions.cs
 delete mode 100644 src/GitVersion.Core/Core/EffectiveConfigurationExtensions.cs
 rename src/GitVersion.Core/{Configuration => Extensions}/ReferenceNameExtensions.cs (100%)
 delete mode 100644 src/GitVersion.Core/Git/CommitExtensions.cs
 delete mode 100644 src/GitVersion.MsBuild.Tests/Helpers/GitRepositoryTestingExtensions.cs

diff --git a/new-cli/GitVersion.Cli.Generator/RoslynExtensions.cs b/new-cli/GitVersion.Cli.Generator/RoslynExtensions.cs
index fe83125599..d4eef6817e 100644
--- a/new-cli/GitVersion.Cli.Generator/RoslynExtensions.cs
+++ b/new-cli/GitVersion.Cli.Generator/RoslynExtensions.cs
@@ -2,30 +2,36 @@ namespace GitVersion;
 
 public static class RoslynExtensions
 {
-    private static IEnumerable<ITypeSymbol> GetBaseTypesAndThis(this ITypeSymbol type)
+    extension(ITypeSymbol type)
     {
-        var current = type;
-        while (current != null)
+        private IEnumerable<ITypeSymbol> GetBaseTypesAndThis()
         {
-            yield return current;
-            current = current.BaseType;
+            var current = type;
+            while (current != null)
+            {
+                yield return current;
+                current = current.BaseType;
+            }
         }
-    }
 
-    public static IEnumerable<ITypeSymbol> GetBaseTypes(this ITypeSymbol type)
-    {
-        var current = type.BaseType;
-        while (current != null)
+        public IEnumerable<ITypeSymbol> GetBaseTypes()
         {
-            yield return current;
-            current = current.BaseType;
+            var current = type.BaseType;
+            while (current != null)
+            {
+                yield return current;
+                current = current.BaseType;
+            }
         }
-    }
 
-    public static IEnumerable<T> GetAllMembers<T>(this ITypeSymbol type) where T : ISymbol
-        => type.GetBaseTypesAndThis().SelectMany(n => n.GetMembers().OfType<T>());
+        public IEnumerable<T> GetAllMembers<T>() where T : ISymbol
+            => type.GetBaseTypesAndThis().SelectMany(n => n.GetMembers().OfType<T>());
+    }
 
-    public static AttributeData? GetAttributeData(this ISymbol namedType, string fullName)
-        => namedType.GetAttributes()
-            .SingleOrDefault(a => a.AttributeClass?.OriginalDefinition.ToDisplayString() == fullName);
+    extension(ISymbol namedType)
+    {
+        public AttributeData? GetAttributeData(string fullName)
+            => namedType.GetAttributes()
+                .SingleOrDefault(a => a.AttributeClass?.OriginalDefinition.ToDisplayString() == fullName);
+    }
 }
diff --git a/new-cli/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs b/new-cli/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs
index e7e5ac36a9..0b9bfdf52a 100644
--- a/new-cli/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs
+++ b/new-cli/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs
@@ -6,18 +6,21 @@ namespace GitVersion.Extensions;
 
 public static class ServiceCollectionExtensions
 {
-    public static IServiceCollection RegisterModules(this IServiceCollection services, IEnumerable<IGitVersionModule> gitVersionModules)
-        => gitVersionModules.Aggregate(services, (current, gitVersionModule) => gitVersionModule.RegisterTypes(current));
-
-    public static IServiceCollection RegisterLogging(this IServiceCollection services)
+    extension(IServiceCollection services)
     {
-        services.AddLogging(builder =>
+        public IServiceCollection RegisterModules(IEnumerable<IGitVersionModule> gitVersionModules)
+            => gitVersionModules.Aggregate(services, (current, gitVersionModule) => gitVersionModule.RegisterTypes(current));
+
+        public IServiceCollection RegisterLogging()
         {
-            var logger = CreateLogger();
-            builder.AddSerilog(logger, dispose: true);
-        });
+            services.AddLogging(builder =>
+            {
+                var logger = CreateLogger();
+                builder.AddSerilog(logger, dispose: true);
+            });
 
-        return services;
+            return services;
+        }
     }
 
     private static Serilog.Core.Logger CreateLogger()
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 73f358a5d4..504f1ea51b 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -19,6 +19,7 @@
         <RepositoryType>git</RepositoryType>
 
         <NoWarn>$(NoWarn);NU1701;1591,8618,SYSLIB10;EnableGenerateDocumentationFile</NoWarn>
+        <NoWarn>$(NoWarn);CS8604;CS8620</NoWarn>
         <WarningsAsErrors>$(WarningsAsErrors);RS0016;RS0017;RS0022;RS0024;RS0025;RS0026;RS0027</WarningsAsErrors>
 
         <DebugType>embedded</DebugType>
diff --git a/src/GitVersion.App/ArgumentParserExtensions.cs b/src/GitVersion.App/ArgumentParserExtensions.cs
index 852773f941..75cc99fc05 100644
--- a/src/GitVersion.App/ArgumentParserExtensions.cs
+++ b/src/GitVersion.App/ArgumentParserExtensions.cs
@@ -8,75 +8,80 @@ internal static class ArgumentParserExtensions
     private static readonly string[] TrueValues = ["1", "true"];
     private static readonly string[] FalseValues = ["0", "false"];
 
-    public static bool IsTrue(this string? value) => TrueValues.Contains(value, StringComparer.OrdinalIgnoreCase);
-
-    public static bool IsFalse(this string? value) => FalseValues.Contains(value, StringComparer.OrdinalIgnoreCase);
-
-    public static bool IsValidPath(this string? path)
+    extension(string? value)
     {
-        if (path == null)
-            return false;
+        public bool IsTrue() => TrueValues.Contains(value, StringComparer.OrdinalIgnoreCase);
+        public bool IsFalse() => FalseValues.Contains(value, StringComparer.OrdinalIgnoreCase);
 
-        try
-        {
-            _ = FileSystemHelper.Path.GetFullPath(path);
-        }
-        catch
+        public bool IsValidPath()
         {
-            path = FileSystemHelper.Path.Combine(SysEnv.CurrentDirectory, path);
+            if (value == null)
+                return false;
 
             try
             {
-                _ = FileSystemHelper.Path.GetFullPath(path);
+                _ = FileSystemHelper.Path.GetFullPath(value);
             }
             catch
             {
-                return false;
+                value = FileSystemHelper.Path.Combine(SysEnv.CurrentDirectory, value);
+
+                try
+                {
+                    _ = FileSystemHelper.Path.GetFullPath(value);
+                }
+                catch
+                {
+                    return false;
+                }
             }
-        }
 
-        return FileSystemHelper.Directory.Exists(path);
-    }
-
-    public static bool IsSwitchArgument(this string? value)
-    {
-        var patternRegex = RegexPatterns.Common.SwitchArgumentRegex();
-        return value != null
-               && (value.StartsWith('-') || value.StartsWith('/'))
-               && !patternRegex.Match(value).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 FileSystemHelper.Directory.Exists(value);
+        }
 
-        if (value.StartsWith('-'))
+        public bool IsSwitchArgument()
         {
-            value = value[1..];
+            var patternRegex = RegexPatterns.Common.SwitchArgumentRegex();
+            return value != null
+                   && (value.StartsWith('-') || value.StartsWith('/'))
+                   && !patternRegex.Match(value).Success;
+            //Exclude msbuild & project parameters in form /blah:, which should be parsed as values, not switch names.
         }
 
-        if (value.StartsWith('/'))
+        public bool IsSwitch(string switchName)
         {
-            value = value[1..];
-        }
+            if (value == null)
+                return false;
 
-        return string.Equals(switchName, value, StringComparison.OrdinalIgnoreCase);
-    }
+            if (value.StartsWith('-'))
+            {
+                value = value[1..];
+            }
+
+            if (value.StartsWith('/'))
+            {
+                value = value[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)
+    extension(string singleArgument)
     {
-        var booleanArguments = new[] { "updateassemblyinfo", "ensureassemblyinfo", "nofetch", "nonormalize", "nocache", "allowshallow" };
+        public bool IsHelp() => (singleArgument == "?") || singleArgument.IsSwitch("h") || singleArgument.IsSwitch("help") || singleArgument.IsSwitch("?");
 
-        var argumentMightRequireValue = !booleanArguments.Contains(argument[1..], StringComparer.OrdinalIgnoreCase);
+        public bool ArgumentRequiresValue(int argumentIndex)
+        {
+            var booleanArguments = new[] { "updateassemblyinfo", "ensureassemblyinfo", "nofetch", "nonormalize", "nocache", "allowshallow" };
 
-        // 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('/') && FileSystemHelper.Path.DirectorySeparatorChar == '/' && argument.IsValidPath())
-            return false;
+            var argumentMightRequireValue = !booleanArguments.Contains(singleArgument[1..], StringComparer.OrdinalIgnoreCase);
 
-        return argumentMightRequireValue;
+            // 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 && singleArgument.StartsWith('/') && FileSystemHelper.Path.DirectorySeparatorChar == '/' && singleArgument.IsValidPath())
+                return false;
+
+            return argumentMightRequireValue;
+        }
     }
 }
diff --git a/src/GitVersion.App/FileSystemGlobbing/MatcherExtensions.cs b/src/GitVersion.App/FileSystemGlobbing/MatcherExtensions.cs
index fa568b712b..1d8db805f4 100644
--- a/src/GitVersion.App/FileSystemGlobbing/MatcherExtensions.cs
+++ b/src/GitVersion.App/FileSystemGlobbing/MatcherExtensions.cs
@@ -5,71 +5,66 @@ namespace GitVersion.FileSystemGlobbing;
 
 internal static class MatcherExtensions
 {
-    public static PatternMatchingResult Execute(
-        this Matcher matcher,
-        IFileSystem fileSystem,
-        string directoryPath
-    )
+    extension(Matcher matcher)
     {
-        ArgumentNullException.ThrowIfNull(matcher);
-        ArgumentNullException.ThrowIfNull(fileSystem);
+        public PatternMatchingResult Execute(IFileSystem fileSystem,
+                                             string directoryPath
+        )
+        {
+            ArgumentNullException.ThrowIfNull(matcher);
+            ArgumentNullException.ThrowIfNull(fileSystem);
 
-        return Execute(matcher, fileSystem, fileSystem.DirectoryInfo.New(directoryPath));
-    }
+            return Execute(matcher, fileSystem, fileSystem.DirectoryInfo.New(directoryPath));
+        }
 
-    private static PatternMatchingResult Execute(
-        this Matcher matcher,
-        IFileSystem fileSystem,
-        IDirectoryInfo directoryInfo
-    )
-    {
-        ArgumentNullException.ThrowIfNull(matcher);
-        ArgumentNullException.ThrowIfNull(fileSystem);
-        ArgumentNullException.ThrowIfNull(directoryInfo);
+        private PatternMatchingResult Execute(IFileSystem fileSystem,
+                                              IDirectoryInfo directoryInfo
+        )
+        {
+            ArgumentNullException.ThrowIfNull(matcher);
+            ArgumentNullException.ThrowIfNull(fileSystem);
+            ArgumentNullException.ThrowIfNull(directoryInfo);
 
-        return matcher.Execute(new DirectoryInfoGlobbingWrapper(fileSystem, directoryInfo));
-    }
+            return matcher.Execute(new DirectoryInfoGlobbingWrapper(fileSystem, directoryInfo));
+        }
 
-    public static IEnumerable<string> GetResultsInFullPath(
-        this Matcher matcher,
-        IFileSystem fileSystem,
-        string directoryPath
-    )
-    {
-        ArgumentNullException.ThrowIfNull(matcher);
-        ArgumentNullException.ThrowIfNull(fileSystem);
+        public IEnumerable<string> GetResultsInFullPath(IFileSystem fileSystem,
+                                                        string directoryPath
+        )
+        {
+            ArgumentNullException.ThrowIfNull(matcher);
+            ArgumentNullException.ThrowIfNull(fileSystem);
 
-        return GetResultsInFullPath(
-            matcher,
-            fileSystem,
-            fileSystem.DirectoryInfo.New(directoryPath)
-        );
-    }
+            return GetResultsInFullPath(
+                matcher,
+                fileSystem,
+                fileSystem.DirectoryInfo.New(directoryPath)
+            );
+        }
 
-    private static IEnumerable<string> GetResultsInFullPath(
-        this Matcher matcher,
-        IFileSystem fileSystem,
-        IDirectoryInfo directoryInfo
-    )
-    {
-        ArgumentNullException.ThrowIfNull(matcher);
-        ArgumentNullException.ThrowIfNull(fileSystem);
-        ArgumentNullException.ThrowIfNull(directoryInfo);
+        private IEnumerable<string> GetResultsInFullPath(IFileSystem fileSystem,
+                                                         IDirectoryInfo directoryInfo
+        )
+        {
+            ArgumentNullException.ThrowIfNull(matcher);
+            ArgumentNullException.ThrowIfNull(fileSystem);
+            ArgumentNullException.ThrowIfNull(directoryInfo);
 
-        var matches = Execute(matcher, fileSystem, directoryInfo);
+            var matches = Execute(matcher, fileSystem, directoryInfo);
 
-        if (!matches.HasMatches)
-        {
-            return EmptyStringsEnumerable;
-        }
+            if (!matches.HasMatches)
+            {
+                return EmptyStringsEnumerable;
+            }
 
-        var fsPath = fileSystem.Path;
-        var directoryFullName = directoryInfo.FullName;
+            var fsPath = fileSystem.Path;
+            var directoryFullName = directoryInfo.FullName;
 
-        return matches.Files.Select(GetFullPath);
+            return matches.Files.Select(GetFullPath);
 
-        string GetFullPath(FilePatternMatch match) =>
-            fsPath.GetFullPath(fsPath.Combine(directoryFullName, match.Path));
+            string GetFullPath(FilePatternMatch match) =>
+                fsPath.GetFullPath(fsPath.Combine(directoryFullName, match.Path));
+        }
     }
 
     private static readonly IEnumerable<string> EmptyStringsEnumerable = [];
diff --git a/src/GitVersion.Configuration.Tests/Configuration/Extensions.cs b/src/GitVersion.Configuration.Tests/Configuration/Extensions.cs
index dafc7c5ce0..e8c971a253 100644
--- a/src/GitVersion.Configuration.Tests/Configuration/Extensions.cs
+++ b/src/GitVersion.Configuration.Tests/Configuration/Extensions.cs
@@ -6,22 +6,25 @@ namespace GitVersion.Configuration.Tests.Configuration;
 
 public static class Extensions
 {
-    public static IDisposable<string> SetupConfigFile(this IFileSystem fileSystem, string? path = null, string fileName = ConfigurationFileLocator.DefaultFileName, string text = "")
+    extension(IFileSystem fileSystem)
     {
-        if (path.IsNullOrEmpty())
+        public IDisposable<string> SetupConfigFile(string? path = null, string fileName = ConfigurationFileLocator.DefaultFileName, string text = "")
         {
-            path = FileSystemHelper.Path.GetRepositoryTempPath();
-        }
+            if (path.IsNullOrEmpty())
+            {
+                path = FileSystemHelper.Path.GetRepositoryTempPath();
+            }
 
-        var fullPath = FileSystemHelper.Path.Combine(path, fileName);
-        var directory = FileSystemHelper.Path.GetDirectoryName(fullPath);
-        if (!fileSystem.Directory.Exists(directory))
-        {
-            fileSystem.Directory.CreateDirectory(directory);
-        }
+            var fullPath = FileSystemHelper.Path.Combine(path, fileName);
+            var directory = FileSystemHelper.Path.GetDirectoryName(fullPath);
+            if (!fileSystem.Directory.Exists(directory))
+            {
+                fileSystem.Directory.CreateDirectory(directory);
+            }
 
-        fileSystem.File.WriteAllText(fullPath, text);
+            fileSystem.File.WriteAllText(fullPath, text);
 
-        return Disposable.Create(fullPath, () => fileSystem.File.Delete(fullPath));
+            return Disposable.Create(fullPath, () => fileSystem.File.Delete(fullPath));
+        }
     }
 }
diff --git a/src/GitVersion.Core.Tests/Extensions/GitRepositoryTestingExtensions.cs b/src/GitVersion.Core.Tests/Extensions/GitRepositoryTestingExtensions.cs
index 74043662a3..dff0409f9c 100644
--- a/src/GitVersion.Core.Tests/Extensions/GitRepositoryTestingExtensions.cs
+++ b/src/GitVersion.Core.Tests/Extensions/GitRepositoryTestingExtensions.cs
@@ -55,129 +55,147 @@ public static IBranch CreateMockBranch(string name, params ICommit[] commits)
         return branch;
     }
 
-    public static void DiscoverRepository(this IServiceProvider sp)
+    extension(IServiceProvider sp)
     {
-        var gitRepository = sp.GetRequiredService<IGitRepository>();
-        var gitRepositoryInfo = sp.GetRequiredService<IGitRepositoryInfo>();
-        gitRepository.DiscoverRepository(gitRepositoryInfo.GitRootPath);
+        public void DiscoverRepository()
+        {
+            var gitRepository = sp.GetRequiredService<IGitRepository>();
+            var gitRepositoryInfo = sp.GetRequiredService<IGitRepositoryInfo>();
+            gitRepository.DiscoverRepository(gitRepositoryInfo.GitRootPath);
+        }
     }
 
-    public static IBranch FindBranch(this IGitRepository repository, string branchName)
-        => repository.Branches.FirstOrDefault(branch => branch.Name.WithoutOrigin == branchName)
-           ?? throw new GitVersionException($"Branch {branchName} not found");
+    extension(IGitRepository repository)
+    {
+        public IBranch FindBranch(string branchName)
+            => repository.Branches.FirstOrDefault(branch => branch.Name.WithoutOrigin == branchName)
+               ?? throw new GitVersionException($"Branch {branchName} not found");
 
-    public static void DumpGraph(this IGitRepository repository, Action<string>? writer = null, int? maxCommits = null)
-        => DumpGraph(repository.Path, writer, maxCommits);
+        public void DumpGraph(Action<string>? writer = null, int? maxCommits = null)
+            => DumpGraph(repository.Path, writer, maxCommits);
+    }
 
-    public static void DumpGraph(this IRepository repository, Action<string>? writer = null, int? maxCommits = null)
-        => DumpGraph(repository.ToGitRepository().Path, writer, maxCommits);
+    extension(IRepository repository)
+    {
+        public void DumpGraph(Action<string>? writer = null, int? maxCommits = null)
+            => DumpGraph(repository.ToGitRepository().Path, writer, maxCommits);
+    }
 
-    public static void RenameRemote(this RemoteCollection remotes, string oldName, string newName)
+    extension(RemoteCollection remotes)
     {
-        if (oldName.IsEquivalentTo(newName)) return;
-        if (remotes.Any(remote => remote.Name == newName))
-        {
-            throw new InvalidOperationException($"A remote with the name '{newName}' already exists.");
-        }
-        if (!remotes.Any(remote => remote.Name == oldName))
+        public void RenameRemote(string oldName, string newName)
         {
-            throw new InvalidOperationException($"A remote with the name '{oldName}' does not exist.");
+            if (oldName.IsEquivalentTo(newName)) return;
+            if (remotes.Any(remote => remote.Name == newName))
+            {
+                throw new InvalidOperationException($"A remote with the name '{newName}' already exists.");
+            }
+            if (remotes.All(remote => remote.Name != oldName))
+            {
+                throw new InvalidOperationException($"A remote with the name '{oldName}' does not exist.");
+            }
+            remotes.Add(newName, remotes[oldName].Url);
+            remotes.Remove(oldName);
         }
-        remotes.Add(newName, remotes[oldName].Url);
-        remotes.Remove(oldName);
     }
 
-    public static GitVersionVariables GetVersion(this RepositoryFixtureBase fixture, IGitVersionConfiguration? configuration = null,
-        IRepository? repository = null, string? commitId = null, bool onlyTrackedBranches = true, string? targetBranch = null)
+    extension(RepositoryFixtureBase fixture)
     {
-        repository ??= fixture.Repository;
-        configuration ??= GitFlowConfigurationBuilder.New.Build();
-
-        var overrideConfiguration = new Dictionary<object, object?>();
-        var options = Options.Create(new GitVersionOptions
+        public GitVersionVariables GetVersion(IGitVersionConfiguration? configuration = null,
+                                              IRepository? repository = null, string? commitId = null, bool onlyTrackedBranches = true, string? targetBranch = null)
         {
-            WorkingDirectory = repository.Info.WorkingDirectory,
-            ConfigurationInfo = { OverrideConfiguration = overrideConfiguration },
-            RepositoryInfo =
-            {
-                TargetBranch = targetBranch,
-                CommitId = commitId
-            },
-            Settings = { OnlyTrackedBranches = onlyTrackedBranches }
-        });
+            repository ??= fixture.Repository;
+            configuration ??= GitFlowConfigurationBuilder.New.Build();
 
-        try
-        {
-            var configurationProviderMock = Substitute.For<IConfigurationProvider>();
-            configurationProviderMock.Provide(overrideConfiguration).Returns(configuration);
-            var sp = ConfigureServices(services =>
+            var overrideConfiguration = new Dictionary<object, object?>();
+            var options = Options.Create(new GitVersionOptions
             {
-                services.AddSingleton(options);
-                services.AddSingleton(configurationProviderMock);
+                WorkingDirectory = repository.Info.WorkingDirectory,
+                ConfigurationInfo = { OverrideConfiguration = overrideConfiguration },
+                RepositoryInfo =
+                {
+                    TargetBranch = targetBranch,
+                    CommitId = commitId
+                },
+                Settings = { OnlyTrackedBranches = onlyTrackedBranches }
             });
 
-            sp.DiscoverRepository();
+            try
+            {
+                var configurationProviderMock = Substitute.For<IConfigurationProvider>();
+                configurationProviderMock.Provide(overrideConfiguration).Returns(configuration);
+                var sp = ConfigureServices(services =>
+                {
+                    services.AddSingleton(options);
+                    services.AddSingleton(configurationProviderMock);
+                });
 
-            var variableProvider = sp.GetRequiredService<IVariableProvider>();
-            var nextVersionCalculator = sp.GetRequiredService<INextVersionCalculator>();
-            var contextOptions = sp.GetRequiredService<Lazy<GitVersionContext>>();
+                sp.DiscoverRepository();
 
-            var context = contextOptions.Value;
+                var variableProvider = sp.GetRequiredService<IVariableProvider>();
+                var nextVersionCalculator = sp.GetRequiredService<INextVersionCalculator>();
+                var contextOptions = sp.GetRequiredService<Lazy<GitVersionContext>>();
 
-            var semanticVersion = nextVersionCalculator.FindVersion();
+                var context = contextOptions.Value;
 
-            var effectiveConfiguration = context.Configuration.GetEffectiveConfiguration(context.CurrentBranch.Name);
-            return variableProvider.GetVariablesFor(semanticVersion, context.Configuration, effectiveConfiguration.PreReleaseWeight);
-        }
-        catch (Exception)
-        {
-            repository.DumpGraph();
-            throw;
-        }
-    }
+                var semanticVersion = nextVersionCalculator.FindVersion();
 
-    public static void WriteVersionVariables(this RepositoryFixtureBase fixture, string versionFile)
-    {
-        var versionVariables = fixture.GetVersion();
+                var effectiveConfiguration = context.Configuration.GetEffectiveConfiguration(context.CurrentBranch.Name);
+                return variableProvider.GetVariablesFor(semanticVersion, context.Configuration, effectiveConfiguration.PreReleaseWeight);
+            }
+            catch (Exception)
+            {
+                repository.DumpGraph();
+                throw;
+            }
+        }
 
-        FileSystemHelper.File.WriteAllText(versionFile, versionVariables.ToJson());
-    }
+        public void WriteVersionVariables(string versionFile)
+        {
+            var versionVariables = fixture.GetVersion();
 
-    public static void AssertFullSemver(this RepositoryFixtureBase fixture, string fullSemver,
-        IGitVersionConfiguration? configuration = null, IRepository? repository = null, string? commitId = null, bool onlyTrackedBranches = true, string? targetBranch = null)
-    {
-        repository ??= fixture.Repository;
+            FileSystemHelper.File.WriteAllText(versionFile, versionVariables.ToJson());
+        }
 
-        var variables = GetVersion(fixture, configuration, repository, commitId, onlyTrackedBranches, targetBranch);
-        variables.FullSemVer.ShouldBe(fullSemver);
-        if (commitId == null)
+        public void AssertFullSemver(string fullSemver,
+                                     IGitVersionConfiguration? configuration = null, IRepository? repository = null, string? commitId = null, bool onlyTrackedBranches = true, string? targetBranch = null)
         {
-            fixture.SequenceDiagram.NoteOver(fullSemver, repository.Head.FriendlyName, color: "#D3D3D3");
+            repository ??= fixture.Repository;
+
+            var variables = GetVersion(fixture, configuration, repository, commitId, onlyTrackedBranches, targetBranch);
+            variables.FullSemVer.ShouldBe(fullSemver);
+            if (commitId == null)
+            {
+                fixture.SequenceDiagram.NoteOver(fullSemver, repository.Head.FriendlyName, color: "#D3D3D3");
+            }
         }
     }
 
-    /// <summary>
-    /// Simulates running on build server
-    /// </summary>
-    public static void InitializeRepository(this RemoteRepositoryFixture fixture)
+    extension(RemoteRepositoryFixture fixture)
     {
-        var gitVersionOptions = new GitVersionOptions
+        /// <summary>
+        /// Simulates running on a build server
+        /// </summary>
+        public void InitializeRepository()
         {
-            WorkingDirectory = fixture.LocalRepositoryFixture.RepositoryPath
-        };
-        var options = Options.Create(gitVersionOptions);
+            var gitVersionOptions = new 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.GetRequiredService<IGitPreparer>();
-        gitPreparer.Prepare();
+            var gitPreparer = serviceProvider.GetRequiredService<IGitPreparer>();
+            gitPreparer.Prepare();
+        }
     }
 
     private static ServiceProvider ConfigureServices(Action<IServiceCollection>? servicesOverrides = null)
diff --git a/src/GitVersion.Core.Tests/Extensions/GitVersionVariablesExtensions.cs b/src/GitVersion.Core.Tests/Extensions/GitVersionVariablesExtensions.cs
index b47e24d0c8..acfd773093 100644
--- a/src/GitVersion.Core.Tests/Extensions/GitVersionVariablesExtensions.cs
+++ b/src/GitVersion.Core.Tests/Extensions/GitVersionVariablesExtensions.cs
@@ -5,12 +5,18 @@ namespace GitVersion.Core.Tests;
 
 public static class GitVersionVariablesExtensions
 {
-    public static string ToJson(this GitVersionVariables gitVersionVariables)
+    extension(GitVersionVariables gitVersionVariables)
     {
-        var serializer = new VersionVariableSerializer(new FileSystem());
-        return serializer.ToJson(gitVersionVariables);
+        public string ToJson()
+        {
+            var serializer = new VersionVariableSerializer(new FileSystem());
+            return serializer.ToJson(gitVersionVariables);
+        }
     }
 
-    public static GitVersionVariables ToGitVersionVariables(this string json)
-        => VersionVariableSerializer.FromJson(json);
+    extension(string json)
+    {
+        public GitVersionVariables ToGitVersionVariables()
+            => VersionVariableSerializer.FromJson(json);
+    }
 }
diff --git a/src/GitVersion.Core.Tests/Extensions/MockCollectionExtensions.cs b/src/GitVersion.Core.Tests/Extensions/MockCollectionExtensions.cs
index 81c3191326..3343652479 100644
--- a/src/GitVersion.Core.Tests/Extensions/MockCollectionExtensions.cs
+++ b/src/GitVersion.Core.Tests/Extensions/MockCollectionExtensions.cs
@@ -10,10 +10,13 @@ private static IEnumerator<T> GetEnumerator<T>(params T[] itemsToReturn)
         }
     }
 
-    public static void MockCollectionReturn<T>(this IEnumerable<T> items, params T[] itemsToReturn)
+    extension<T>(IEnumerable<T> items)
     {
-        var enumerator = items.GetEnumerator();
-        enumerator.Returns(_ => GetEnumerator(itemsToReturn));
-        enumerator.Dispose();
+        public void MockCollectionReturn(params T[] itemsToReturn)
+        {
+            var enumerator = items.GetEnumerator();
+            enumerator.Returns(_ => GetEnumerator(itemsToReturn));
+            enumerator.Dispose();
+        }
     }
 }
diff --git a/src/GitVersion.Core.Tests/Extensions/ShouldlyExtensions.cs b/src/GitVersion.Core.Tests/Extensions/ShouldlyExtensions.cs
index bac7a4346e..437b8a3ad0 100644
--- a/src/GitVersion.Core.Tests/Extensions/ShouldlyExtensions.cs
+++ b/src/GitVersion.Core.Tests/Extensions/ShouldlyExtensions.cs
@@ -2,23 +2,26 @@
 
 public static class ShouldlyExtensions
 {
-    /// <summary>
-    /// Asserts that the action throws an exception of type TException
-    /// with the expected message.
-    /// </summary>
-    public static void ShouldThrowWithMessage<TException>(this Action action, string expectedMessage) where TException : Exception
+    extension(Action action)
     {
-        var ex = Should.Throw<TException>(action);
-        ex.Message.ShouldBe(expectedMessage);
-    }
+        /// <summary>
+        /// Asserts that the action throws an exception of type TException
+        /// with the expected message.
+        /// </summary>
+        public void ShouldThrowWithMessage<TException>(string expectedMessage) where TException : Exception
+        {
+            var ex = Should.Throw<TException>(action);
+            ex.Message.ShouldBe(expectedMessage);
+        }
 
-    /// <summary>
-    /// Asserts that the action throws an exception of type TException,
-    /// and allows further assertion on the exception instance.
-    /// </summary>
-    public static void ShouldThrow<TException>(this Action action, Action<TException> additionalAssertions) where TException : Exception
-    {
-        var ex = Should.Throw<TException>(action);
-        additionalAssertions(ex);
+        /// <summary>
+        /// Asserts that the action throws an exception of type TException,
+        /// and allows further assertion on the exception instance.
+        /// </summary>
+        public void ShouldThrow<TException>(Action<TException> additionalAssertions) where TException : Exception
+        {
+            var ex = Should.Throw<TException>(action);
+            additionalAssertions(ex);
+        }
     }
 }
diff --git a/src/GitVersion.Core.Tests/Formatting/EdgeCaseTests.cs b/src/GitVersion.Core.Tests/Formatting/EdgeCaseTests.cs
index 5d8e0e49b3..1e351af414 100644
--- a/src/GitVersion.Core.Tests/Formatting/EdgeCaseTests.cs
+++ b/src/GitVersion.Core.Tests/Formatting/EdgeCaseTests.cs
@@ -3,58 +3,55 @@
 
 namespace GitVersion.Tests.Formatting;
 
-public partial class InputSanitizerTests
+[TestFixture]
+public class EdgeCaseTests
 {
-    [TestFixture]
-    public class EdgeCaseTests : InputSanitizerTests
+    [TestCase(49)]
+    [TestCase(50)]
+    public void SanitizeFormat_WithBoundaryLengths_ReturnsInput(int length)
     {
-        [TestCase(49)]
-        [TestCase(50)]
-        public void SanitizeFormat_WithBoundaryLengths_ReturnsInput(int length)
-        {
-            var input = new string('x', length);
-            new InputSanitizer().SanitizeFormat(input).ShouldBe(input);
-        }
+        var input = new string('x', length);
+        new InputSanitizer().SanitizeFormat(input).ShouldBe(input);
+    }
 
-        [TestCase(199)]
-        [TestCase(200)]
-        public void SanitizeEnvVarName_WithBoundaryLengths_ReturnsInput(int length)
-        {
-            var input = new string('A', length);
-            new InputSanitizer().SanitizeEnvVarName(input).ShouldBe(input);
-        }
+    [TestCase(199)]
+    [TestCase(200)]
+    public void SanitizeEnvVarName_WithBoundaryLengths_ReturnsInput(int length)
+    {
+        var input = new string('A', length);
+        new InputSanitizer().SanitizeEnvVarName(input).ShouldBe(input);
+    }
 
-        [TestCase(99)]
-        [TestCase(100)]
-        public void SanitizeMemberName_WithBoundaryLengths_ReturnsInput(int length)
-        {
-            var input = new string('A', length);
-            new InputSanitizer().SanitizeMemberName(input).ShouldBe(input);
-        }
+    [TestCase(99)]
+    [TestCase(100)]
+    public void SanitizeMemberName_WithBoundaryLengths_ReturnsInput(int length)
+    {
+        var input = new string('A', length);
+        new InputSanitizer().SanitizeMemberName(input).ShouldBe(input);
+    }
 
-        [Test]
-        public void SanitizeFormat_WithUnicode_ReturnsInput()
-        {
-            const string unicodeFormat = "测试format";
-            new InputSanitizer().SanitizeFormat(unicodeFormat).ShouldBe(unicodeFormat);
-        }
+    [Test]
+    public void SanitizeFormat_WithUnicode_ReturnsInput()
+    {
+        const string unicodeFormat = "测试format";
+        new InputSanitizer().SanitizeFormat(unicodeFormat).ShouldBe(unicodeFormat);
+    }
 
-        [Test]
-        public void SanitizeEnvVarName_WithUnicode_ThrowsArgumentException()
-        {
-            const string unicodeEnvVar = "测试_VAR";
-            Action act = () => new InputSanitizer().SanitizeEnvVarName(unicodeEnvVar);
-            act.ShouldThrowWithMessage<ArgumentException>(
-                $"Environment variable name contains disallowed characters: '{unicodeEnvVar}'");
-        }
+    [Test]
+    public void SanitizeEnvVarName_WithUnicode_ThrowsArgumentException()
+    {
+        const string unicodeEnvVar = "测试_VAR";
+        Action act = () => new InputSanitizer().SanitizeEnvVarName(unicodeEnvVar);
+        act.ShouldThrowWithMessage<ArgumentException>(
+            $"Environment variable name contains disallowed characters: '{unicodeEnvVar}'");
+    }
 
-        [Test]
-        public void SanitizeMemberName_WithUnicode_ThrowsArgumentException()
-        {
-            const string unicodeMember = "测试Member";
-            Action act = () => new InputSanitizer().SanitizeMemberName(unicodeMember);
-            act.ShouldThrowWithMessage<ArgumentException>(
-                $"Member name contains disallowed characters: '{unicodeMember}'");
-        }
+    [Test]
+    public void SanitizeMemberName_WithUnicode_ThrowsArgumentException()
+    {
+        const string unicodeMember = "测试Member";
+        Action act = () => new InputSanitizer().SanitizeMemberName(unicodeMember);
+        act.ShouldThrowWithMessage<ArgumentException>(
+            $"Member name contains disallowed characters: '{unicodeMember}'");
     }
 }
diff --git a/src/GitVersion.Core.Tests/Formatting/InputSanitizerTests.cs b/src/GitVersion.Core.Tests/Formatting/InputSanitizerTests.cs
deleted file mode 100644
index 73bf35dbe6..0000000000
--- a/src/GitVersion.Core.Tests/Formatting/InputSanitizerTests.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using GitVersion.Core.Tests.Extensions;
-using GitVersion.Formatting;
-
-namespace GitVersion.Tests.Formatting;
-
-[TestFixture]
-public partial class InputSanitizerTests
-{
-    [TestFixture]
-    public class SanitizeFormatTests : InputSanitizerTests
-    {
-        [Test]
-        public void SanitizeFormat_WithValidFormat_ReturnsInput()
-        {
-            var sut = new InputSanitizer();
-            const string validFormat = "yyyy-MM-dd";
-            sut.SanitizeFormat(validFormat).ShouldBe(validFormat);
-        }
-
-        [TestCase("")]
-        [TestCase(" ")]
-        [TestCase("\t")]
-        public void SanitizeFormat_WithEmptyOrWhitespace_ThrowsFormatException(string invalidFormat)
-        {
-            var sut = new InputSanitizer();
-            Action act = () => sut.SanitizeFormat(invalidFormat);
-            act.ShouldThrowWithMessage<FormatException>("Format string cannot be empty.");
-        }
-
-        [Test]
-        public void SanitizeFormat_WithTooLongFormat_ThrowsFormatException()
-        {
-            var sut = new InputSanitizer();
-            var longFormat = new string('x', 51);
-            Action act = () => sut.SanitizeFormat(longFormat);
-            act.ShouldThrowWithMessage<FormatException>("Format string too long: 'xxxxxxxxxxxxxxxxxxxx...'");
-        }
-
-        [Test]
-        public void SanitizeFormat_WithMaxValidLength_ReturnsInput()
-        {
-            var sut = new InputSanitizer();
-            var maxLengthFormat = new string('x', 50);
-            sut.SanitizeFormat(maxLengthFormat).ShouldBe(maxLengthFormat);
-        }
-
-        [TestCase("\r", TestName = "SanitizeFormat_ControlChar_CR")]
-        [TestCase("\n", TestName = "SanitizeFormat_ControlChar_LF")]
-        [TestCase("\0", TestName = "SanitizeFormat_ControlChar_Null")]
-        [TestCase("\x01", TestName = "SanitizeFormat_ControlChar_0x01")]
-        [TestCase("\x1F", TestName = "SanitizeFormat_ControlChar_0x1F")]
-        public void SanitizeFormat_WithControlCharacters_ThrowsFormatException(string controlChar)
-        {
-            var sut = new InputSanitizer();
-            var formatWithControl = $"valid{controlChar}format";
-            Action act = () => sut.SanitizeFormat(formatWithControl);
-            act.ShouldThrowWithMessage<FormatException>("Format string contains invalid control characters");
-        }
-
-        [Test]
-        public void SanitizeFormat_WithTabCharacter_ReturnsInput()
-        {
-            var sut = new InputSanitizer();
-            const string formatWithTab = "format\twith\ttab";
-            sut.SanitizeFormat(formatWithTab).ShouldBe(formatWithTab);
-        }
-
-        [TestCase("yyyy-MM-dd")]
-        [TestCase("HH:mm:ss")]
-        [TestCase("0.00")]
-        [TestCase("C2")]
-        [TestCase("X8")]
-        [TestCase("format with spaces")]
-        [TestCase("format-with-dashes")]
-        [TestCase("format_with_underscores")]
-        public void SanitizeFormat_WithValidFormats_ReturnsInput(string validFormat)
-        {
-            var sut = new InputSanitizer();
-            sut.SanitizeFormat(validFormat).ShouldBe(validFormat);
-        }
-    }
-}
diff --git a/src/GitVersion.Core.Tests/Formatting/SanitizeEnvVarNameTests.cs b/src/GitVersion.Core.Tests/Formatting/SanitizeEnvVarNameTests.cs
index 53f77a0a26..90861d1957 100644
--- a/src/GitVersion.Core.Tests/Formatting/SanitizeEnvVarNameTests.cs
+++ b/src/GitVersion.Core.Tests/Formatting/SanitizeEnvVarNameTests.cs
@@ -1,67 +1,67 @@
-using GitVersion.Core.Tests.Extensions;
+using System.Diagnostics.CodeAnalysis;
+using GitVersion.Core.Tests.Extensions;
 using GitVersion.Formatting;
 
 namespace GitVersion.Tests.Formatting;
 
-public partial class InputSanitizerTests
+[SuppressMessage("Style", "IDE0059:Unnecessary assignment of a value")]
+[SuppressMessage("Style", "IDE0060:Remove unused parameter")]
+[TestFixture]
+public class SanitizeEnvVarNameTests
 {
-    [TestFixture]
-    public class SanitizeEnvVarNameTests : InputSanitizerTests
+    [Test]
+    public void SanitizeEnvVarName_WithValidName_ReturnsInput()
     {
-        [Test]
-        public void SanitizeEnvVarName_WithValidName_ReturnsInput()
-        {
-            var sut = new InputSanitizer();
-            const string validName = "VALID_ENV_VAR";
-            sut.SanitizeEnvVarName(validName).ShouldBe(validName);
-        }
+        var sut = new InputSanitizer();
+        const string validName = "VALID_ENV_VAR";
+        sut.SanitizeEnvVarName(validName).ShouldBe(validName);
+    }
 
-        [TestCase("")]
-        [TestCase(" ")]
-        [TestCase("\t")]
-        public void SanitizeEnvVarName_WithEmptyOrWhitespace_ThrowsArgumentException(string invalidName)
-        {
-            var sut = new InputSanitizer();
-            Action act = () => sut.SanitizeEnvVarName(invalidName);
-            act.ShouldThrowWithMessage<ArgumentException>("Environment variable name cannot be null or empty.");
-        }
+    [TestCase("")]
+    [TestCase(" ")]
+    [TestCase("\t")]
+    public void SanitizeEnvVarName_WithEmptyOrWhitespace_ThrowsArgumentException(string invalidName)
+    {
+        var sut = new InputSanitizer();
+        Action act = () => sut.SanitizeEnvVarName(invalidName);
+        act.ShouldThrowWithMessage<ArgumentException>("Environment variable name cannot be null or empty.");
+    }
 
-        [Test]
-        public void SanitizeEnvVarName_WithTooLongName_ThrowsArgumentException()
-        {
-            var sut = new InputSanitizer();
-            var longName = new string('A', 201);
-            Action act = () => sut.SanitizeEnvVarName(longName);
-            act.ShouldThrowWithMessage<ArgumentException>("Environment variable name too long: 'AAAAAAAAAAAAAAAAAAAA...'");
-        }
+    [Test]
+    public void SanitizeEnvVarName_WithTooLongName_ThrowsArgumentException()
+    {
+        var sut = new InputSanitizer();
+        var longName = new string('A', 201);
+        Action act = () => sut.SanitizeEnvVarName(longName);
+        act.ShouldThrowWithMessage<ArgumentException>("Environment variable name too long: 'AAAAAAAAAAAAAAAAAAAA...'");
+    }
 
-        [Test]
-        public void SanitizeEnvVarName_WithMaxValidLength_ReturnsInput()
-        {
-            var sut = new InputSanitizer();
-            var maxLengthName = new string('A', 200);
-            sut.SanitizeEnvVarName(maxLengthName).ShouldBe(maxLengthName);
-        }
+    [Test]
+    public void SanitizeEnvVarName_WithMaxValidLength_ReturnsInput()
+    {
+        var sut = new InputSanitizer();
+        var maxLengthName = new string('A', 200);
+        sut.SanitizeEnvVarName(maxLengthName).ShouldBe(maxLengthName);
+    }
 
-        [Test]
-        public void SanitizeEnvVarName_WithInvalidCharacters_ThrowsArgumentException()
-        {
-            var sut = new InputSanitizer();
-            const string invalidName = "INVALID@NAME";
-            Action act = () => sut.SanitizeEnvVarName(invalidName);
-            act.ShouldThrowWithMessage<ArgumentException>("Environment variable name contains disallowed characters: 'INVALID@NAME'");
-        }
+    [Test]
+    public void SanitizeEnvVarName_WithInvalidCharacters_ThrowsArgumentException()
+    {
+        var sut = new InputSanitizer();
+        const string invalidName = "INVALID@NAME";
+        Action act = () => sut.SanitizeEnvVarName(invalidName);
+        act.ShouldThrowWithMessage<ArgumentException>("Environment variable name contains disallowed characters: 'INVALID@NAME'");
+    }
 
-        [TestCase("PATH")]
-        [TestCase("HOME")]
-        [TestCase("USER_NAME")]
-        [TestCase("MY_VAR_123")]
-        [TestCase("_PRIVATE_VAR")]
-        [TestCase("VAR123")]
-        public void SanitizeEnvVarName_WithValidNames_ReturnsInput(string validName)
-        {
-            var sut = new InputSanitizer();
-            sut.SanitizeEnvVarName(validName).ShouldBe(validName);
-        }
+    [TestCase("PATH")]
+    [TestCase("HOME")]
+    [TestCase("USER_NAME")]
+    [TestCase("MY_VAR_123")]
+    [TestCase("_PRIVATE_VAR")]
+    [TestCase("VAR123")]
+    public void SanitizeEnvVarName_WithValidNames_ReturnsInput(string validName)
+    {
+        var sut = new InputSanitizer();
+        sut.SanitizeEnvVarName(validName).ShouldBe(validName);
     }
 }
diff --git a/src/GitVersion.Core.Tests/Formatting/SanitizeFormatTests.cs b/src/GitVersion.Core.Tests/Formatting/SanitizeFormatTests.cs
new file mode 100644
index 0000000000..c34ab3cf75
--- /dev/null
+++ b/src/GitVersion.Core.Tests/Formatting/SanitizeFormatTests.cs
@@ -0,0 +1,81 @@
+using System.Diagnostics.CodeAnalysis;
+using GitVersion.Core.Tests.Extensions;
+using GitVersion.Formatting;
+
+namespace GitVersion.Tests.Formatting;
+
+[SuppressMessage("Style", "IDE0059:Unnecessary assignment of a value")]
+[SuppressMessage("Style", "IDE0060:Remove unused parameter")]
+[TestFixture]
+public class SanitizeFormatTests
+{
+    [Test]
+    public void SanitizeFormat_WithValidFormat_ReturnsInput()
+    {
+        var sut = new InputSanitizer();
+        const string validFormat = "yyyy-MM-dd";
+        sut.SanitizeFormat(validFormat).ShouldBe(validFormat);
+    }
+
+    [TestCase("")]
+    [TestCase(" ")]
+    [TestCase("\t")]
+    public void SanitizeFormat_WithEmptyOrWhitespace_ThrowsFormatException(string invalidFormat)
+    {
+        var sut = new InputSanitizer();
+        Action act = () => sut.SanitizeFormat(invalidFormat);
+        act.ShouldThrowWithMessage<FormatException>("Format string cannot be empty.");
+    }
+
+    [Test]
+    public void SanitizeFormat_WithTooLongFormat_ThrowsFormatException()
+    {
+        var sut = new InputSanitizer();
+        var longFormat = new string('x', 51);
+        Action act = () => sut.SanitizeFormat(longFormat);
+        act.ShouldThrowWithMessage<FormatException>("Format string too long: 'xxxxxxxxxxxxxxxxxxxx...'");
+    }
+
+    [Test]
+    public void SanitizeFormat_WithMaxValidLength_ReturnsInput()
+    {
+        var sut = new InputSanitizer();
+        var maxLengthFormat = new string('x', 50);
+        sut.SanitizeFormat(maxLengthFormat).ShouldBe(maxLengthFormat);
+    }
+
+    [TestCase("\r", TestName = "SanitizeFormat_ControlChar_CR")]
+    [TestCase("\n", TestName = "SanitizeFormat_ControlChar_LF")]
+    [TestCase("\0", TestName = "SanitizeFormat_ControlChar_Null")]
+    [TestCase("\x01", TestName = "SanitizeFormat_ControlChar_0x01")]
+    [TestCase("\x1F", TestName = "SanitizeFormat_ControlChar_0x1F")]
+    public void SanitizeFormat_WithControlCharacters_ThrowsFormatException(string controlChar)
+    {
+        var sut = new InputSanitizer();
+        var formatWithControl = $"valid{controlChar}format";
+        Action act = () => sut.SanitizeFormat(formatWithControl);
+        act.ShouldThrowWithMessage<FormatException>("Format string contains invalid control characters");
+    }
+
+    [Test]
+    public void SanitizeFormat_WithTabCharacter_ReturnsInput()
+    {
+        var sut = new InputSanitizer();
+        const string formatWithTab = "format\twith\ttab";
+        sut.SanitizeFormat(formatWithTab).ShouldBe(formatWithTab);
+    }
+
+    [TestCase("yyyy-MM-dd")]
+    [TestCase("HH:mm:ss")]
+    [TestCase("0.00")]
+    [TestCase("C2")]
+    [TestCase("X8")]
+    [TestCase("format with spaces")]
+    [TestCase("format-with-dashes")]
+    [TestCase("format_with_underscores")]
+    public void SanitizeFormat_WithValidFormats_ReturnsInput(string validFormat)
+    {
+        var sut = new InputSanitizer();
+        sut.SanitizeFormat(validFormat).ShouldBe(validFormat);
+    }
+}
diff --git a/src/GitVersion.Core.Tests/Formatting/SanitizeMemberNameTests.cs b/src/GitVersion.Core.Tests/Formatting/SanitizeMemberNameTests.cs
index 7f7aa87c1f..196369f672 100644
--- a/src/GitVersion.Core.Tests/Formatting/SanitizeMemberNameTests.cs
+++ b/src/GitVersion.Core.Tests/Formatting/SanitizeMemberNameTests.cs
@@ -1,78 +1,78 @@
-using GitVersion.Core.Tests.Extensions;
+using System.Diagnostics.CodeAnalysis;
+using GitVersion.Core.Tests.Extensions;
 using GitVersion.Formatting;
 
 namespace GitVersion.Tests.Formatting;
 
-public partial class InputSanitizerTests
+[SuppressMessage("Style", "IDE0059:Unnecessary assignment of a value")]
+[SuppressMessage("Style", "IDE0060:Remove unused parameter")]
+[TestFixture]
+public class SanitizeMemberNameTests
 {
-    [TestFixture]
-    public class SanitizeMemberNameTests : InputSanitizerTests
+    [Test]
+    public void SanitizeMemberName_WithValidName_ReturnsInput()
     {
-        [Test]
-        public void SanitizeMemberName_WithValidName_ReturnsInput()
-        {
-            var sut = new InputSanitizer();
-            const string validName = "ValidMemberName";
-            sut.SanitizeMemberName(validName).ShouldBe(validName);
-        }
+        var sut = new InputSanitizer();
+        const string validName = "ValidMemberName";
+        sut.SanitizeMemberName(validName).ShouldBe(validName);
+    }
 
-        [TestCase("")]
-        [TestCase(" ")]
-        [TestCase("\t")]
-        public void SanitizeMemberName_WithEmptyOrWhitespace_ThrowsArgumentException(string invalidName)
-        {
-            var sut = new InputSanitizer();
-            Action act = () => sut.SanitizeMemberName(invalidName);
-            act.ShouldThrowWithMessage<ArgumentException>("Member name cannot be empty.");
-        }
+    [TestCase("")]
+    [TestCase(" ")]
+    [TestCase("\t")]
+    public void SanitizeMemberName_WithEmptyOrWhitespace_ThrowsArgumentException(string invalidName)
+    {
+        var sut = new InputSanitizer();
+        Action act = () => sut.SanitizeMemberName(invalidName);
+        act.ShouldThrowWithMessage<ArgumentException>("Member name cannot be empty.");
+    }
 
-        [Test]
-        public void SanitizeMemberName_WithTooLongName_ThrowsArgumentException()
-        {
-            var sut = new InputSanitizer();
-            var longName = new string('A', 101);
-            Action act = () => sut.SanitizeMemberName(longName);
-            act.ShouldThrowWithMessage<ArgumentException>("Member name too long: 'AAAAAAAAAAAAAAAAAAAA...'");
-        }
+    [Test]
+    public void SanitizeMemberName_WithTooLongName_ThrowsArgumentException()
+    {
+        var sut = new InputSanitizer();
+        var longName = new string('A', 101);
+        Action act = () => sut.SanitizeMemberName(longName);
+        act.ShouldThrowWithMessage<ArgumentException>("Member name too long: 'AAAAAAAAAAAAAAAAAAAA...'");
+    }
 
-        [Test]
-        public void SanitizeMemberName_WithMaxValidLength_ReturnsInput()
-        {
-            var sut = new InputSanitizer();
-            var maxLengthName = new string('A', 100);
-            sut.SanitizeMemberName(maxLengthName).ShouldBe(maxLengthName);
-        }
+    [Test]
+    public void SanitizeMemberName_WithMaxValidLength_ReturnsInput()
+    {
+        var sut = new InputSanitizer();
+        var maxLengthName = new string('A', 100);
+        sut.SanitizeMemberName(maxLengthName).ShouldBe(maxLengthName);
+    }
 
-        [Test]
-        public void SanitizeMemberName_WithInvalidCharacters_ThrowsArgumentException()
-        {
-            var sut = new InputSanitizer();
-            const string invalidName = "Invalid@Member";
-            Action act = () => sut.SanitizeMemberName(invalidName);
-            act.ShouldThrowWithMessage<ArgumentException>("Member name contains disallowed characters: 'Invalid@Member'");
-        }
+    [Test]
+    public void SanitizeMemberName_WithInvalidCharacters_ThrowsArgumentException()
+    {
+        var sut = new InputSanitizer();
+        const string invalidName = "Invalid@Member";
+        Action act = () => sut.SanitizeMemberName(invalidName);
+        act.ShouldThrowWithMessage<ArgumentException>("Member name contains disallowed characters: 'Invalid@Member'");
+    }
 
-        [TestCase("PropertyName")]
-        [TestCase("FieldName")]
-        [TestCase("Member123")]
-        [TestCase("_privateMember")]
-        [TestCase("CamelCaseName")]
-        [TestCase("PascalCaseName")]
-        [TestCase("member_with_underscores")]
-        public void SanitizeMemberName_WithValidNames_ReturnsInput(string validName)
-        {
-            var sut = new InputSanitizer();
-            sut.SanitizeMemberName(validName).ShouldBe(validName);
-        }
+    [TestCase("PropertyName")]
+    [TestCase("FieldName")]
+    [TestCase("Member123")]
+    [TestCase("_privateMember")]
+    [TestCase("CamelCaseName")]
+    [TestCase("PascalCaseName")]
+    [TestCase("member_with_underscores")]
+    public void SanitizeMemberName_WithValidNames_ReturnsInput(string validName)
+    {
+        var sut = new InputSanitizer();
+        sut.SanitizeMemberName(validName).ShouldBe(validName);
+    }
 
-        [TestCase("member.nested")]
-        [TestCase("Parent.Child.GrandChild")]
-        public void SanitizeMemberName_WithDottedNames_HandledByRegex(string dottedName)
-        {
-            var sut = new InputSanitizer();
-            Action act = () => sut.SanitizeMemberName(dottedName);
+    [TestCase("member.nested")]
+    [TestCase("Parent.Child.GrandChild")]
+    public void SanitizeMemberName_WithDottedNames_HandledByRegex(string dottedName)
+    {
+        var sut = new InputSanitizer();
+        Action act = () => sut.SanitizeMemberName(dottedName);
 
-            act.ShouldNotThrow();
-        }
+        act.ShouldNotThrow();
     }
 }
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs
index 8da8e0ce2c..975faead87 100644
--- a/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs
+++ b/src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs
@@ -84,11 +84,14 @@ public void DoesNotTakeVersionFromNameOfRemoteReleaseBranchInCustomRemote()
 
 internal static class BaseGitFlowRepositoryFixtureExtensions
 {
-    public static void CreateAndMergeBranchIntoDevelop(this BaseGitFlowRepositoryFixture fixture, string branchName)
+    extension(BaseGitFlowRepositoryFixture fixture)
     {
-        fixture.BranchTo(branchName);
-        fixture.MakeACommit();
-        fixture.Checkout("develop");
-        fixture.MergeNoFF(branchName);
+        public void CreateAndMergeBranchIntoDevelop(string branchName)
+        {
+            fixture.BranchTo(branchName);
+            fixture.MakeACommit();
+            fixture.Checkout("develop");
+            fixture.MergeNoFF(branchName);
+        }
     }
 }
diff --git a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
index d38ae71969..2b67f9e021 100644
--- a/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
+++ b/src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
@@ -202,6 +202,7 @@ private class MockCommit : ICommit
         public IObjectId Id => throw new NotImplementedException();
         public string Sha => throw new NotImplementedException();
         public IReadOnlyList<ICommit> Parents => throw new NotImplementedException();
+        public bool IsMergeCommit => throw new NotImplementedException();
         public IReadOnlyList<string> DiffPaths => throw new NotImplementedException();
         public DateTimeOffset When => throw new NotImplementedException();
         public string Message => throw new NotImplementedException();
diff --git a/src/GitVersion.Core/Configuration/IgnoreConfigurationExtensions.cs b/src/GitVersion.Core/Configuration/IgnoreConfigurationExtensions.cs
deleted file mode 100644
index d58cd9be89..0000000000
--- a/src/GitVersion.Core/Configuration/IgnoreConfigurationExtensions.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using GitVersion.Extensions;
-using GitVersion.Git;
-
-namespace GitVersion.Configuration;
-
-internal static class IgnoreConfigurationExtensions
-{
-    public static IEnumerable<ITag> Filter(this IIgnoreConfiguration ignore, ITag[] source)
-    {
-        ignore.NotNull();
-        source.NotNull();
-
-        return !ignore.IsEmpty ? source.Where(element => ShouldBeIgnored(element.Commit, ignore)) : source;
-    }
-
-    public static IEnumerable<ICommit> Filter(this IIgnoreConfiguration ignore, ICommit[] source)
-    {
-        ignore.NotNull();
-        source.NotNull();
-
-        return !ignore.IsEmpty ? source.Where(element => ShouldBeIgnored(element, ignore)) : source;
-    }
-
-    private static bool ShouldBeIgnored(ICommit commit, IIgnoreConfiguration ignore)
-        => !ignore.ToFilters().Any(filter => filter.Exclude(commit, out _));
-}
diff --git a/src/GitVersion.Core/Core/EffectiveConfigurationExtensions.cs b/src/GitVersion.Core/Core/EffectiveConfigurationExtensions.cs
deleted file mode 100644
index 0916dc11d3..0000000000
--- a/src/GitVersion.Core/Core/EffectiveConfigurationExtensions.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using GitVersion.Configuration;
-using GitVersion.Extensions;
-
-namespace GitVersion.Core;
-
-internal static class EffectiveConfigurationExtensions
-{
-    public static TaggedSemanticVersions GetTaggedSemanticVersion(this EffectiveConfiguration effectiveConfiguration)
-    {
-        effectiveConfiguration.NotNull();
-
-        var taggedSemanticVersion = TaggedSemanticVersions.OfBranch;
-
-        if (effectiveConfiguration.TrackMergeTarget)
-        {
-            taggedSemanticVersion |= TaggedSemanticVersions.OfMergeTargets;
-        }
-
-        if (effectiveConfiguration.TracksReleaseBranches)
-        {
-            taggedSemanticVersion |= TaggedSemanticVersions.OfReleaseBranches;
-        }
-
-        if (effectiveConfiguration is { IsMainBranch: false, IsReleaseBranch: false })
-        {
-            taggedSemanticVersion |= TaggedSemanticVersions.OfMainBranches;
-        }
-        return taggedSemanticVersion;
-    }
-}
diff --git a/src/GitVersion.Core/Extensions/AssemblyVersionsGeneratorExtensions.cs b/src/GitVersion.Core/Extensions/AssemblyVersionsGeneratorExtensions.cs
index d4465c8eac..f3c57ed547 100644
--- a/src/GitVersion.Core/Extensions/AssemblyVersionsGeneratorExtensions.cs
+++ b/src/GitVersion.Core/Extensions/AssemblyVersionsGeneratorExtensions.cs
@@ -4,25 +4,28 @@ namespace GitVersion.Extensions;
 
 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))
-        };
+    extension(SemanticVersion sv)
+    {
+        public string? GetAssemblyVersion(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 string? GetAssemblyFileVersion(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))
+            };
+    }
 }
diff --git a/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs b/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs
index 20d51dbdcc..3830bf8962 100644
--- a/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs
+++ b/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs
@@ -1,156 +1,157 @@
-using System.IO.Abstractions;
 using GitVersion.Core;
 using GitVersion.Extensions;
 using GitVersion.Git;
-using GitVersion.Helpers;
 using GitVersion.VersionCalculation;
 
 namespace GitVersion.Configuration;
 
 internal static class ConfigurationExtensions
 {
-    public static EffectiveBranchConfiguration GetEffectiveBranchConfiguration(
-        this IGitVersionConfiguration configuration, IBranch branch, EffectiveConfiguration? parentConfiguration = null)
+    extension(IGitVersionConfiguration configuration)
     {
-        var effectiveConfiguration = GetEffectiveConfiguration(configuration, branch.Name, parentConfiguration);
-        return new EffectiveBranchConfiguration(effectiveConfiguration, branch);
-    }
-
-    public static EffectiveConfiguration GetEffectiveConfiguration(
-        this IGitVersionConfiguration configuration, ReferenceName branchName, EffectiveConfiguration? parentConfiguration = null)
-    {
-        var branchConfiguration = configuration.GetBranchConfiguration(branchName);
-        EffectiveConfiguration? fallbackConfiguration = null;
-        if (branchConfiguration.Increment == IncrementStrategy.Inherit)
+        public EffectiveBranchConfiguration GetEffectiveBranchConfiguration(IBranch branch, EffectiveConfiguration? parentConfiguration = null)
         {
-            fallbackConfiguration = parentConfiguration;
+            var effectiveConfiguration = GetEffectiveConfiguration(configuration, branch.Name, parentConfiguration);
+            return new EffectiveBranchConfiguration(effectiveConfiguration, branch);
         }
-        return new EffectiveConfiguration(configuration, branchConfiguration, fallbackConfiguration);
-    }
-
-    public static IBranchConfiguration GetBranchConfiguration(this IGitVersionConfiguration configuration, IBranch branch)
-        => GetBranchConfiguration(configuration, branch.NotNull().Name);
-
-    public static IBranchConfiguration GetBranchConfiguration(this IGitVersionConfiguration configuration, ReferenceName branchName)
-    {
-        var branchConfiguration = GetBranchConfigurations(configuration, branchName.WithoutOrigin).FirstOrDefault();
-        branchConfiguration ??= configuration.GetEmptyBranchConfiguration();
-        return branchConfiguration;
-    }
 
-    public static IEnumerable<IVersionFilter> ToFilters(this IIgnoreConfiguration source)
-    {
-        source.NotNull();
-
-        if (source.Shas.Count != 0) yield return new ShaVersionFilter(source.Shas);
-        if (source.Before.HasValue) yield return new MinDateVersionFilter(source.Before.Value);
-        if (source.Paths.Count != 0) yield return new PathFilter(source.Paths.ToList());
-    }
-
-    private static IEnumerable<IBranchConfiguration> GetBranchConfigurations(IGitVersionConfiguration configuration, string branchName)
-    {
-        IBranchConfiguration? unknownBranchConfiguration = null;
-        foreach (var (key, branchConfiguration) in configuration.Branches)
+        public EffectiveConfiguration GetEffectiveConfiguration(ReferenceName branchName, EffectiveConfiguration? parentConfiguration = null)
         {
-            if (!branchConfiguration.IsMatch(branchName)) continue;
-            if (key == "unknown")
-            {
-                unknownBranchConfiguration = branchConfiguration;
-            }
-            else
+            var branchConfiguration = configuration.GetBranchConfiguration(branchName);
+            EffectiveConfiguration? fallbackConfiguration = null;
+            if (branchConfiguration.Increment == IncrementStrategy.Inherit)
             {
-                yield return branchConfiguration;
+                fallbackConfiguration = parentConfiguration;
             }
+            return new EffectiveConfiguration(configuration, branchConfiguration, fallbackConfiguration);
         }
 
-        if (unknownBranchConfiguration != null) yield return unknownBranchConfiguration;
-    }
+        public IBranchConfiguration GetBranchConfiguration(IBranch branch)
+            => GetBranchConfiguration(configuration, branch.NotNull().Name);
+
+        public IBranchConfiguration GetBranchConfiguration(ReferenceName branchName)
+        {
+            var branchConfiguration = GetBranchConfigurations(configuration, branchName.WithoutOrigin).FirstOrDefault();
+            branchConfiguration ??= configuration.GetEmptyBranchConfiguration();
+            return branchConfiguration;
+
+            static IEnumerable<IBranchConfiguration> GetBranchConfigurations(IGitVersionConfiguration configuration, string branchName)
+            {
+                IBranchConfiguration? unknownBranchConfiguration = null;
+                foreach (var (key, branchConfiguration) in configuration.Branches)
+                {
+                    if (!branchConfiguration.IsMatch(branchName)) continue;
+                    if (key == "unknown")
+                    {
+                        unknownBranchConfiguration = branchConfiguration;
+                    }
+                    else
+                    {
+                        yield return branchConfiguration;
+                    }
+                }
 
-    public static IBranchConfiguration GetFallbackBranchConfiguration(this IGitVersionConfiguration configuration) => configuration;
+                if (unknownBranchConfiguration != null) yield return unknownBranchConfiguration;
+            }
+        }
 
-    public static bool IsReleaseBranch(this IGitVersionConfiguration configuration, IBranch branch)
-        => IsReleaseBranch(configuration, branch.NotNull().Name);
+        public IBranchConfiguration GetFallbackBranchConfiguration() => configuration;
 
-    public static bool IsReleaseBranch(this IGitVersionConfiguration configuration, ReferenceName branchName)
-        => configuration.GetBranchConfiguration(branchName).IsReleaseBranch ?? false;
+        public bool IsReleaseBranch(IBranch branch)
+            => IsReleaseBranch(configuration, branch.NotNull().Name);
 
-    public static string? GetBranchSpecificLabel(
-            this EffectiveConfiguration configuration, ReferenceName branchName, string? branchNameOverride)
-        => GetBranchSpecificLabel(configuration, branchName.WithoutOrigin, branchNameOverride);
+        public bool IsReleaseBranch(ReferenceName branchName)
+            => configuration.GetBranchConfiguration(branchName).IsReleaseBranch ?? false;
+    }
 
-    public static string? GetBranchSpecificLabel(
-        this EffectiveConfiguration configuration, string? branchName, string? branchNameOverride)
+    extension(IIgnoreConfiguration ignoreConfig)
     {
-        configuration.NotNull();
+        public IEnumerable<IVersionFilter> ToFilters()
+        {
+            ignoreConfig.NotNull();
+
+            if (ignoreConfig.Shas.Count != 0) yield return new ShaVersionFilter(ignoreConfig.Shas);
+            if (ignoreConfig.Before.HasValue) yield return new MinDateVersionFilter(ignoreConfig.Before.Value);
+            if (ignoreConfig.Paths.Count != 0) yield return new PathFilter([.. ignoreConfig.Paths]);
+        }
 
-        var label = configuration.Label;
-        if (label is null)
+        public IEnumerable<ITag> Filter(ITag[] source)
         {
-            return label;
+            ignoreConfig.NotNull();
+            source.NotNull();
+
+            return !ignoreConfig.IsEmpty ? source.Where(element => ShouldBeIgnored(element.Commit, ignoreConfig)) : source;
         }
 
-        var effectiveBranchName = branchNameOverride ?? branchName;
-        if (configuration.RegularExpression.IsNullOrWhiteSpace() || effectiveBranchName.IsNullOrEmpty()) return label;
-        var regex = RegexPatterns.Cache.GetOrAdd(configuration.RegularExpression);
-        var match = regex.Match(effectiveBranchName);
-        if (!match.Success) return label;
-        foreach (var groupName in regex.GetGroupNames())
+        public IEnumerable<ICommit> Filter(ICommit[] source)
         {
-            var groupValue = match.Groups[groupName].Value;
-            Lazy<string> escapedGroupValueLazy = new(() => EscapeInvalidCharacters(groupValue));
-            var placeholder = $"{{{groupName}}}";
-            int index, startIndex = 0;
-            while ((index = label.IndexOf(placeholder, startIndex, StringComparison.InvariantCulture)) >= 0)
-            {
-                var escapedGroupValue = escapedGroupValueLazy.Value;
-                label = label.Remove(index, placeholder.Length).Insert(index, escapedGroupValue);
-                startIndex = index + escapedGroupValue.Length;
-            }
+            ignoreConfig.NotNull();
+            source.NotNull();
+
+            return !ignoreConfig.IsEmpty ? source.Where(element => ShouldBeIgnored(element, ignoreConfig)) : source;
         }
-        return label;
     }
 
-    private static string EscapeInvalidCharacters(string groupValue) => groupValue.RegexReplace(RegexPatterns.Common.SanitizeNameRegexPattern, "-");
+    private static bool ShouldBeIgnored(ICommit commit, IIgnoreConfiguration ignore)
+        => !ignore.ToFilters().Any(filter => filter.Exclude(commit, out _));
 
-    public static (string GitDirectory, string WorkingTreeDirectory)? FindGitDir(this IFileSystem fileSystem, string? path)
+    extension(EffectiveConfiguration configuration)
     {
-        var startingDir = path;
-        while (startingDir is not null)
+        public string? GetBranchSpecificLabel(ReferenceName branchName, string? branchNameOverride)
+            => GetBranchSpecificLabel(configuration, branchName.WithoutOrigin, branchNameOverride);
+
+        public string? GetBranchSpecificLabel(string? branchName, string? branchNameOverride)
         {
-            var dirOrFilePath = FileSystemHelper.Path.Combine(startingDir, ".git");
-            if (fileSystem.Directory.Exists(dirOrFilePath))
+            configuration.NotNull();
+
+            var label = configuration.Label;
+            if (label is null)
             {
-                return (dirOrFilePath, FileSystemHelper.Path.GetDirectoryName(dirOrFilePath));
+                return label;
             }
 
-            if (fileSystem.File.Exists(dirOrFilePath))
+            var effectiveBranchName = branchNameOverride ?? branchName;
+            if (configuration.RegularExpression.IsNullOrWhiteSpace() || effectiveBranchName.IsNullOrEmpty()) return label;
+            var regex = RegexPatterns.Cache.GetOrAdd(configuration.RegularExpression);
+            var match = regex.Match(effectiveBranchName);
+            if (!match.Success) return label;
+            foreach (var groupName in regex.GetGroupNames())
             {
-                var relativeGitDirPath = ReadGitDirFromFile(fileSystem, dirOrFilePath);
-                if (!string.IsNullOrWhiteSpace(relativeGitDirPath))
+                var groupValue = match.Groups[groupName].Value;
+                Lazy<string> escapedGroupValueLazy = new(() => groupValue.RegexReplace(RegexPatterns.Common.SanitizeNameRegexPattern, "-"));
+                var placeholder = $"{{{groupName}}}";
+                int index, startIndex = 0;
+                while ((index = label.IndexOf(placeholder, startIndex, StringComparison.InvariantCulture)) >= 0)
                 {
-                    var fullGitDirPath = FileSystemHelper.Path.GetFullPath(FileSystemHelper.Path.Combine(startingDir, relativeGitDirPath));
-                    if (fileSystem.Directory.Exists(fullGitDirPath))
-                    {
-                        return (fullGitDirPath, FileSystemHelper.Path.GetDirectoryName(dirOrFilePath));
-                    }
+                    var escapedGroupValue = escapedGroupValueLazy.Value;
+                    label = label.Remove(index, placeholder.Length).Insert(index, escapedGroupValue);
+                    startIndex = index + escapedGroupValue.Length;
                 }
             }
-
-            startingDir = FileSystemHelper.Path.GetDirectoryName(startingDir);
+            return label;
         }
 
-        return null;
-    }
-
-    private static string? ReadGitDirFromFile(IFileSystem fileSystem, string fileName)
-    {
-        const string expectedPrefix = "gitdir: ";
-        var firstLineOfFile = fileSystem.File.ReadLines(fileName).FirstOrDefault();
-        if (firstLineOfFile?.StartsWith(expectedPrefix) ?? false)
+        public TaggedSemanticVersions GetTaggedSemanticVersion()
         {
-            return firstLineOfFile[expectedPrefix.Length..]; // strip off the prefix, leaving just the path
-        }
+            configuration.NotNull();
+
+            var taggedSemanticVersion = TaggedSemanticVersions.OfBranch;
+
+            if (configuration.TrackMergeTarget)
+            {
+                taggedSemanticVersion |= TaggedSemanticVersions.OfMergeTargets;
+            }
+
+            if (configuration.TracksReleaseBranches)
+            {
+                taggedSemanticVersion |= TaggedSemanticVersions.OfReleaseBranches;
+            }
 
-        return null;
+            if (configuration is { IsMainBranch: false, IsReleaseBranch: false })
+            {
+                taggedSemanticVersion |= TaggedSemanticVersions.OfMainBranches;
+            }
+            return taggedSemanticVersion;
+        }
     }
 }
diff --git a/src/GitVersion.Core/Extensions/DictionaryExtensions.cs b/src/GitVersion.Core/Extensions/DictionaryExtensions.cs
index 02f0f28a66..b0e49e7e13 100644
--- a/src/GitVersion.Core/Extensions/DictionaryExtensions.cs
+++ b/src/GitVersion.Core/Extensions/DictionaryExtensions.cs
@@ -2,14 +2,17 @@ namespace GitVersion.Extensions;
 
 internal static class DictionaryExtensions
 {
-    internal static TValue GetOrAdd<TKey, TValue>(this Dictionary<TKey, TValue> dict, TKey key, Func<TValue> getValue) where TKey : notnull
+    extension<TKey, TValue>(Dictionary<TKey, TValue> dict) where TKey : notnull
     {
-        ArgumentNullException.ThrowIfNull(dict);
-        ArgumentNullException.ThrowIfNull(getValue);
+        internal TValue GetOrAdd(TKey key, Func<TValue> getValue)
+        {
+            ArgumentNullException.ThrowIfNull(dict);
+            ArgumentNullException.ThrowIfNull(getValue);
 
-        if (dict.TryGetValue(key, out var value)) return value;
-        value = getValue();
-        dict.Add(key, value);
-        return value;
+            if (dict.TryGetValue(key, out var value)) return value;
+            value = getValue();
+            dict.Add(key, value);
+            return value;
+        }
     }
 }
diff --git a/src/GitVersion.Core/Extensions/FileSystemExtensions.cs b/src/GitVersion.Core/Extensions/FileSystemExtensions.cs
index 213eea6a76..1b8b26cc86 100644
--- a/src/GitVersion.Core/Extensions/FileSystemExtensions.cs
+++ b/src/GitVersion.Core/Extensions/FileSystemExtensions.cs
@@ -1,13 +1,59 @@
 using System.IO.Abstractions;
+using GitVersion.Helpers;
 
 namespace GitVersion.Extensions;
 
 public static class FileSystemExtensions
 {
-    public static long GetLastDirectoryWrite(this IFileSystem fileSystem, string path) => fileSystem.DirectoryInfo.New(path)
-        .GetDirectories("*.*", SearchOption.AllDirectories)
-        .Select(d => d.LastWriteTimeUtc)
-        .DefaultIfEmpty()
-        .Max()
-        .Ticks;
+    extension(IFileSystem fileSystem)
+    {
+        public long GetLastDirectoryWrite(string path) => fileSystem.DirectoryInfo.New(path)
+            .GetDirectories("*.*", SearchOption.AllDirectories)
+            .Select(d => d.LastWriteTimeUtc)
+            .DefaultIfEmpty()
+            .Max()
+            .Ticks;
+
+        public (string GitDirectory, string WorkingTreeDirectory)? FindGitDir(string? path)
+        {
+            var startingDir = path;
+            while (startingDir is not null)
+            {
+                var dirOrFilePath = FileSystemHelper.Path.Combine(startingDir, ".git");
+                if (fileSystem.Directory.Exists(dirOrFilePath))
+                {
+                    return (dirOrFilePath, FileSystemHelper.Path.GetDirectoryName(dirOrFilePath));
+                }
+
+                if (fileSystem.File.Exists(dirOrFilePath))
+                {
+                    var relativeGitDirPath = ReadGitDirFromFile(dirOrFilePath);
+                    if (!string.IsNullOrWhiteSpace(relativeGitDirPath))
+                    {
+                        var fullGitDirPath = FileSystemHelper.Path.GetFullPath(FileSystemHelper.Path.Combine(startingDir, relativeGitDirPath));
+                        if (fileSystem.Directory.Exists(fullGitDirPath))
+                        {
+                            return (fullGitDirPath, FileSystemHelper.Path.GetDirectoryName(dirOrFilePath));
+                        }
+                    }
+                }
+
+                startingDir = FileSystemHelper.Path.GetDirectoryName(startingDir);
+            }
+
+            return null;
+
+            string? ReadGitDirFromFile(string fileName)
+            {
+                const string expectedPrefix = "gitdir: ";
+                var firstLineOfFile = fileSystem.File.ReadLines(fileName).FirstOrDefault();
+                if (firstLineOfFile?.StartsWith(expectedPrefix) ?? false)
+                {
+                    return firstLineOfFile[expectedPrefix.Length..]; // strip off the prefix, leaving just the path
+                }
+
+                return null;
+            }
+        }
+    }
 }
diff --git a/src/GitVersion.Core/Extensions/IncrementStrategyExtensions.cs b/src/GitVersion.Core/Extensions/IncrementStrategyExtensions.cs
index eb84a57dce..0fe6ae3417 100644
--- a/src/GitVersion.Core/Extensions/IncrementStrategyExtensions.cs
+++ b/src/GitVersion.Core/Extensions/IncrementStrategyExtensions.cs
@@ -2,12 +2,15 @@ namespace GitVersion.Extensions;
 
 public static class IncrementStrategyExtensions
 {
-    public static VersionField ToVersionField(this IncrementStrategy strategy) => strategy switch
+    extension(IncrementStrategy strategy)
     {
-        IncrementStrategy.None => VersionField.None,
-        IncrementStrategy.Major => VersionField.Major,
-        IncrementStrategy.Minor => VersionField.Minor,
-        IncrementStrategy.Patch => VersionField.Patch,
-        _ => throw new ArgumentOutOfRangeException(nameof(strategy), strategy, null)
-    };
+        public VersionField ToVersionField() => 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)
+        };
+    }
 }
diff --git a/src/GitVersion.Core/Extensions/ReadEmbeddedResourceExtensions.cs b/src/GitVersion.Core/Extensions/ReadEmbeddedResourceExtensions.cs
index 95391be84d..b19218bf8d 100644
--- a/src/GitVersion.Core/Extensions/ReadEmbeddedResourceExtensions.cs
+++ b/src/GitVersion.Core/Extensions/ReadEmbeddedResourceExtensions.cs
@@ -2,21 +2,24 @@ namespace GitVersion.Extensions;
 
 public static class ReadEmbeddedResourceExtensions
 {
-    public static string ReadAsStringFromEmbeddedResource<T>(this string resourceName)
-        => ReadAsStringFromEmbeddedResource(resourceName, typeof(T).Assembly);
-
-    public static string ReadAsStringFromEmbeddedResource(this string resourceName, Assembly assembly)
+    extension(string resourceName)
     {
-        using var stream = resourceName.ReadFromEmbeddedResource(assembly);
-        using var streamReader = new StreamReader(stream);
-        return streamReader.ReadToEnd();
-    }
+        public string ReadAsStringFromEmbeddedResource<T>()
+            => ReadAsStringFromEmbeddedResource(resourceName, typeof(T).Assembly);
 
-    private static Stream ReadFromEmbeddedResource(this string resourceName, Assembly assembly)
-    {
-        assembly.NotNull();
+        public string ReadAsStringFromEmbeddedResource(Assembly assembly)
+        {
+            using var stream = resourceName.ReadFromEmbeddedResource(assembly);
+            using var streamReader = new StreamReader(stream);
+            return streamReader.ReadToEnd();
+        }
+
+        private Stream ReadFromEmbeddedResource(Assembly assembly)
+        {
+            assembly.NotNull();
 
-        return assembly.GetManifestResourceStream(resourceName)
-            ?? throw new InvalidOperationException($"Could not find embedded resource {resourceName}");
+            return assembly.GetManifestResourceStream(resourceName)
+                   ?? throw new InvalidOperationException($"Could not find embedded resource {resourceName}");
+        }
     }
 }
diff --git a/src/GitVersion.Core/Configuration/ReferenceNameExtensions.cs b/src/GitVersion.Core/Extensions/ReferenceNameExtensions.cs
similarity index 100%
rename from src/GitVersion.Core/Configuration/ReferenceNameExtensions.cs
rename to src/GitVersion.Core/Extensions/ReferenceNameExtensions.cs
diff --git a/src/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs b/src/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs
index 153bf20e53..cc8ec37cda 100644
--- a/src/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs
+++ b/src/GitVersion.Core/Extensions/ServiceCollectionExtensions.cs
@@ -4,12 +4,18 @@ namespace GitVersion.Extensions;
 
 public static class ServiceCollectionExtensions
 {
-    public static IServiceCollection AddModule(this IServiceCollection serviceCollection, IGitVersionModule gitVersionModule)
+    extension(IServiceCollection serviceCollection)
     {
-        gitVersionModule.RegisterTypes(serviceCollection);
-        return serviceCollection;
+        public IServiceCollection AddModule(IGitVersionModule gitVersionModule)
+        {
+            gitVersionModule.RegisterTypes(serviceCollection);
+            return serviceCollection;
+        }
     }
 
-    public static TService GetServiceForType<TService, TType>(this IServiceProvider serviceProvider) =>
-        serviceProvider.GetServices<TService>().Single(t => t?.GetType() == typeof(TType));
+    extension(IServiceProvider serviceProvider)
+    {
+        public TService GetServiceForType<TService, TType>() =>
+            serviceProvider.GetServices<TService>().Single(t => t?.GetType() == typeof(TType));
+    }
 }
diff --git a/src/GitVersion.Core/Extensions/VersionFieldExtensions.cs b/src/GitVersion.Core/Extensions/VersionFieldExtensions.cs
index 2f00e143b7..21840e5629 100644
--- a/src/GitVersion.Core/Extensions/VersionFieldExtensions.cs
+++ b/src/GitVersion.Core/Extensions/VersionFieldExtensions.cs
@@ -2,13 +2,16 @@ namespace GitVersion.Extensions;
 
 internal static class VersionFieldExtensions
 {
-    public static VersionField Consolidate(this VersionField source, VersionField? item, params VersionField?[] items)
+    extension(VersionField source)
     {
-        var result = source;
-        foreach (var increment in new[] { item }.Concat(items))
+        public VersionField Consolidate(VersionField? item, params VersionField?[] items)
         {
-            if (result < increment) result = increment.Value;
+            var result = source;
+            foreach (var increment in new[] { item }.Concat(items))
+            {
+                if (result < increment) result = increment.Value;
+            }
+            return result;
         }
-        return result;
     }
 }
diff --git a/src/GitVersion.Core/Formatting/StringFormatWithExtension.cs b/src/GitVersion.Core/Formatting/StringFormatWithExtension.cs
index 0f061c4f0b..a055b7b53b 100644
--- a/src/GitVersion.Core/Formatting/StringFormatWithExtension.cs
+++ b/src/GitVersion.Core/Formatting/StringFormatWithExtension.cs
@@ -12,45 +12,50 @@ internal static class StringFormatWithExtension
     private static readonly IMemberResolver MemberResolver = new MemberResolver();
 
     /// <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"/>.
+    /// Provides extension methods for formatting strings using a source object and environment context.
     /// </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)
+    extension(string template)
     {
-        ArgumentNullException.ThrowIfNull(template);
-        ArgumentNullException.ThrowIfNull(source);
-
-        var result = new StringBuilder();
-        var lastIndex = 0;
-
-        foreach (var match in RegexPatterns.Common.ExpandTokensRegex().Matches(template).Cast<Match>())
+        /// <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="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 string FormatWith<T>(T? source, IEnvironment environment)
         {
-            var replacement = EvaluateMatch(match, source, environment);
-            result.Append(template, lastIndex, match.Index - lastIndex);
-            result.Append(replacement);
-            lastIndex = match.Index + match.Length;
+            ArgumentNullException.ThrowIfNull(template);
+            ArgumentNullException.ThrowIfNull(source);
+
+            var result = new StringBuilder();
+            var lastIndex = 0;
+
+            foreach (var match in RegexPatterns.Common.ExpandTokensRegex().Matches(template).Cast<Match>())
+            {
+                var replacement = EvaluateMatch(match, source, environment);
+                result.Append(template, lastIndex, match.Index - lastIndex);
+                result.Append(replacement);
+                lastIndex = match.Index + match.Length;
+            }
+
+            result.Append(template, lastIndex, template.Length - lastIndex);
+            return result.ToString();
         }
-
-        result.Append(template, lastIndex, template.Length - lastIndex);
-        return result.ToString();
     }
 
     private static string EvaluateMatch<T>(Match match, T source, IEnvironment environment)
diff --git a/src/GitVersion.Core/Git/CommitExtensions.cs b/src/GitVersion.Core/Git/CommitExtensions.cs
deleted file mode 100644
index 9b8971ac54..0000000000
--- a/src/GitVersion.Core/Git/CommitExtensions.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using GitVersion.Extensions;
-
-namespace GitVersion.Git;
-
-public static class CommitExtensions
-{
-    public static bool IsMergeCommit(this ICommit source) => source.NotNull().Parents.Count >= 2;
-}
diff --git a/src/GitVersion.Core/Git/ICommit.cs b/src/GitVersion.Core/Git/ICommit.cs
index 7c6900c1bb..490ad702ad 100644
--- a/src/GitVersion.Core/Git/ICommit.cs
+++ b/src/GitVersion.Core/Git/ICommit.cs
@@ -12,5 +12,7 @@ public interface ICommit : IEquatable<ICommit?>, IComparable<ICommit>
 
     string Message { get; }
 
+    bool IsMergeCommit { get; }
+
     IReadOnlyList<string> DiffPaths { get; }
 }
diff --git a/src/GitVersion.Core/Logging/Abstractions/ILog.cs b/src/GitVersion.Core/Logging/Abstractions/ILog.cs
index 0277f8e333..e152c489cb 100644
--- a/src/GitVersion.Core/Logging/Abstractions/ILog.cs
+++ b/src/GitVersion.Core/Logging/Abstractions/ILog.cs
@@ -3,7 +3,7 @@ namespace GitVersion.Logging;
 public interface ILog
 {
     Verbosity Verbosity { get; set; }
-    void Write(Verbosity verbosity, LogLevel level, string format, params object[] args);
+    void Write(Verbosity verbosity, LogLevel level, string format, params object?[] args);
     IDisposable IndentLog(string operationDescription);
     void AddLogAppender(ILogAppender logAppender);
     void Separator();
diff --git a/src/GitVersion.Core/Logging/Log.cs b/src/GitVersion.Core/Logging/Log.cs
index 23459c4b1c..05de5b44c9 100644
--- a/src/GitVersion.Core/Logging/Log.cs
+++ b/src/GitVersion.Core/Logging/Log.cs
@@ -17,7 +17,7 @@ public Log() : this([])
 
     public Verbosity Verbosity { get; set; } = Verbosity.Normal;
 
-    public void Write(Verbosity verbosity, LogLevel level, string format, params object[] args)
+    public void Write(Verbosity verbosity, LogLevel level, string format, params object?[] args)
     {
         if (verbosity > Verbosity)
         {
diff --git a/src/GitVersion.Core/Logging/LogExtensions.cs b/src/GitVersion.Core/Logging/LogExtensions.cs
index 4781502246..6db7a9cd77 100644
--- a/src/GitVersion.Core/Logging/LogExtensions.cs
+++ b/src/GitVersion.Core/Logging/LogExtensions.cs
@@ -4,106 +4,86 @@ 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);
-
-    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, LogAction logAction) => log.Write(LogLevel.Debug, logAction);
-
-    public static void Debug(this ILog log, Verbosity verbosity, LogAction logAction) => log.Write(verbosity, LogLevel.Debug, logAction);
-
-    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, Verbosity verbosity, string format, params object[] args) => log.Write(verbosity, 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, LogAction logAction) => log.Write(verbosity, LogLevel.Warn, logAction);
-
-    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, Verbosity verbosity, string format, params object[] args) => log.Write(verbosity, 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, LogAction logAction) => log.Write(verbosity, LogLevel.Info, logAction);
-
-    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, Verbosity verbosity, string format, params object[] args) => log.Write(verbosity, 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, LogAction logAction) => log.Write(verbosity, LogLevel.Verbose, logAction);
-
-    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, Verbosity verbosity, string format, params object[] args) => log.Write(verbosity, 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, LogAction logAction) => log.Write(verbosity, LogLevel.Error, logAction);
-
-    private static void Write(this ILog log, LogLevel level, string format, params object[] args)
+    extension(ILog log)
     {
-        var verbosity = GetVerbosityForLevel(level);
-        if (verbosity > log.Verbosity)
+        public void Debug(string format, params object?[] args) => log.Write(LogLevel.Debug, format, args);
+        public void Debug(Verbosity verbosity, string format, params object?[] args) => log.Write(verbosity, LogLevel.Debug, format, args);
+        public void Debug(LogAction logAction) => log.Write(LogLevel.Debug, logAction);
+        public void Debug(Verbosity verbosity, LogAction logAction) => log.Write(verbosity, LogLevel.Debug, logAction);
+        public void Warning(string format, params object?[] args) => log.Write(LogLevel.Warn, format, args);
+        public void Warning(Verbosity verbosity, string format, params object?[] args) => log.Write(verbosity, LogLevel.Warn, format, args);
+        public void Warning(LogAction logAction) => log.Write(LogLevel.Warn, logAction);
+        public void Warning(Verbosity verbosity, LogAction logAction) => log.Write(verbosity, LogLevel.Warn, logAction);
+        public void Info(string format, params object?[] args) => log.Write(LogLevel.Info, format, args);
+        public void Info(Verbosity verbosity, string format, params object?[] args) => log.Write(verbosity, LogLevel.Info, format, args);
+        public void Info(LogAction logAction) => log.Write(LogLevel.Info, logAction);
+        public void Info(Verbosity verbosity, LogAction logAction) => log.Write(verbosity, LogLevel.Info, logAction);
+        public void Verbose(string format, params object?[] args) => log.Write(LogLevel.Verbose, format, args);
+        public void Verbose(Verbosity verbosity, string format, params object?[] args) => log.Write(verbosity, LogLevel.Verbose, format, args);
+        public void Verbose(LogAction logAction) => log.Write(LogLevel.Verbose, logAction);
+        public void Verbose(Verbosity verbosity, LogAction logAction) => log.Write(verbosity, LogLevel.Verbose, logAction);
+        public void Error(string format, params object?[] args) => log.Write(LogLevel.Error, format, args);
+        public void Error(Verbosity verbosity, string format, params object?[] args) => log.Write(verbosity, LogLevel.Error, format, args);
+        public void Error(LogAction logAction) => log.Write(LogLevel.Error, logAction);
+        public void Error(Verbosity verbosity, LogAction logAction) => log.Write(verbosity, LogLevel.Error, logAction);
+
+        private void Write(LogLevel level, string format, params object?[] args)
         {
-            return;
-        }
+            var verbosity = GetVerbosityForLevel(level);
+            if (verbosity > log.Verbosity)
+            {
+                return;
+            }
 
-        log.Write(verbosity, level, format, args);
-    }
-
-    private static void Write(this ILog log, Verbosity verbosity, LogLevel level, LogAction? logAction)
-    {
-        if (logAction == null)
-            return;
-
-        if (verbosity > log.Verbosity)
-        {
-            return;
+            log.Write(verbosity, level, format, args);
         }
 
-        logAction(ActionEntry);
-        return;
+        private void Write(Verbosity verbosity, LogLevel level, LogAction? logAction)
+        {
+            if (logAction == null)
+                return;
 
-        void ActionEntry(string format, object[] args) => log.Write(verbosity, level, format, args);
-    }
+            if (verbosity > log.Verbosity)
+            {
+                return;
+            }
 
-    private static void Write(this ILog log, LogLevel level, LogAction? logAction)
-    {
-        if (logAction == null)
+            logAction(ActionEntry);
             return;
 
-        var verbosity = GetVerbosityForLevel(level);
-        if (verbosity > log.Verbosity)
-        {
-            return;
+            void ActionEntry(string format, object[] args) => log.Write(verbosity, level, format, args);
         }
 
-        logAction(ActionEntry);
-        return;
-
-        void ActionEntry(string format, object[] args) => log.Write(verbosity, level, format, args);
-    }
-
-    public static IDisposable QuietVerbosity(this ILog log) => log.WithVerbosity(Verbosity.Quiet);
+        private void Write(LogLevel level, LogAction? logAction)
+        {
+            if (logAction == null)
+                return;
 
-    public static IDisposable MinimalVerbosity(this ILog log) => log.WithVerbosity(Verbosity.Minimal);
+            var verbosity = GetVerbosityForLevel(level);
+            if (verbosity > log.Verbosity)
+            {
+                return;
+            }
 
-    public static IDisposable NormalVerbosity(this ILog log) => log.WithVerbosity(Verbosity.Normal);
+            logAction(ActionEntry);
+            return;
 
-    public static IDisposable VerboseVerbosity(this ILog log) => log.WithVerbosity(Verbosity.Verbose);
+            void ActionEntry(string format, object[] args) => log.Write(verbosity, level, format, args);
+        }
 
-    public static IDisposable DiagnosticVerbosity(this ILog log) => log.WithVerbosity(Verbosity.Diagnostic);
+        public IDisposable QuietVerbosity() => log.WithVerbosity(Verbosity.Quiet);
+        public IDisposable MinimalVerbosity() => log.WithVerbosity(Verbosity.Minimal);
+        public IDisposable NormalVerbosity() => log.WithVerbosity(Verbosity.Normal);
+        public IDisposable VerboseVerbosity() => log.WithVerbosity(Verbosity.Verbose);
+        public IDisposable DiagnosticVerbosity() => log.WithVerbosity(Verbosity.Diagnostic);
 
-    private static IDisposable WithVerbosity(this ILog log, Verbosity verbosity)
-    {
-        ArgumentNullException.ThrowIfNull(log);
-        var lastVerbosity = log.Verbosity;
-        log.Verbosity = verbosity;
-        return Disposable.Create(() => log.Verbosity = lastVerbosity);
+        private IDisposable WithVerbosity(Verbosity verbosity)
+        {
+            ArgumentNullException.ThrowIfNull(log);
+            var lastVerbosity = log.Verbosity;
+            log.Verbosity = verbosity;
+            return Disposable.Create(() => log.Verbosity = lastVerbosity);
+        }
     }
 
     private static Verbosity GetVerbosityForLevel(LogLevel level) => VerbosityMaps[level];
diff --git a/src/GitVersion.Core/Logging/NullLog.cs b/src/GitVersion.Core/Logging/NullLog.cs
index 8a311f8cc2..6fe6ceb0d3 100644
--- a/src/GitVersion.Core/Logging/NullLog.cs
+++ b/src/GitVersion.Core/Logging/NullLog.cs
@@ -6,7 +6,7 @@ internal sealed class NullLog : ILog
 {
     public Verbosity Verbosity { get; set; }
 
-    public void Write(Verbosity verbosity, LogLevel level, string format, params object[] args)
+    public void Write(Verbosity verbosity, LogLevel level, string format, params object?[] args)
     {
     }
 
diff --git a/src/GitVersion.Core/MergeMessage.cs b/src/GitVersion.Core/MergeMessage.cs
index 345a9b1c8b..d5f01dca1b 100644
--- a/src/GitVersion.Core/MergeMessage.cs
+++ b/src/GitVersion.Core/MergeMessage.cs
@@ -86,7 +86,7 @@ public static bool TryParse(
 
         var mergedBranch = new MergeMessage(mergeCommit.Message, configuration).MergedBranch;
         var isReleaseBranch = mergedBranch is not null && configuration.IsReleaseBranch(mergedBranch);
-        var isValidMergeCommit = mergeCommit.IsMergeCommit() || isReleaseBranch;
+        var isValidMergeCommit = mergeCommit.IsMergeCommit || isReleaseBranch;
 
         if (isValidMergeCommit)
         {
diff --git a/src/GitVersion.Core/PublicAPI.Shipped.txt b/src/GitVersion.Core/PublicAPI.Shipped.txt
index 9295c20fc0..75b8b1efde 100644
--- a/src/GitVersion.Core/PublicAPI.Shipped.txt
+++ b/src/GitVersion.Core/PublicAPI.Shipped.txt
@@ -192,7 +192,6 @@ GitVersion.Git.BranchCommit.BranchCommit() -> void
 GitVersion.Git.BranchCommit.BranchCommit(GitVersion.Git.ICommit! commit, GitVersion.Git.IBranch! branch) -> void
 GitVersion.Git.BranchCommit.Commit.get -> GitVersion.Git.ICommit!
 GitVersion.Git.BranchCommit.Equals(GitVersion.Git.BranchCommit? other) -> bool
-GitVersion.Git.CommitExtensions
 GitVersion.Git.CommitFilter
 GitVersion.Git.CommitFilter.CommitFilter() -> void
 GitVersion.Git.CommitFilter.CommitFilter(GitVersion.Git.CommitFilter! original) -> void
@@ -396,7 +395,6 @@ GitVersion.Logging.ILog.IndentLog(string! operationDescription) -> System.IDispo
 GitVersion.Logging.ILog.Separator() -> void
 GitVersion.Logging.ILog.Verbosity.get -> GitVersion.Logging.Verbosity
 GitVersion.Logging.ILog.Verbosity.set -> void
-GitVersion.Logging.ILog.Write(GitVersion.Logging.Verbosity verbosity, GitVersion.Logging.LogLevel level, string! format, params object![]! args) -> void
 GitVersion.Logging.ILogAppender
 GitVersion.Logging.ILogAppender.WriteTo(GitVersion.Logging.LogLevel level, string! message) -> void
 GitVersion.Logging.LogAction
@@ -837,7 +835,6 @@ static GitVersion.Git.AuthenticationInfo.operator !=(GitVersion.Git.Authenticati
 static GitVersion.Git.AuthenticationInfo.operator ==(GitVersion.Git.AuthenticationInfo? left, GitVersion.Git.AuthenticationInfo? right) -> bool
 static GitVersion.Git.BranchCommit.operator !=(GitVersion.Git.BranchCommit left, GitVersion.Git.BranchCommit right) -> bool
 static GitVersion.Git.BranchCommit.operator ==(GitVersion.Git.BranchCommit left, GitVersion.Git.BranchCommit right) -> bool
-static GitVersion.Git.CommitExtensions.IsMergeCommit(this GitVersion.Git.ICommit! source) -> bool
 static GitVersion.Git.CommitFilter.operator !=(GitVersion.Git.CommitFilter? left, GitVersion.Git.CommitFilter? right) -> bool
 static GitVersion.Git.CommitFilter.operator ==(GitVersion.Git.CommitFilter? left, GitVersion.Git.CommitFilter? right) -> bool
 static GitVersion.Git.ReferenceName.FromBranchName(string! branchName) -> GitVersion.Git.ReferenceName!
@@ -849,29 +846,19 @@ static GitVersion.Helpers.Disposable.Create<T>(T value, System.Action! disposer)
 static GitVersion.Helpers.ServiceMessageEscapeHelper.EscapeValue(string? value) -> string?
 static GitVersion.Logging.LogExtensions.Debug(this GitVersion.Logging.ILog! log, GitVersion.Logging.LogAction! logAction) -> void
 static GitVersion.Logging.LogExtensions.Debug(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, GitVersion.Logging.LogAction! logAction) -> void
-static GitVersion.Logging.LogExtensions.Debug(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, string! format, params object![]! args) -> void
-static GitVersion.Logging.LogExtensions.Debug(this GitVersion.Logging.ILog! log, string! format, params object![]! args) -> void
 static GitVersion.Logging.LogExtensions.DiagnosticVerbosity(this GitVersion.Logging.ILog! log) -> System.IDisposable!
 static GitVersion.Logging.LogExtensions.Error(this GitVersion.Logging.ILog! log, GitVersion.Logging.LogAction! logAction) -> void
 static GitVersion.Logging.LogExtensions.Error(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, GitVersion.Logging.LogAction! logAction) -> void
-static GitVersion.Logging.LogExtensions.Error(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, string! format, params object![]! args) -> void
-static GitVersion.Logging.LogExtensions.Error(this GitVersion.Logging.ILog! log, string! format, params object![]! args) -> void
 static GitVersion.Logging.LogExtensions.Info(this GitVersion.Logging.ILog! log, GitVersion.Logging.LogAction! logAction) -> void
 static GitVersion.Logging.LogExtensions.Info(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, GitVersion.Logging.LogAction! logAction) -> void
-static GitVersion.Logging.LogExtensions.Info(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, string! format, params object![]! args) -> void
-static GitVersion.Logging.LogExtensions.Info(this GitVersion.Logging.ILog! log, string! format, params object![]! args) -> void
 static GitVersion.Logging.LogExtensions.MinimalVerbosity(this GitVersion.Logging.ILog! log) -> System.IDisposable!
 static GitVersion.Logging.LogExtensions.NormalVerbosity(this GitVersion.Logging.ILog! log) -> System.IDisposable!
 static GitVersion.Logging.LogExtensions.QuietVerbosity(this GitVersion.Logging.ILog! log) -> System.IDisposable!
 static GitVersion.Logging.LogExtensions.Verbose(this GitVersion.Logging.ILog! log, GitVersion.Logging.LogAction! logAction) -> void
 static GitVersion.Logging.LogExtensions.Verbose(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, GitVersion.Logging.LogAction! logAction) -> void
-static GitVersion.Logging.LogExtensions.Verbose(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, string! format, params object![]! args) -> void
-static GitVersion.Logging.LogExtensions.Verbose(this GitVersion.Logging.ILog! log, string! format, params object![]! args) -> void
 static GitVersion.Logging.LogExtensions.VerboseVerbosity(this GitVersion.Logging.ILog! log) -> System.IDisposable!
 static GitVersion.Logging.LogExtensions.Warning(this GitVersion.Logging.ILog! log, GitVersion.Logging.LogAction! logAction) -> void
 static GitVersion.Logging.LogExtensions.Warning(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, GitVersion.Logging.LogAction! logAction) -> void
-static GitVersion.Logging.LogExtensions.Warning(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, string! format, params object![]! args) -> void
-static GitVersion.Logging.LogExtensions.Warning(this GitVersion.Logging.ILog! log, string! format, params object![]! args) -> void
 static GitVersion.MergeMessage.TryParse(GitVersion.Git.ICommit! mergeCommit, GitVersion.Configuration.IGitVersionConfiguration! configuration, out GitVersion.MergeMessage? mergeMessage) -> bool
 static GitVersion.OutputVariables.GitVersionVariables.operator !=(GitVersion.OutputVariables.GitVersionVariables? left, GitVersion.OutputVariables.GitVersionVariables? right) -> bool
 static GitVersion.OutputVariables.GitVersionVariables.operator ==(GitVersion.OutputVariables.GitVersionVariables? left, GitVersion.OutputVariables.GitVersionVariables? right) -> bool
diff --git a/src/GitVersion.Core/PublicAPI.Unshipped.txt b/src/GitVersion.Core/PublicAPI.Unshipped.txt
index 7dc5c58110..9d9cee3bbd 100644
--- a/src/GitVersion.Core/PublicAPI.Unshipped.txt
+++ b/src/GitVersion.Core/PublicAPI.Unshipped.txt
@@ -1 +1,55 @@
 #nullable enable
+GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.extension(GitVersion.SemanticVersion!)
+GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.extension(GitVersion.SemanticVersion!).GetAssemblyFileVersion(GitVersion.Configuration.AssemblyFileVersioningScheme scheme) -> string?
+GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.extension(GitVersion.SemanticVersion!).GetAssemblyVersion(GitVersion.Configuration.AssemblyVersioningScheme scheme) -> string?
+GitVersion.Extensions.FileSystemExtensions.extension(System.IO.Abstractions.IFileSystem!)
+GitVersion.Extensions.FileSystemExtensions.extension(System.IO.Abstractions.IFileSystem!).FindGitDir(string? path) -> (string! GitDirectory, string! WorkingTreeDirectory)?
+GitVersion.Extensions.FileSystemExtensions.extension(System.IO.Abstractions.IFileSystem!).GetLastDirectoryWrite(string! path) -> long
+GitVersion.Extensions.IncrementStrategyExtensions.extension(GitVersion.IncrementStrategy)
+GitVersion.Extensions.IncrementStrategyExtensions.extension(GitVersion.IncrementStrategy).ToVersionField() -> GitVersion.VersionField
+GitVersion.Extensions.ReadEmbeddedResourceExtensions.extension(string!)
+GitVersion.Extensions.ReadEmbeddedResourceExtensions.extension(string!).ReadAsStringFromEmbeddedResource(System.Reflection.Assembly! assembly) -> string!
+GitVersion.Extensions.ReadEmbeddedResourceExtensions.extension(string!).ReadAsStringFromEmbeddedResource<T>() -> string!
+GitVersion.Extensions.ServiceCollectionExtensions.extension(Microsoft.Extensions.DependencyInjection.IServiceCollection!)
+GitVersion.Extensions.ServiceCollectionExtensions.extension(Microsoft.Extensions.DependencyInjection.IServiceCollection!).AddModule(GitVersion.IGitVersionModule! gitVersionModule) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+GitVersion.Extensions.ServiceCollectionExtensions.extension(System.IServiceProvider!)
+GitVersion.Extensions.ServiceCollectionExtensions.extension(System.IServiceProvider!).GetServiceForType<TService, TType>() -> TService
+GitVersion.Git.ICommit.IsMergeCommit.get -> bool
+GitVersion.Logging.ILog.Write(GitVersion.Logging.Verbosity verbosity, GitVersion.Logging.LogLevel level, string! format, params object?[]! args) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!)
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Debug(GitVersion.Logging.LogAction! logAction) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Debug(GitVersion.Logging.Verbosity verbosity, GitVersion.Logging.LogAction! logAction) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Debug(GitVersion.Logging.Verbosity verbosity, string! format, params object?[]! args) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Debug(string! format, params object?[]! args) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).DiagnosticVerbosity() -> System.IDisposable!
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Error(GitVersion.Logging.LogAction! logAction) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Error(GitVersion.Logging.Verbosity verbosity, GitVersion.Logging.LogAction! logAction) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Error(GitVersion.Logging.Verbosity verbosity, string! format, params object?[]! args) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Error(string! format, params object?[]! args) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Info(GitVersion.Logging.LogAction! logAction) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Info(GitVersion.Logging.Verbosity verbosity, GitVersion.Logging.LogAction! logAction) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Info(GitVersion.Logging.Verbosity verbosity, string! format, params object?[]! args) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Info(string! format, params object?[]! args) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).MinimalVerbosity() -> System.IDisposable!
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).NormalVerbosity() -> System.IDisposable!
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).QuietVerbosity() -> System.IDisposable!
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Verbose(GitVersion.Logging.LogAction! logAction) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Verbose(GitVersion.Logging.Verbosity verbosity, GitVersion.Logging.LogAction! logAction) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Verbose(GitVersion.Logging.Verbosity verbosity, string! format, params object?[]! args) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Verbose(string! format, params object?[]! args) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).VerboseVerbosity() -> System.IDisposable!
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(GitVersion.Logging.LogAction! logAction) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(GitVersion.Logging.Verbosity verbosity, GitVersion.Logging.LogAction! logAction) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(GitVersion.Logging.Verbosity verbosity, string! format, params object?[]! args) -> void
+GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(string! format, params object?[]! args) -> void
+static GitVersion.Extensions.FileSystemExtensions.FindGitDir(this System.IO.Abstractions.IFileSystem! fileSystem, string? path) -> (string! GitDirectory, string! WorkingTreeDirectory)?
+static GitVersion.Logging.LogExtensions.Debug(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, string! format, params object?[]! args) -> void
+static GitVersion.Logging.LogExtensions.Debug(this GitVersion.Logging.ILog! log, string! format, params object?[]! args) -> void
+static GitVersion.Logging.LogExtensions.Error(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, string! format, params object?[]! args) -> void
+static GitVersion.Logging.LogExtensions.Error(this GitVersion.Logging.ILog! log, string! format, params object?[]! args) -> void
+static GitVersion.Logging.LogExtensions.Info(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, string! format, params object?[]! args) -> void
+static GitVersion.Logging.LogExtensions.Info(this GitVersion.Logging.ILog! log, string! format, params object?[]! args) -> void
+static GitVersion.Logging.LogExtensions.Verbose(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, string! format, params object?[]! args) -> void
+static GitVersion.Logging.LogExtensions.Verbose(this GitVersion.Logging.ILog! log, string! format, params object?[]! args) -> void
+static GitVersion.Logging.LogExtensions.Warning(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, string! format, params object?[]! args) -> void
+static GitVersion.Logging.LogExtensions.Warning(this GitVersion.Logging.ILog! log, string! format, params object?[]! args) -> void
diff --git a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
index 7a941b13d6..84d8e45556 100644
--- a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
+++ b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
@@ -182,7 +182,7 @@ public IEnumerable<ICommit> GetMergedCommits(ICommit mergeCommit, int index, IIg
     {
         mergeCommit.NotNull();
 
-        if (!mergeCommit.IsMergeCommit())
+        if (!mergeCommit.IsMergeCommit)
         {
             throw new ArgumentException("The parameter is not a merge commit.", nameof(mergeCommit));
         }
diff --git a/src/GitVersion.Core/VersionCalculation/Mainline/EnrichIncrement.cs b/src/GitVersion.Core/VersionCalculation/Mainline/EnrichIncrement.cs
index 91ad98cdd9..22d09d92ee 100644
--- a/src/GitVersion.Core/VersionCalculation/Mainline/EnrichIncrement.cs
+++ b/src/GitVersion.Core/VersionCalculation/Mainline/EnrichIncrement.cs
@@ -38,7 +38,7 @@ private static VersionField GetIncrementForcedByCommit(
             CommitMessageIncrementMode.Enabled
                 => context.IncrementStrategyFinder.GetIncrementForcedByCommit(commit, context.Configuration),
             CommitMessageIncrementMode.Disabled => VersionField.None,
-            CommitMessageIncrementMode.MergeMessageOnly => commit.IsMergeCommit()
+            CommitMessageIncrementMode.MergeMessageOnly => commit.IsMergeCommit
                 ? context.IncrementStrategyFinder.GetIncrementForcedByCommit(commit, context.Configuration) : VersionField.None,
             _ => throw new InvalidEnumArgumentException(
                 nameof(configuration.CommitMessageIncrementing), (int)configuration.CommitMessageIncrementing, typeof(CommitMessageIncrementMode)
diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs
index a1909b8362..7365ec1a7b 100644
--- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs
@@ -221,7 +221,7 @@ private bool IterateOverCommitsRecursive(
                 return true;
             }
 
-            if (!item.IsMergeCommit()) continue;
+            if (!item.IsMergeCommit) continue;
             Lazy<IReadOnlyCollection<ICommit>> mergedCommitsInReverseOrderLazy = new(
                 () => [.. this.incrementStrategyFinder.GetMergedCommits(item, 1, Context.Configuration.Ignore).Reverse()]
             );
diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MergeMessageVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MergeMessageVersionStrategy.cs
index 8731031a8d..d8490a734b 100644
--- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MergeMessageVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MergeMessageVersionStrategy.cs
@@ -1,7 +1,6 @@
 using GitVersion.Common;
 using GitVersion.Configuration;
 using GitVersion.Extensions;
-using GitVersion.Git;
 using GitVersion.Logging;
 
 namespace GitVersion.VersionCalculation;
@@ -47,7 +46,7 @@ private IEnumerable<BaseVersion> GetBaseVersionsInternal(EffectiveBranchConfigur
             this.log.Info($"Found commit [{commit}] matching merge message format: {mergeMessage.FormatName}");
 
             var baseVersionSource = commit;
-            if (commit.IsMergeCommit())
+            if (commit.IsMergeCommit)
             {
                 baseVersionSource = this.repositoryStore.FindMergeBase(commit.Parents[0], commit.Parents[1]);
             }
diff --git a/src/GitVersion.LibGit2Sharp/Git/Commit.cs b/src/GitVersion.LibGit2Sharp/Git/Commit.cs
index f7c59ed5eb..950fbf5a2a 100644
--- a/src/GitVersion.LibGit2Sharp/Git/Commit.cs
+++ b/src/GitVersion.LibGit2Sharp/Git/Commit.cs
@@ -33,6 +33,8 @@ internal Commit(LibGit2Sharp.Commit innerCommit, LibGit2Sharp.Diff repoDiff, Git
     public string Sha { get; }
     public DateTimeOffset When { get; }
     public string Message => this.innerCommit.Message;
+    public bool IsMergeCommit => Parents.Count >= 2;
+
     public IReadOnlyList<string> DiffPaths
     {
         get
diff --git a/src/GitVersion.LibGit2Sharp/LibGit2SharpExtensions.cs b/src/GitVersion.LibGit2Sharp/LibGit2SharpExtensions.cs
index 727e2c1fca..c2469a1eee 100644
--- a/src/GitVersion.LibGit2Sharp/LibGit2SharpExtensions.cs
+++ b/src/GitVersion.LibGit2Sharp/LibGit2SharpExtensions.cs
@@ -6,10 +6,13 @@ namespace GitVersion;
 
 public static class LibGit2SharpExtensions
 {
-    public static IGitRepository ToGitRepository(this IRepository repository)
+    extension(IRepository repository)
     {
-        var gitRepository = new GitRepository(new NullLog());
-        gitRepository.DiscoverRepository(repository.Info.Path);
-        return gitRepository;
+        public IGitRepository ToGitRepository()
+        {
+            var gitRepository = new GitRepository(new NullLog());
+            gitRepository.DiscoverRepository(repository.Info.Path);
+            return gitRepository;
+        }
     }
 }
diff --git a/src/GitVersion.LibGit2Sharp/PublicAPI.Unshipped.txt b/src/GitVersion.LibGit2Sharp/PublicAPI.Unshipped.txt
index 7dc5c58110..35ac90728d 100644
--- a/src/GitVersion.LibGit2Sharp/PublicAPI.Unshipped.txt
+++ b/src/GitVersion.LibGit2Sharp/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+GitVersion.LibGit2SharpExtensions.extension(LibGit2Sharp.IRepository!)
+GitVersion.LibGit2SharpExtensions.extension(LibGit2Sharp.IRepository!).ToGitRepository() -> GitVersion.Git.IGitRepository!
diff --git a/src/GitVersion.MsBuild.Tests/Helpers/GitRepositoryTestingExtensions.cs b/src/GitVersion.MsBuild.Tests/Helpers/GitRepositoryTestingExtensions.cs
deleted file mode 100644
index 068d0b0810..0000000000
--- a/src/GitVersion.MsBuild.Tests/Helpers/GitRepositoryTestingExtensions.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using GitVersion.Agents;
-using GitVersion.Core.Tests.Helpers;
-using GitVersion.Extensions;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-
-namespace GitVersion.MsBuild.Tests.Helpers;
-
-public static class GitRepositoryTestingExtensions
-{
-    /// <summary>
-    /// Simulates running on build server
-    /// </summary>
-    public static void InitializeRepo(this RemoteRepositoryFixture fixture)
-    {
-        var gitVersionOptions = new GitVersionOptions
-        {
-            WorkingDirectory = fixture.LocalRepositoryFixture.RepositoryPath
-        };
-        var options = Options.Create(gitVersionOptions);
-
-        var environment = new TestEnvironment();
-        environment.SetEnvironmentVariable(AzurePipelines.EnvironmentVariableName, "true");
-
-        var serviceProvider = ConfigureServices(services =>
-        {
-            services.AddSingleton(options);
-            services.AddSingleton(environment);
-        });
-
-        var gitPreparer = serviceProvider.GetRequiredService<IGitPreparer>();
-        gitPreparer.Prepare();
-    }
-
-    private static ServiceProvider ConfigureServices(Action<IServiceCollection>? servicesOverrides = null)
-    {
-        var services = new ServiceCollection()
-            .AddModule(new GitVersionCoreTestModule());
-
-        servicesOverrides?.Invoke(services);
-        return services.BuildServiceProvider();
-    }
-}
diff --git a/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs b/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs
index 91246f139a..9281bd4ad2 100644
--- a/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs
+++ b/src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs
@@ -1,6 +1,7 @@
 using System.IO.Abstractions;
 using GitVersion.Agents;
 using GitVersion.Configuration;
+using GitVersion.Core.Tests;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Helpers;
 using GitVersion.MsBuild.Tests.Helpers;
@@ -120,7 +121,7 @@ private static RemoteRepositoryFixture CreateRemoteRepositoryFixture()
         Commands.Fetch(fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, [], new(), null);
         Commands.Checkout(fixture.LocalRepositoryFixture.Repository, fixture.Repository.Head.Tip);
         fixture.LocalRepositoryFixture.Repository.Branches.Remove(MainBranch);
-        fixture.InitializeRepo();
+        fixture.InitializeRepository();
         return fixture;
     }
 
diff --git a/src/GitVersion.MsBuild/Helpers/AssemblyInfoFileHelper.cs b/src/GitVersion.MsBuild/Helpers/AssemblyInfoFileHelper.cs
index 5f96caead6..d177c6fee0 100644
--- a/src/GitVersion.MsBuild/Helpers/AssemblyInfoFileHelper.cs
+++ b/src/GitVersion.MsBuild/Helpers/AssemblyInfoFileHelper.cs
@@ -68,22 +68,25 @@ private static IEnumerable<string> GetInvalidFiles(IFileSystem fileSystem, IEnum
             .Where(compileFile => compileFile.Contains("AssemblyInfo"))
             .Where(filePath => FileContainsVersionAttribute(fileSystem, filePath, projectFile));
 
-    public static FileWriteInfo GetFileWriteInfo(this string? intermediateOutputPath, string language, string projectFile, string outputFileName)
+    extension(string? intermediateOutputPath)
     {
-        var fileExtension = GetFileExtension(language);
-        string workingDirectory, fileName;
-
-        if (intermediateOutputPath == null)
-        {
-            fileName = $"{outputFileName}_{FileSystemHelper.Path.GetFileNameWithoutExtension(projectFile)}_{FileSystemHelper.Path.GetRandomFileName()}.g.{fileExtension}";
-            workingDirectory = TempPath;
-        }
-        else
+        public FileWriteInfo GetFileWriteInfo(string language, string projectFile, string outputFileName)
         {
-            fileName = $"{outputFileName}.g.{fileExtension}";
-            workingDirectory = intermediateOutputPath;
+            var fileExtension = GetFileExtension(language);
+            string workingDirectory, fileName;
+
+            if (intermediateOutputPath == null)
+            {
+                fileName = $"{outputFileName}_{FileSystemHelper.Path.GetFileNameWithoutExtension(projectFile)}_{FileSystemHelper.Path.GetRandomFileName()}.g.{fileExtension}";
+                workingDirectory = TempPath;
+            }
+            else
+            {
+                fileName = $"{outputFileName}.g.{fileExtension}";
+                workingDirectory = intermediateOutputPath;
+            }
+
+            return new FileWriteInfo(workingDirectory, fileName, fileExtension);
         }
-
-        return new FileWriteInfo(workingDirectory, fileName, fileExtension);
     }
 }
diff --git a/src/GitVersion.Schema/Extensions.cs b/src/GitVersion.Schema/Extensions.cs
index dac09a46c1..3768782454 100644
--- a/src/GitVersion.Schema/Extensions.cs
+++ b/src/GitVersion.Schema/Extensions.cs
@@ -6,14 +6,17 @@ namespace GitVersion.Schema;
 
 internal static class Extensions
 {
-    public static void WriteToFile(this JsonSchema jsonSchema, string outputFileName)
+    extension(JsonSchema jsonSchema)
     {
-        var jsonDocument = jsonSchema.ToJsonDocument();
+        public void WriteToFile(string outputFileName)
+        {
+            var jsonDocument = jsonSchema.ToJsonDocument();
 
-        using var fs = File.Create(outputFileName);
-        using var writer = new Utf8JsonWriter(fs, new() { Indented = true, Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping });
-        jsonDocument.WriteTo(writer);
-        writer.Flush();
-        fs.Flush();
+            using var fs = File.Create(outputFileName);
+            using var writer = new Utf8JsonWriter(fs, new() { Indented = true, Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping });
+            jsonDocument.WriteTo(writer);
+            writer.Flush();
+            fs.Flush();
+        }
     }
 }
diff --git a/src/GitVersion.Testing/Extensions/GitTestExtensions.cs b/src/GitVersion.Testing/Extensions/GitTestExtensions.cs
index 711d032fac..8a1c617627 100644
--- a/src/GitVersion.Testing/Extensions/GitTestExtensions.cs
+++ b/src/GitVersion.Testing/Extensions/GitTestExtensions.cs
@@ -8,64 +8,66 @@ public static class GitTestExtensions
 {
     private static int _pad = 1;
 
-    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, Signature sig) => repository.Merge(repository.Branches[branch], sig, new MergeOptions
+    extension(IRepository repository)
     {
-        FastForwardStrategy = FastForwardStrategy.NoFastForward
-    });
+        public Commit MakeACommit(string? commitMessage = null) => CreateFileAndCommit(repository, Guid.NewGuid().ToString(), commitMessage);
+        public void MergeNoFF(string branch) => MergeNoFF(repository, branch, Generate.SignatureNow());
 
-    public static Commit[] MakeCommits(this IRepository repository, int numCommitsToMake)
-        => [.. Enumerable.Range(1, numCommitsToMake).Select(_ => repository.MakeACommit())];
-
-    private static Commit CreateFileAndCommit(this IRepository repository, string relativeFileName, string? commitMessage = null)
-    {
-        var randomFile = FileSystemHelper.Path.Combine(repository.Info.WorkingDirectory, relativeFileName);
-        if (FileSystemHelper.File.Exists(randomFile))
+        public void MergeNoFF(string branch, Signature sig) => repository.Merge(repository.Branches[branch], sig, new MergeOptions
         {
-            FileSystemHelper.File.Delete(randomFile);
-        }
+            FastForwardStrategy = FastForwardStrategy.NoFastForward
+        });
 
-        var totalWidth = 36 + (_pad++ % 10);
-        var contents = Guid.NewGuid().ToString().PadRight(totalWidth, '.');
-        FileSystemHelper.File.WriteAllText(randomFile, contents);
+        public Commit[] MakeCommits(int numCommitsToMake)
+            => [.. Enumerable.Range(1, numCommitsToMake).Select(_ => repository.MakeACommit())];
 
-        Commands.Stage(repository, randomFile);
+        private Commit CreateFileAndCommit(string relativeFileName, string? commitMessage = null)
+        {
+            var randomFile = FileSystemHelper.Path.Combine(repository.Info.WorkingDirectory, relativeFileName);
+            if (FileSystemHelper.File.Exists(randomFile))
+            {
+                FileSystemHelper.File.Delete(randomFile);
+            }
 
-        return repository.Commit(commitMessage ?? $"Test Commit for file '{relativeFileName}'",
-            Generate.SignatureNow(), Generate.SignatureNow());
-    }
+            var totalWidth = 36 + (_pad++ % 10);
+            var contents = Guid.NewGuid().ToString().PadRight(totalWidth, '.');
+            FileSystemHelper.File.WriteAllText(randomFile, contents);
 
-    public static Tag MakeATaggedCommit(this IRepository repository, string tag)
-    {
-        var commit = repository.MakeACommit();
-        var existingTag = repository.Tags.SingleOrDefault(t => t.FriendlyName == tag);
-        return existingTag ?? repository.Tags.Add(tag, commit);
-    }
+            Commands.Stage(repository, randomFile);
 
-    public static Commit CreatePullRequestRef(this IRepository repository, string from, string to, int prNumber = 2, bool normalise = false, bool allowFastForwardMerge = false)
-    {
-        Commands.Checkout(repository, repository.Branches[to].Tip);
-        if (allowFastForwardMerge)
-        {
-            repository.Merge(repository.Branches[from], Generate.SignatureNow());
+            return repository.Commit(commitMessage ?? $"Test Commit for file '{relativeFileName}'",
+                Generate.SignatureNow(), Generate.SignatureNow());
         }
-        else
+
+        public Tag MakeATaggedCommit(string tag)
         {
-            repository.MergeNoFF(from);
+            var commit = repository.MakeACommit();
+            var existingTag = repository.Tags.SingleOrDefault(t => t.FriendlyName == tag);
+            return existingTag ?? repository.Tags.Add(tag, commit);
         }
-        var commit = repository.Head.Tip;
-        repository.Refs.Add("refs/pull/" + prNumber + "/merge", commit.Id);
-        Commands.Checkout(repository, to);
-        if (normalise)
+
+        public Commit CreatePullRequestRef(string from, string to, int prNumber = 2, bool normalise = false, bool allowFastForwardMerge = false)
         {
-            // Turn the ref into a real branch
-            Commands.Checkout(repository, repository.Branches.Add("pull/" + prNumber + "/merge", commit));
-        }
+            Commands.Checkout(repository, repository.Branches[to].Tip);
+            if (allowFastForwardMerge)
+            {
+                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;
+            return commit;
+        }
     }
 
     public static void ExecuteGitCmd(string gitCmd, string workingDirectory, Action<string>? writer = null)
diff --git a/src/GitVersion.Testing/Extensions/StringExtensions.cs b/src/GitVersion.Testing/Extensions/StringExtensions.cs
index 1f4c15fae7..ed9bee0345 100644
--- a/src/GitVersion.Testing/Extensions/StringExtensions.cs
+++ b/src/GitVersion.Testing/Extensions/StringExtensions.cs
@@ -2,15 +2,18 @@ namespace GitVersion.Testing.Extensions;
 
 public static class StringExtensions
 {
-    public static IEnumerable<string> SplitIntoLines(this string str, int maxLineLength)
+    extension(string str)
     {
-        if (string.IsNullOrEmpty(str)) yield break;
-
-        foreach (var line in SplitByNewlines(str))
+        public IEnumerable<string> SplitIntoLines(int maxLineLength)
         {
-            foreach (var wrapped in WrapWithWordBoundaries(line, maxLineLength))
+            if (string.IsNullOrEmpty(str)) yield break;
+
+            foreach (var line in SplitByNewlines(str))
             {
-                yield return wrapped;
+                foreach (var wrapped in WrapWithWordBoundaries(line, maxLineLength))
+                {
+                    yield return wrapped;
+                }
             }
         }
     }
@@ -30,7 +33,7 @@ private static IEnumerable<string> WrapWithWordBoundaries(string line, int maxLe
         while (index < line.Length)
         {
             var wrapAt = GetWrapIndex(line, index, maxLength);
-            yield return line.Substring(index, wrapAt - index).TrimEnd();
+            yield return line[index..wrapAt].TrimEnd();
             index = wrapAt;
         }
     }
diff --git a/src/GitVersion.Testing/Helpers/StringBuilderExtensions.cs b/src/GitVersion.Testing/Helpers/StringBuilderExtensions.cs
index 2893be4336..71dcec96e7 100644
--- a/src/GitVersion.Testing/Helpers/StringBuilderExtensions.cs
+++ b/src/GitVersion.Testing/Helpers/StringBuilderExtensions.cs
@@ -4,12 +4,14 @@ namespace GitVersion.Testing.Internal;
 
 internal static class StringBuilderExtensions
 {
-    public static void AppendLineFormat(this StringBuilder stringBuilder,
-                                        [StringSyntax(StringSyntaxAttribute.CompositeFormat)]
-                                        string format,
-                                        params object?[] args)
+    extension(StringBuilder stringBuilder)
     {
-        stringBuilder.AppendFormat(format, args);
-        stringBuilder.AppendLine();
+        public void AppendLineFormat([StringSyntax(StringSyntaxAttribute.CompositeFormat)]
+                                     string format,
+                                     params object?[] args)
+        {
+            stringBuilder.AppendFormat(format, args);
+            stringBuilder.AppendLine();
+        }
     }
 }

From ea95b5b7a759e56830a4e1f67a1512078ae1d219 Mon Sep 17 00:00:00 2001
From: Artur Stolear <artur.stolear@gmail.com>
Date: Wed, 12 Nov 2025 12:22:31 +0100
Subject: [PATCH 06/10] refactors tag prefix configuration

Renames `TagPrefix` to `TagPrefixPattern` for clarity.
---
 src/GitVersion.Core.Tests/MergeMessageTests.cs   |  4 ++--
 .../Configuration/EffectiveConfiguration.cs      |  4 ++--
 .../Extensions/ReferenceNameExtensions.cs        | 16 ++++++++--------
 src/GitVersion.Core/MergeMessage.cs              |  2 +-
 src/GitVersion.Core/PublicAPI.Unshipped.txt      |  4 ++++
 .../IncrementStrategyFinder.cs                   |  2 +-
 .../Mainline/NonTrunk/FirstCommitOnRelease.cs    |  2 +-
 .../Mainline/Trunk/CommitOnTrunkBranchedBase.cs  |  2 +-
 .../VersionInBranchNameVersionStrategy.cs        |  2 +-
 9 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/GitVersion.Core.Tests/MergeMessageTests.cs b/src/GitVersion.Core.Tests/MergeMessageTests.cs
index 7cf016e0be..1776649d04 100644
--- a/src/GitVersion.Core.Tests/MergeMessageTests.cs
+++ b/src/GitVersion.Core.Tests/MergeMessageTests.cs
@@ -35,10 +35,10 @@ public void EmptyTagPrefix(string? prefix)
     {
         // Arrange
         const string message = "Updated some code.";
-        var configuration = GitHubFlowConfigurationBuilder.New.WithTagPrefixPattern(prefix).Build();
+        var configurationBuilder = GitHubFlowConfigurationBuilder.New.WithTagPrefixPattern(prefix);
 
         // Act
-        var sut = new MergeMessage(message, configuration);
+        var sut = new MergeMessage(message, configurationBuilder.Build());
 
         // Assert
         sut.TargetBranch.ShouldBeNull();
diff --git a/src/GitVersion.Core/Configuration/EffectiveConfiguration.cs b/src/GitVersion.Core/Configuration/EffectiveConfiguration.cs
index 8d09e6ca4a..7bef5cb1d8 100644
--- a/src/GitVersion.Core/Configuration/EffectiveConfiguration.cs
+++ b/src/GitVersion.Core/Configuration/EffectiveConfiguration.cs
@@ -52,7 +52,7 @@ public EffectiveConfiguration(
         AssemblyVersioningFormat = configuration.AssemblyVersioningFormat;
         AssemblyFileVersioningFormat = configuration.AssemblyFileVersioningFormat;
         DeploymentMode = branchConfiguration.DeploymentMode.Value;
-        TagPrefix = configuration.TagPrefixPattern;
+        TagPrefixPattern = configuration.TagPrefixPattern;
         VersionInBranchPattern = configuration.VersionInBranchPattern;
         Label = branchConfiguration.Label;
         NextVersion = configuration.NextVersion;
@@ -90,7 +90,7 @@ public EffectiveConfiguration(
     public string? AssemblyVersioningFormat { get; }
     public string? AssemblyFileVersioningFormat { get; }
 
-    public string? TagPrefix { get; }
+    public string? TagPrefixPattern { get; }
 
     public string? VersionInBranchPattern { get; }
 
diff --git a/src/GitVersion.Core/Extensions/ReferenceNameExtensions.cs b/src/GitVersion.Core/Extensions/ReferenceNameExtensions.cs
index 9dda4c2521..7db6ae8462 100644
--- a/src/GitVersion.Core/Extensions/ReferenceNameExtensions.cs
+++ b/src/GitVersion.Core/Extensions/ReferenceNameExtensions.cs
@@ -6,16 +6,16 @@ namespace GitVersion.Configuration;
 
 public static class ReferenceNameExtensions
 {
-    public static bool TryGetSemanticVersion(this ReferenceName source, out (SemanticVersion Value, string? Name) result, EffectiveConfiguration configuration)
-        => source.TryGetSemanticVersion(out result, configuration.VersionInBranchPattern, configuration.TagPrefix, configuration.SemanticVersionFormat);
+    public static bool TryGetSemanticVersion(this ReferenceName source, EffectiveConfiguration configuration, out (SemanticVersion Value, string? Name) result)
+        => source.TryGetSemanticVersion(configuration.VersionInBranchPattern, configuration.TagPrefixPattern, configuration.SemanticVersionFormat, out result);
 
-    public static bool TryGetSemanticVersion(this ReferenceName source, out (SemanticVersion Value, string? Name) result, IGitVersionConfiguration configuration)
-        => source.TryGetSemanticVersion(out result, configuration.VersionInBranchPattern, configuration.TagPrefixPattern, configuration.SemanticVersionFormat);
+    public static bool TryGetSemanticVersion(this ReferenceName source, IGitVersionConfiguration configuration, out (SemanticVersion Value, string? Name) result)
+        => source.TryGetSemanticVersion(configuration.VersionInBranchPattern, configuration.TagPrefixPattern, configuration.SemanticVersionFormat, out result);
 
-    private static bool TryGetSemanticVersion(this ReferenceName referenceName, out (SemanticVersion Value, string? Name) result,
-                                              string? versionPatternPattern,
-                                              string? tagPrefix,
-                                              SemanticVersionFormat format)
+    private static bool TryGetSemanticVersion(this ReferenceName referenceName,
+                                             string? versionPatternPattern,
+                                             string? tagPrefix,
+                                             SemanticVersionFormat format, out (SemanticVersion Value, string? Name) result)
     {
         var versionPatternRegex = RegexPatterns.Cache.GetOrAdd(GetVersionInBranchPattern(versionPatternPattern));
         result = default;
diff --git a/src/GitVersion.Core/MergeMessage.cs b/src/GitVersion.Core/MergeMessage.cs
index d5f01dca1b..243aa2e758 100644
--- a/src/GitVersion.Core/MergeMessage.cs
+++ b/src/GitVersion.Core/MergeMessage.cs
@@ -53,7 +53,7 @@ public MergeMessage(string mergeMessage, IGitVersionConfiguration configuration)
                 PullRequestNumber = pullNumber;
             }
 
-            Version = MergedBranch?.TryGetSemanticVersion(out var result, configuration) == true ? result.Value : null;
+            Version = MergedBranch?.TryGetSemanticVersion(configuration, out var result) == true ? result.Value : null;
 
             break;
         }
diff --git a/src/GitVersion.Core/PublicAPI.Unshipped.txt b/src/GitVersion.Core/PublicAPI.Unshipped.txt
index 9d9cee3bbd..847e87d2b3 100644
--- a/src/GitVersion.Core/PublicAPI.Unshipped.txt
+++ b/src/GitVersion.Core/PublicAPI.Unshipped.txt
@@ -1,4 +1,5 @@
 #nullable enable
+GitVersion.Configuration.EffectiveConfiguration.TagPrefixPattern.get -> string?
 GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.extension(GitVersion.SemanticVersion!)
 GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.extension(GitVersion.SemanticVersion!).GetAssemblyFileVersion(GitVersion.Configuration.AssemblyFileVersioningScheme scheme) -> string?
 GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.extension(GitVersion.SemanticVersion!).GetAssemblyVersion(GitVersion.Configuration.AssemblyVersioningScheme scheme) -> string?
@@ -42,6 +43,9 @@ GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(Git
 GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(GitVersion.Logging.Verbosity verbosity, GitVersion.Logging.LogAction! logAction) -> void
 GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(GitVersion.Logging.Verbosity verbosity, string! format, params object?[]! args) -> void
 GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(string! format, params object?[]! args) -> void
+static GitVersion.Configuration.ReferenceNameExtensions.TryGetSemanticVersion(this GitVersion.Git.ReferenceName! referenceName, string? versionPatternPattern, string? tagPrefix, GitVersion.SemanticVersionFormat format, out (GitVersion.SemanticVersion! Value, string? Name) result) -> bool
+static GitVersion.Configuration.ReferenceNameExtensions.TryGetSemanticVersion(this GitVersion.Git.ReferenceName! source, GitVersion.Configuration.EffectiveConfiguration! configuration, out (GitVersion.SemanticVersion! Value, string? Name) result) -> bool
+static GitVersion.Configuration.ReferenceNameExtensions.TryGetSemanticVersion(this GitVersion.Git.ReferenceName! source, GitVersion.Configuration.IGitVersionConfiguration! configuration, out (GitVersion.SemanticVersion! Value, string? Name) result) -> bool
 static GitVersion.Extensions.FileSystemExtensions.FindGitDir(this System.IO.Abstractions.IFileSystem! fileSystem, string? path) -> (string! GitDirectory, string! WorkingTreeDirectory)?
 static GitVersion.Logging.LogExtensions.Debug(this GitVersion.Logging.ILog! log, GitVersion.Logging.Verbosity verbosity, string! format, params object?[]! args) -> void
 static GitVersion.Logging.LogExtensions.Debug(this GitVersion.Logging.ILog! log, string! format, params object?[]! args) -> void
diff --git a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
index 84d8e45556..ef529381fc 100644
--- a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
+++ b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
@@ -73,7 +73,7 @@ public VersionField DetermineIncrementedField(
         }
 
         IEnumerable<ICommit> commits = GetCommitHistory(
-            tagPrefix: configuration.TagPrefix,
+            tagPrefix: configuration.TagPrefixPattern,
             semanticVersionFormat: configuration.SemanticVersionFormat,
             baseVersionSource: baseVersionSource,
             currentCommit: currentCommit,
diff --git a/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/FirstCommitOnRelease.cs b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/FirstCommitOnRelease.cs
index 7fec472353..97b778eb43 100644
--- a/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/FirstCommitOnRelease.cs
+++ b/src/GitVersion.Core/VersionCalculation/Mainline/NonTrunk/FirstCommitOnRelease.cs
@@ -30,7 +30,7 @@ public IEnumerable<IBaseVersionIncrement> GetIncrements(
         MainlineIteration iteration, MainlineCommit commit, MainlineContext context)
     {
         var effectiveConfiguration = commit.GetEffectiveConfiguration(context.Configuration);
-        if (!commit.BranchName.TryGetSemanticVersion(out var element, effectiveConfiguration)) yield break;
+        if (!commit.BranchName.TryGetSemanticVersion(effectiveConfiguration, out var element)) yield break;
         context.AlternativeSemanticVersions.Add(element.Value);
     }
 }
diff --git a/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkBranchedBase.cs b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkBranchedBase.cs
index ac2afa04a0..2e64ac60bf 100644
--- a/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkBranchedBase.cs
+++ b/src/GitVersion.Core/VersionCalculation/Mainline/Trunk/CommitOnTrunkBranchedBase.cs
@@ -17,7 +17,7 @@ public virtual IEnumerable<IBaseVersionIncrement> GetIncrements(
 
         var effectiveConfiguration = iteration.GetEffectiveConfiguration(context.Configuration);
         if (iteration.GetEffectiveConfiguration(context.Configuration).IsReleaseBranch
-            && iteration.BranchName.TryGetSemanticVersion(out var element, effectiveConfiguration))
+            && iteration.BranchName.TryGetSemanticVersion(effectiveConfiguration, out var element))
         {
             context.AlternativeSemanticVersions.Add(element.Value);
         }
diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/VersionInBranchNameVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/VersionInBranchNameVersionStrategy.cs
index 67de10087a..6565f560b3 100644
--- a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/VersionInBranchNameVersionStrategy.cs
+++ b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/VersionInBranchNameVersionStrategy.cs
@@ -35,7 +35,7 @@ public bool TryGetBaseVersion(EffectiveBranchConfiguration configuration, [NotNu
 
         foreach (var branch in new[] { Context.CurrentBranch, configuration.Branch })
         {
-            if (!branch.Name.TryGetSemanticVersion(out var result, configuration.Value)) continue;
+            if (!branch.Name.TryGetSemanticVersion(configuration.Value, out var result)) continue;
             string? branchNameOverride = null;
             if (!result.Name.IsNullOrEmpty() && (Context.CurrentBranch.Name.Equals(branch.Name)
                                                  || Context.Configuration.GetBranchConfiguration(Context.CurrentBranch.Name).Label is null))

From fbe89d70da38816f4faa87883cbc34b270d524d9 Mon Sep 17 00:00:00 2001
From: Artur Stolear <artur.stolear@gmail.com>
Date: Wed, 12 Nov 2025 13:42:24 +0100
Subject: [PATCH 07/10] refactors reference name extensions

Refactors the `ReferenceNameExtensions` to use extension methods for improved code organization.
---
 .../Extensions/ReferenceNameExtensions.cs     | 67 ++++++++++---------
 src/GitVersion.Core/PublicAPI.Shipped.txt     |  3 -
 src/GitVersion.Core/PublicAPI.Unshipped.txt   |  4 +-
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/src/GitVersion.Core/Extensions/ReferenceNameExtensions.cs b/src/GitVersion.Core/Extensions/ReferenceNameExtensions.cs
index 7db6ae8462..184421b020 100644
--- a/src/GitVersion.Core/Extensions/ReferenceNameExtensions.cs
+++ b/src/GitVersion.Core/Extensions/ReferenceNameExtensions.cs
@@ -1,54 +1,57 @@
 using GitVersion.Core;
 using GitVersion.Extensions;
 using GitVersion.Git;
+using SemanticVersionResult = (GitVersion.SemanticVersion Value, string? Name);
 
 namespace GitVersion.Configuration;
 
 public static class ReferenceNameExtensions
 {
-    public static bool TryGetSemanticVersion(this ReferenceName source, EffectiveConfiguration configuration, out (SemanticVersion Value, string? Name) result)
-        => source.TryGetSemanticVersion(configuration.VersionInBranchPattern, configuration.TagPrefixPattern, configuration.SemanticVersionFormat, out result);
-
-    public static bool TryGetSemanticVersion(this ReferenceName source, IGitVersionConfiguration configuration, out (SemanticVersion Value, string? Name) result)
-        => source.TryGetSemanticVersion(configuration.VersionInBranchPattern, configuration.TagPrefixPattern, configuration.SemanticVersionFormat, out result);
-
-    private static bool TryGetSemanticVersion(this ReferenceName referenceName,
-                                             string? versionPatternPattern,
-                                             string? tagPrefix,
-                                             SemanticVersionFormat format, out (SemanticVersion Value, string? Name) result)
+    extension(ReferenceName source)
     {
-        var versionPatternRegex = RegexPatterns.Cache.GetOrAdd(GetVersionInBranchPattern(versionPatternPattern));
-        result = default;
+        public bool TryGetSemanticVersion(EffectiveConfiguration configuration, out SemanticVersionResult result)
+            => source.TryGetSemanticVersion(configuration.VersionInBranchPattern, configuration.TagPrefixPattern, configuration.SemanticVersionFormat, out result);
+
+        public bool TryGetSemanticVersion(IGitVersionConfiguration configuration, out SemanticVersionResult result)
+            => source.TryGetSemanticVersion(configuration.VersionInBranchPattern, configuration.TagPrefixPattern, configuration.SemanticVersionFormat, out result);
 
-        var length = 0;
-        foreach (var branchPart in referenceName.WithoutOrigin.Split(GetBranchSeparator()))
+        private bool TryGetSemanticVersion(string? versionPatternPattern,
+                                           string? tagPrefix,
+                                           SemanticVersionFormat format, out SemanticVersionResult result)
         {
-            if (string.IsNullOrEmpty(branchPart)) return false;
+            var versionPatternRegex = RegexPatterns.Cache.GetOrAdd(GetVersionInBranchPattern(versionPatternPattern));
+            result = default;
 
-            var match = versionPatternRegex.Match(branchPart);
-            if (match.Success)
+            var length = 0;
+            foreach (var branchPart in source.WithoutOrigin.Split(GetBranchSeparator()))
             {
-                var versionPart = match.Groups["version"].Value;
-                if (SemanticVersion.TryParse(versionPart, tagPrefix, out var semanticVersion, format))
+                if (string.IsNullOrEmpty(branchPart)) return false;
+
+                var match = versionPatternRegex.Match(branchPart);
+                if (match.Success)
                 {
-                    length += versionPart.Length;
-                    var name = referenceName.WithoutOrigin[length..].Trim('-');
-                    result = new(semanticVersion, name.Length == 0 ? null : name);
-                    return true;
+                    var versionPart = match.Groups["version"].Value;
+                    if (SemanticVersion.TryParse(versionPart, tagPrefix, out var semanticVersion, format))
+                    {
+                        length += versionPart.Length;
+                        var name = source.WithoutOrigin[length..].Trim('-');
+                        result = new(semanticVersion, name.Length == 0 ? null : name);
+                        return true;
+                    }
                 }
-            }
 
-            length += branchPart.Length + 1;
-        }
+                length += branchPart.Length + 1;
+            }
 
-        return false;
+            return false;
 
-        char GetBranchSeparator() => referenceName.WithoutOrigin.Contains('/') || !referenceName.WithoutOrigin.Contains('-') ? '/' : '-';
+            char GetBranchSeparator() => source.WithoutOrigin.Contains('/') || !source.WithoutOrigin.Contains('-') ? '/' : '-';
 
-        static string GetVersionInBranchPattern(string? versionInBranchPattern)
-        {
-            if (versionInBranchPattern.IsNullOrEmpty()) versionInBranchPattern = RegexPatterns.Configuration.DefaultVersionInBranchRegexPattern;
-            return $"^{versionInBranchPattern.TrimStart('^')}";
+            static string GetVersionInBranchPattern(string? versionInBranchPattern)
+            {
+                if (versionInBranchPattern.IsNullOrEmpty()) versionInBranchPattern = RegexPatterns.Configuration.DefaultVersionInBranchRegexPattern;
+                return $"^{versionInBranchPattern.TrimStart('^')}";
+            }
         }
     }
 }
diff --git a/src/GitVersion.Core/PublicAPI.Shipped.txt b/src/GitVersion.Core/PublicAPI.Shipped.txt
index 75b8b1efde..cb9026d29a 100644
--- a/src/GitVersion.Core/PublicAPI.Shipped.txt
+++ b/src/GitVersion.Core/PublicAPI.Shipped.txt
@@ -84,7 +84,6 @@ GitVersion.Configuration.EffectiveConfiguration.PreventIncrementWhenBranchMerged
 GitVersion.Configuration.EffectiveConfiguration.PreventIncrementWhenCurrentCommitTagged.get -> bool
 GitVersion.Configuration.EffectiveConfiguration.RegularExpression.get -> string?
 GitVersion.Configuration.EffectiveConfiguration.SemanticVersionFormat.get -> GitVersion.SemanticVersionFormat
-GitVersion.Configuration.EffectiveConfiguration.TagPrefix.get -> string?
 GitVersion.Configuration.EffectiveConfiguration.TagPreReleaseWeight.get -> int
 GitVersion.Configuration.EffectiveConfiguration.TrackMergeMessage.get -> bool
 GitVersion.Configuration.EffectiveConfiguration.TrackMergeTarget.get -> bool
@@ -802,8 +801,6 @@ static GitVersion.Configuration.EffectiveBranchConfiguration.operator !=(GitVers
 static GitVersion.Configuration.EffectiveBranchConfiguration.operator ==(GitVersion.Configuration.EffectiveBranchConfiguration? left, GitVersion.Configuration.EffectiveBranchConfiguration? right) -> bool
 static GitVersion.Configuration.EffectiveConfiguration.operator !=(GitVersion.Configuration.EffectiveConfiguration? left, GitVersion.Configuration.EffectiveConfiguration? right) -> bool
 static GitVersion.Configuration.EffectiveConfiguration.operator ==(GitVersion.Configuration.EffectiveConfiguration? left, GitVersion.Configuration.EffectiveConfiguration? right) -> bool
-static GitVersion.Configuration.ReferenceNameExtensions.TryGetSemanticVersion(this GitVersion.Git.ReferenceName! source, out (GitVersion.SemanticVersion! Value, string? Name) result, GitVersion.Configuration.EffectiveConfiguration! configuration) -> bool
-static GitVersion.Configuration.ReferenceNameExtensions.TryGetSemanticVersion(this GitVersion.Git.ReferenceName! source, out (GitVersion.SemanticVersion! Value, string? Name) result, GitVersion.Configuration.IGitVersionConfiguration! configuration) -> bool
 static GitVersion.ConfigurationInfo.operator !=(GitVersion.ConfigurationInfo? left, GitVersion.ConfigurationInfo? right) -> bool
 static GitVersion.ConfigurationInfo.operator ==(GitVersion.ConfigurationInfo? left, GitVersion.ConfigurationInfo? right) -> bool
 static GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.GetAssemblyFileVersion(this GitVersion.SemanticVersion! sv, GitVersion.Configuration.AssemblyFileVersioningScheme scheme) -> string?
diff --git a/src/GitVersion.Core/PublicAPI.Unshipped.txt b/src/GitVersion.Core/PublicAPI.Unshipped.txt
index 847e87d2b3..3eb245a638 100644
--- a/src/GitVersion.Core/PublicAPI.Unshipped.txt
+++ b/src/GitVersion.Core/PublicAPI.Unshipped.txt
@@ -1,5 +1,8 @@
 #nullable enable
 GitVersion.Configuration.EffectiveConfiguration.TagPrefixPattern.get -> string?
+GitVersion.Configuration.ReferenceNameExtensions.extension(GitVersion.Git.ReferenceName!)
+GitVersion.Configuration.ReferenceNameExtensions.extension(GitVersion.Git.ReferenceName!).TryGetSemanticVersion(GitVersion.Configuration.EffectiveConfiguration! configuration, out (GitVersion.SemanticVersion! Value, string? Name) result) -> bool
+GitVersion.Configuration.ReferenceNameExtensions.extension(GitVersion.Git.ReferenceName!).TryGetSemanticVersion(GitVersion.Configuration.IGitVersionConfiguration! configuration, out (GitVersion.SemanticVersion! Value, string? Name) result) -> bool
 GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.extension(GitVersion.SemanticVersion!)
 GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.extension(GitVersion.SemanticVersion!).GetAssemblyFileVersion(GitVersion.Configuration.AssemblyFileVersioningScheme scheme) -> string?
 GitVersion.Extensions.AssemblyVersionsGeneratorExtensions.extension(GitVersion.SemanticVersion!).GetAssemblyVersion(GitVersion.Configuration.AssemblyVersioningScheme scheme) -> string?
@@ -43,7 +46,6 @@ GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(Git
 GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(GitVersion.Logging.Verbosity verbosity, GitVersion.Logging.LogAction! logAction) -> void
 GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(GitVersion.Logging.Verbosity verbosity, string! format, params object?[]! args) -> void
 GitVersion.Logging.LogExtensions.extension(GitVersion.Logging.ILog!).Warning(string! format, params object?[]! args) -> void
-static GitVersion.Configuration.ReferenceNameExtensions.TryGetSemanticVersion(this GitVersion.Git.ReferenceName! referenceName, string? versionPatternPattern, string? tagPrefix, GitVersion.SemanticVersionFormat format, out (GitVersion.SemanticVersion! Value, string? Name) result) -> bool
 static GitVersion.Configuration.ReferenceNameExtensions.TryGetSemanticVersion(this GitVersion.Git.ReferenceName! source, GitVersion.Configuration.EffectiveConfiguration! configuration, out (GitVersion.SemanticVersion! Value, string? Name) result) -> bool
 static GitVersion.Configuration.ReferenceNameExtensions.TryGetSemanticVersion(this GitVersion.Git.ReferenceName! source, GitVersion.Configuration.IGitVersionConfiguration! configuration, out (GitVersion.SemanticVersion! Value, string? Name) result) -> bool
 static GitVersion.Extensions.FileSystemExtensions.FindGitDir(this System.IO.Abstractions.IFileSystem! fileSystem, string? path) -> (string! GitDirectory, string! WorkingTreeDirectory)?

From a0f246dc11d4231dabaf3cb3cbb5283c43cdde0a Mon Sep 17 00:00:00 2001
From: Artur Stolear <artur.stolear@gmail.com>
Date: Thu, 13 Nov 2025 23:12:34 +0100
Subject: [PATCH 08/10] targets net10 in tests

updates test project to target .net 10.
---
 new-cli/GitVersion.Cli.Generator.Tests/Extensions.cs | 12 ++++++++++++
 .../GitVersion.Cli.Generator.Tests.csproj            | 12 +++++++++++-
 .../SystemCommandlineGeneratorTests.cs               |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 new-cli/GitVersion.Cli.Generator.Tests/Extensions.cs

diff --git a/new-cli/GitVersion.Cli.Generator.Tests/Extensions.cs b/new-cli/GitVersion.Cli.Generator.Tests/Extensions.cs
new file mode 100644
index 0000000000..cbab2336a9
--- /dev/null
+++ b/new-cli/GitVersion.Cli.Generator.Tests/Extensions.cs
@@ -0,0 +1,12 @@
+using Microsoft.CodeAnalysis.Testing;
+
+namespace GitVersion.Cli.Generator.Tests;
+
+public static class Extensions
+{
+    extension(ReferenceAssemblies)
+    {
+        public static ReferenceAssemblies Net10 =>
+            new("net10.0", new PackageIdentity("Microsoft.NETCore.App.Ref", "10.0.0"), Path.Combine("ref", "net10.0"));
+    }
+}
diff --git a/new-cli/GitVersion.Cli.Generator.Tests/GitVersion.Cli.Generator.Tests.csproj b/new-cli/GitVersion.Cli.Generator.Tests/GitVersion.Cli.Generator.Tests.csproj
index 13dd134bbf..9478d94c71 100644
--- a/new-cli/GitVersion.Cli.Generator.Tests/GitVersion.Cli.Generator.Tests.csproj
+++ b/new-cli/GitVersion.Cli.Generator.Tests/GitVersion.Cli.Generator.Tests.csproj
@@ -1,6 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
+        <!-- Enable the NUnit runner, this is an opt-in feature -->
+        <EnableNUnitRunner>true</EnableNUnitRunner>
+        <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
+
+        <!--
+          Displays error on console in addition to the log file. Note that this feature comes with a performance impact.
+          For more information, visit https://learn.microsoft.com/dotnet/core/testing/microsoft-testing-platform-integration-dotnet-test#show-failure-per-test
+          -->
+        <TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
+
+        <OutputType>Exe</OutputType>
         <RootNamespace>GitVersion.Cli.Generator.Tests</RootNamespace>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
@@ -10,7 +21,6 @@
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
         <PackageReference Include="System.CommandLine" />
 
-        <PackageReference Include="Microsoft.CSharp" />
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
         <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
diff --git a/new-cli/GitVersion.Cli.Generator.Tests/SystemCommandlineGeneratorTests.cs b/new-cli/GitVersion.Cli.Generator.Tests/SystemCommandlineGeneratorTests.cs
index 6e3775e48d..389466ebbe 100644
--- a/new-cli/GitVersion.Cli.Generator.Tests/SystemCommandlineGeneratorTests.cs
+++ b/new-cli/GitVersion.Cli.Generator.Tests/SystemCommandlineGeneratorTests.cs
@@ -252,7 +252,7 @@ public async Task ValidateGeneratedCommandImplementation()
                     (generatorType,"RootCommandImpl.g.cs", ExpectedRootCommandImplText),
                     (generatorType,"CliAppImpl.g.cs", ExpectedCliAppImplText),
                 },
-                ReferenceAssemblies = ReferenceAssemblies.Net.Net90,
+                ReferenceAssemblies = ReferenceAssemblies.Net10,
                 AdditionalReferences =
                 {
                     MetadataReference.CreateFromFile(typeof(ILogger).Assembly.Location),

From 038e3ec879119eb17bee5e35bd5bcf2dfcd9e5ce Mon Sep 17 00:00:00 2001
From: Artur Stolear <artur.stolear@gmail.com>
Date: Thu, 13 Nov 2025 23:24:41 +0100
Subject: [PATCH 09/10] suppresses specific SonarAnalyzer warning

suppresses S4136 in multiple projects to avoid noisy warnings related to method overloads.
---
 .editorconfig                 | 3 +++
 new-cli/Directory.Build.props | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index f199d80f9e..709cd532da 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -170,6 +170,9 @@ dotnet_diagnostic.rcs1037.severity = error
 # RCS1036: Remove redundant empty line.
 dotnet_diagnostic.rcs1036.severity = error
 
+dotnet_diagnostic.S2325.severity = none
+dotnet_diagnostic.S4136.severity = none
+
 xml_space_before_self_closing = true
 
 resharper_arrange_object_creation_when_type_not_evident_highlighting = none
diff --git a/new-cli/Directory.Build.props b/new-cli/Directory.Build.props
index a7365ac71a..acf633afc1 100644
--- a/new-cli/Directory.Build.props
+++ b/new-cli/Directory.Build.props
@@ -6,7 +6,7 @@
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <NoWarn>8625;2254;IDE0005</NoWarn>
+        <NoWarn>$(NoWarn);CS8625;CS2254;IDE0005</NoWarn>
 
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
         <EnableNETAnalyzers>true</EnableNETAnalyzers>

From 17466d8b61a7a4753ccbdf50fb0fe76cb2c841ef Mon Sep 17 00:00:00 2001
From: Artur Stolear <artur.stolear@gmail.com>
Date: Fri, 14 Nov 2025 00:06:52 +0100
Subject: [PATCH 10/10] fix copilot review comments

---
 src/GitVersion.App/ArgumentParserExtensions.cs | 2 +-
 src/GitVersion.Core.Tests/MergeMessageTests.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/GitVersion.App/ArgumentParserExtensions.cs b/src/GitVersion.App/ArgumentParserExtensions.cs
index 75cc99fc05..073983b420 100644
--- a/src/GitVersion.App/ArgumentParserExtensions.cs
+++ b/src/GitVersion.App/ArgumentParserExtensions.cs
@@ -30,7 +30,7 @@ public bool IsValidPath()
                 {
                     _ = FileSystemHelper.Path.GetFullPath(value);
                 }
-                catch
+                catch (Exception)
                 {
                     return false;
                 }
diff --git a/src/GitVersion.Core.Tests/MergeMessageTests.cs b/src/GitVersion.Core.Tests/MergeMessageTests.cs
index 1776649d04..5f452e9f87 100644
--- a/src/GitVersion.Core.Tests/MergeMessageTests.cs
+++ b/src/GitVersion.Core.Tests/MergeMessageTests.cs
@@ -35,10 +35,10 @@ public void EmptyTagPrefix(string? prefix)
     {
         // Arrange
         const string message = "Updated some code.";
-        var configurationBuilder = GitHubFlowConfigurationBuilder.New.WithTagPrefixPattern(prefix);
+        var configBuilder = GitHubFlowConfigurationBuilder.New.WithTagPrefixPattern(prefix);
 
         // Act
-        var sut = new MergeMessage(message, configurationBuilder.Build());
+        var sut = new MergeMessage(message, configBuilder.Build());
 
         // Assert
         sut.TargetBranch.ShouldBeNull();