diff --git a/.github/ISSUE_TEMPLATE/issue-report.yml b/.github/ISSUE_TEMPLATE/issue-report.yml
index 373596a764..5e174295a5 100644
--- a/.github/ISSUE_TEMPLATE/issue-report.yml
+++ b/.github/ISSUE_TEMPLATE/issue-report.yml
@@ -20,6 +20,7 @@ body:
     - GitVersion.Portable
     - gittools/actions
     - AzureDevops task
+    - N/A
     multiple: true
   validations:
     required: true
@@ -69,4 +70,4 @@ body:
     description: Log messages you receive when running. Make sure there is no sensitive data shared. No need for backticks here.
     render: shell
   validations:
-    required: false
\ No newline at end of file
+    required: false
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ecc644fda4..f74944833f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,5 +1,13 @@
 version: 2
 updates:
+- package-ecosystem: dotnet-sdk
+  labels:
+      - "dependencies"
+  commit-message:
+      prefix: "(deps)"
+  directory: "/"
+  schedule:
+    interval: daily
 - package-ecosystem: nuget
   labels:
     - "dependencies"
@@ -24,6 +32,8 @@ updates:
     - "/new-cli"
     - "/src"
     - "/"
+  ignore:
+    - dependency-name: "LibGit2Sharp"
   schedule:
     interval: daily
   open-pull-requests-limit: 10
diff --git a/.github/workflows/_docker.yml b/.github/workflows/_docker.yml
index dcf56d056c..8514377ad6 100644
--- a/.github/workflows/_docker.yml
+++ b/.github/workflows/_docker.yml
@@ -43,7 +43,7 @@ jobs:
         path: ${{ github.workspace }}/artifacts/packages/nuget
     -
       name: Set up Docker
-      uses: crazy-max/ghaction-setup-docker@v3
+      uses: docker/setup-docker-action@v4
       with:
         daemon-config: '{ "features": { "containerd-snapshotter": true } }'        
     -
diff --git a/.github/workflows/_docker_manifests.yml b/.github/workflows/_docker_manifests.yml
index abb3b5cd05..2e72c53e51 100644
--- a/.github/workflows/_docker_manifests.yml
+++ b/.github/workflows/_docker_manifests.yml
@@ -31,7 +31,7 @@ jobs:
       uses: ./.github/actions/cache-restore
     -
       name: Set up Docker
-      uses: crazy-max/ghaction-setup-docker@v3
+      uses: docker/setup-docker-action@v4
       with:
         daemon-config: '{ "features": { "containerd-snapshotter": true } }'
     -
diff --git a/.github/workflows/_unit_tests.yml b/.github/workflows/_unit_tests.yml
index 594e2a55ae..f4925b5f59 100644
--- a/.github/workflows/_unit_tests.yml
+++ b/.github/workflows/_unit_tests.yml
@@ -37,6 +37,6 @@ jobs:
     -
       name: Test Summary
       uses: test-summary/action@v2.4
-      if: matrix.dotnetVersion == '8.0'
+      if: matrix.dotnetVersion == '9.0'
       with:
         paths: artifacts/test-results/*.results.xml
diff --git a/build/.run/Artifacts DotnetTool Test.run.xml b/build/.run/Artifacts DotnetTool Test.run.xml
index 5a4546c2b5..f09edd6a7e 100644
--- a/build/.run/Artifacts DotnetTool Test.run.xml	
+++ b/build/.run/Artifacts DotnetTool Test.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts DotnetTool Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
     <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.20" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 e28ceedea3..85538064f0 100644
--- a/build/.run/Artifacts Executable Test.run.xml	
+++ b/build/.run/Artifacts Executable Test.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Executable Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
     <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsExecutableTest" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Artifacts MsBuildCore Test.run.xml b/build/.run/Artifacts MsBuildCore Test.run.xml
index dd416c0d12..034885bdb1 100644
--- a/build/.run/Artifacts MsBuildCore Test.run.xml	
+++ b/build/.run/Artifacts MsBuildCore Test.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts MsBuildCore Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
     <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.20" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 31b7b025f3..537874156c 100644
--- a/build/.run/Artifacts MsBuildFull Test.run.xml	
+++ b/build/.run/Artifacts MsBuildFull Test.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts MsBuildFull Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
     <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildFullTest" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Artifacts Native Test.run.xml b/build/.run/Artifacts Native Test.run.xml
index 05c10b671e..185bfa09bc 100644
--- a/build/.run/Artifacts Native Test.run.xml	
+++ b/build/.run/Artifacts Native Test.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Native Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
     <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsNativeTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.20" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 e4e16dc7fa..c662b76166 100644
--- a/build/.run/Artifacts Prepare.run.xml	
+++ b/build/.run/Artifacts Prepare.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Prepare" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
     <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsPrepare --dotnet_version=8.0 --docker_distro=alpine.3.20" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 39b16f0c74..9f07df0d26 100644
--- a/build/.run/Artifacts Test.run.xml	
+++ b/build/.run/Artifacts Test.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
     <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsTest --dotnet_version=8.0 --docker_distro=alpine.3.20" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 2057ab88d0..43431e74bb 100644
--- a/build/.run/Build Docs.run.xml	
+++ b/build/.run/Build Docs.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Build Docs" type="DotNetProject" factoryName=".NET Project" folderName="Docs">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docs.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docs" />
     <option name="PROGRAM_PARAMETERS" value="--target=BuildDocs" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Build Prepare.run.xml b/build/.run/Build Prepare.run.xml
index 2d64a908d0..2e820c42fe 100644
--- a/build/.run/Build Prepare.run.xml	
+++ b/build/.run/Build Prepare.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Build Prepare" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
     <option name="PROGRAM_PARAMETERS" value="--target=BuildPrepare" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Build.run.xml b/build/.run/Build.run.xml
index 18bffb4512..00d2bc0df3 100644
--- a/build/.run/Build.run.xml
+++ b/build/.run/Build.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Build" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
     <option name="PROGRAM_PARAMETERS" value="--target=Build" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Clean.run.xml b/build/.run/Clean.run.xml
index 1fa96943fd..4eedf1502f 100644
--- a/build/.run/Clean.run.xml
+++ b/build/.run/Clean.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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Code Format.run.xml b/build/.run/Code Format.run.xml
index ce22ecc7ef..560927676b 100644
--- a/build/.run/Code Format.run.xml	
+++ b/build/.run/Code Format.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Code Format" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
     <option name="PROGRAM_PARAMETERS" value="--target=CodeFormat --verbosity=diagnostic" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Default Artifacts.run.xml b/build/.run/Default Artifacts.run.xml
index b11ae50ad5..fe2a2c7a99 100644
--- a/build/.run/Default Artifacts.run.xml	
+++ b/build/.run/Default Artifacts.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Default Artifacts" type="DotNetProject" factoryName=".NET Project" folderName="Default">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Default Build.run.xml b/build/.run/Default Build.run.xml
index 40b932706d..6abaa465f3 100644
--- a/build/.run/Default Build.run.xml	
+++ b/build/.run/Default Build.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Default Build" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Default Config.run.xml b/build/.run/Default Config.run.xml
index 09aff33315..1d2cb9fab3 100644
--- a/build/.run/Default Config.run.xml	
+++ b/build/.run/Default Config.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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Default Docker.run.xml b/build/.run/Default Docker.run.xml
index ec02b99b91..461aaa85bc 100644
--- a/build/.run/Default Docker.run.xml	
+++ b/build/.run/Default Docker.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Default Docker" type="DotNetProject" factoryName=".NET Project" folderName="Default">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Default Docs.run.xml b/build/.run/Default Docs.run.xml
index 2741e3a8a7..b4ea267b7b 100644
--- a/build/.run/Default Docs.run.xml	
+++ b/build/.run/Default Docs.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Default Docs" type="DotNetProject" factoryName=".NET Project" folderName="Default">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docs.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docs" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Default Publish.run.xml b/build/.run/Default Publish.run.xml
index dfe8c455d3..03f349b259 100644
--- a/build/.run/Default Publish.run.xml	
+++ b/build/.run/Default Publish.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Default Publish" type="DotNetProject" factoryName=".NET Project" folderName="Default">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/publish.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/publish" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Docker Build.run.xml b/build/.run/Docker Build.run.xml
index ccd4f3d5c7..ee230e7d4d 100644
--- a/build/.run/Docker Build.run.xml	
+++ b/build/.run/Docker Build.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker Build" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker" />
     <option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --arch=amd64 --arch=arm64 --dotnet_version=8.0 --docker_distro=debian.12 --verbosity=diagnostic" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 75fee1395a..6b6293a626 100644
--- a/build/.run/Docker Manifest.run.xml	
+++ b/build/.run/Docker Manifest.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker Manifest" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker" />
     <option name="PROGRAM_PARAMETERS" value="--target=DockerManifest --arch=amd64 --arch=arm64 --dotnet_version=8.0 --docker_distro=debian.12" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 b6f904544c..ea23af56ab 100644
--- a/build/.run/Docker Publish.run.xml	
+++ b/build/.run/Docker Publish.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker Publish" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker" />
     <option name="PROGRAM_PARAMETERS" value="--target=DockerPublish --arch=amd64 --arch=arm64 --dotnet_version=8.0 --docker_distro=debian.12 --verbosity=diagnostic" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 35cd850bab..09ac793b19 100644
--- a/build/.run/Docker Test.run.xml	
+++ b/build/.run/Docker Test.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker Test" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker" />
     <option name="PROGRAM_PARAMETERS" value="--target=DockerTest --arch=amd64 --dotnet_version=8.0 --docker_distro=debian.12" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 abccf7c47f..4ac6c97d64 100644
--- a/build/.run/DockerHub Readme Publish.run.xml	
+++ b/build/.run/DockerHub Readme Publish.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="DockerHub Readme Publish" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker" />
     <option name="PROGRAM_PARAMETERS" value="--target=DockerHubReadmePublish" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -17,7 +17,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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Generate Schemas.run.xml b/build/.run/Generate Schemas.run.xml
index e8b7a008a7..e4dcf435a9 100644
--- a/build/.run/Generate Schemas.run.xml	
+++ b/build/.run/Generate Schemas.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Generate Schemas" type="DotNetProject" factoryName=".NET Project" folderName="Docs">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docs.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docs" />
     <option name="PROGRAM_PARAMETERS" value="--target=GenerateSchemas" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Package Archive.run.xml b/build/.run/Package Archive.run.xml
index 7f6fdf601f..fa6cca1b56 100644
--- a/build/.run/Package Archive.run.xml	
+++ b/build/.run/Package Archive.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Package Archive" type="DotNetProject" factoryName=".NET Project" folderName="Package">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
     <option name="PROGRAM_PARAMETERS" value="--target=PackageArchive" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Package Chocolatey.run.xml b/build/.run/Package Chocolatey.run.xml
index f623b0b793..88b86ef25c 100644
--- a/build/.run/Package Chocolatey.run.xml	
+++ b/build/.run/Package Chocolatey.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Package Chocolatey" type="DotNetProject" factoryName=".NET Project" folderName="Package">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
     <option name="PROGRAM_PARAMETERS" value="--target=PackageChocolatey" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Package Nuget.run.xml b/build/.run/Package Nuget.run.xml
index f7d26d597c..841a3a4fc8 100644
--- a/build/.run/Package Nuget.run.xml	
+++ b/build/.run/Package Nuget.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Package Nuget" type="DotNetProject" factoryName=".NET Project" folderName="Package">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
     <option name="PROGRAM_PARAMETERS" value="--target=PackageNuget" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Package Prepare.run.xml b/build/.run/Package Prepare.run.xml
index a4f1c9a96e..9c72d75e52 100644
--- a/build/.run/Package Prepare.run.xml	
+++ b/build/.run/Package Prepare.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Package Prepare" type="DotNetProject" factoryName=".NET Project" folderName="Package">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
     <option name="PROGRAM_PARAMETERS" value="--target=PackagePrepare" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Package.run.xml b/build/.run/Package.run.xml
index 1bc955563d..aeb114a001 100644
--- a/build/.run/Package.run.xml
+++ b/build/.run/Package.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Package" type="DotNetProject" factoryName=".NET Project" folderName="Package">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
     <option name="PROGRAM_PARAMETERS" value="--target=Package" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Preview Docs.run.xml b/build/.run/Preview Docs.run.xml
index 22fe19e0d6..d0bd79cb9e 100644
--- a/build/.run/Preview Docs.run.xml	
+++ b/build/.run/Preview Docs.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Preview Docs" type="DotNetProject" factoryName=".NET Project" folderName="Docs">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docs.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docs" />
     <option name="PROGRAM_PARAMETERS" value="--target=PreviewDocs" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Publish Chocolatey.run.xml b/build/.run/Publish Chocolatey.run.xml
index 7b74022d81..1dae103da1 100644
--- a/build/.run/Publish Chocolatey.run.xml	
+++ b/build/.run/Publish Chocolatey.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Publish Chocolatey" type="DotNetProject" factoryName=".NET Project" folderName="Publish">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/publish.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/publish" />
     <option name="PROGRAM_PARAMETERS" value="--target=PublishChocolatey" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Publish Docs.run.xml b/build/.run/Publish Docs.run.xml
index a7291c7f94..22ceca648b 100644
--- a/build/.run/Publish Docs.run.xml	
+++ b/build/.run/Publish Docs.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Publish Docs" type="DotNetProject" factoryName=".NET Project" folderName="Docs">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docs.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docs" />
     <option name="PROGRAM_PARAMETERS" value="--target=PublishDocs --force" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Publish Nuget.run.xml b/build/.run/Publish Nuget.run.xml
index 8c0d06dc9b..1e1bb97cb2 100644
--- a/build/.run/Publish Nuget.run.xml	
+++ b/build/.run/Publish Nuget.run.xml	
@@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Publish Nuget" type="DotNetProject" factoryName=".NET Project" folderName="Publish">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/publish.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/publish" />
     <option name="PROGRAM_PARAMETERS" value="--target=PublishNuget" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
-      <env name="DOTNET_ROLL_FORWARD" value="Major" />
       <env name="NUGET_API_KEY" value="" />
+      <env name="DOTNET_ROLL_FORWARD" value="Major" />
     </envs>
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Publish Release.run.xml b/build/.run/Publish Release.run.xml
index fcf6261525..a6b1e66b5a 100644
--- a/build/.run/Publish Release.run.xml	
+++ b/build/.run/Publish Release.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Publish Release" type="DotNetProject" factoryName=".NET Project" folderName="Release">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/release.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/release" />
     <option name="PROGRAM_PARAMETERS" value="--target=PublishRelease" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/PublishCoverage.run.xml b/build/.run/PublishCoverage.run.xml
index a1a841e350..78f3d067b7 100644
--- a/build/.run/PublishCoverage.run.xml
+++ b/build/.run/PublishCoverage.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="PublishCoverage" type="DotNetProject" factoryName=".NET Project" folderName="Unit Test">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
     <option name="PROGRAM_PARAMETERS" value="--target=PublishCoverage --dotnet_version=8.0" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/SetMatrix.run.xml b/build/.run/SetMatrix.run.xml
index 3e042eaffc..2ee4920e9a 100644
--- a/build/.run/SetMatrix.run.xml
+++ b/build/.run/SetMatrix.run.xml
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Test.run.xml b/build/.run/Test.run.xml
index 44f174179f..1277bfaa07 100644
--- a/build/.run/Test.run.xml
+++ b/build/.run/Test.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Test" type="DotNetProject" factoryName=".NET Project" folderName="Unit Test">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/UnitTest (8.0).run.xml b/build/.run/UnitTest (8.0).run.xml
index 996040b8d5..e60688bff1 100644
--- a/build/.run/UnitTest (8.0).run.xml	
+++ b/build/.run/UnitTest (8.0).run.xml	
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/UnitTest (6.0).run.xml b/build/.run/UnitTest (9.0).run.xml
similarity index 87%
rename from build/.run/UnitTest (6.0).run.xml
rename to build/.run/UnitTest (9.0).run.xml
index 4f2f55e0a6..e9702af0a9 100644
--- a/build/.run/UnitTest (6.0).run.xml	
+++ b/build/.run/UnitTest (9.0).run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="UnitTest (6.0)" type="DotNetProject" factoryName=".NET Project" folderName="Unit Test">
+  <configuration default="false" name="UnitTest (9.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=6.0" />
+    <option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_version=9.0" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/.run/Validate Version.run.xml b/build/.run/Validate Version.run.xml
index b16e1c4915..527061c25e 100644
--- a/build/.run/Validate Version.run.xml	
+++ b/build/.run/Validate Version.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Validate Version" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
     <option name="PROGRAM_PARAMETERS" value="--target=ValidateVersion " />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/build/Directory.Build.props b/build/Directory.Build.props
index edbb8dac4d..97be940115 100644
--- a/build/Directory.Build.props
+++ b/build/Directory.Build.props
@@ -1,12 +1,12 @@
 <Project>
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
         <OutputPath>..\..\run\</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <Nullable>enable</Nullable>
-        <LangVersion>12</LangVersion>
+        <LangVersion>latest</LangVersion>
         <NoWarn>NU1604</NoWarn>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
diff --git a/build/Directory.Packages.props b/build/Directory.Packages.props
index 878f537db9..2e0ac0583c 100644
--- a/build/Directory.Packages.props
+++ b/build/Directory.Packages.props
@@ -6,7 +6,7 @@
     <PackageVersion Include="Cake.Compression" Version="0.3.0" />
     <PackageVersion Include="Cake.Codecov" Version="3.0.0" />
     <PackageVersion Include="Cake.Coverlet" Version="4.0.1" />
-    <PackageVersion Include="Cake.Frosting" Version="4.2.0" />
+    <PackageVersion Include="Cake.Frosting" Version="5.0.0" />
     <PackageVersion Include="Cake.Frosting.Git" Version="4.0.0" />
     <PackageVersion Include="Cake.Http" Version="4.0.0" />
     <PackageVersion Include="Cake.Incubator" Version="8.0.0" />
diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs
index 0af521392e..6a21c36e31 100644
--- a/build/common/Utilities/Constants.cs
+++ b/build/common/Utilities/Constants.cs
@@ -6,9 +6,8 @@ public static class Constants
     public const string RepoOwner = "GitTools";
     public const string Repository = "GitVersion";
 
-    public const string VersionCurrent = "6.0";
     public const string VersionLatest = "8.0";
-    public static readonly string[] DotnetVersions = [VersionCurrent, VersionLatest];
+    public static readonly string[] DotnetVersions = [VersionLatest, "9.0"];
 
     public const string DefaultBranch = "main";
     public const string DefaultConfiguration = "Release";
diff --git a/build/docker/Tasks/DockerHubReadmePublish.cs b/build/docker/Tasks/DockerHubReadmePublish.cs
index 9245683370..36a3b3390f 100644
--- a/build/docker/Tasks/DockerHubReadmePublish.cs
+++ b/build/docker/Tasks/DockerHubReadmePublish.cs
@@ -15,7 +15,7 @@ public class DockerHubReadmePublishInternal : AsyncFrostingTask<BuildContext>
 {
     public override bool ShouldRun(BuildContext context)
     {
-        var shouldRun = false;
+        var shouldRun = true;
         if (context.DockerRegistry == DockerRegistry.DockerHub)
         {
             shouldRun &= context.ShouldRun(context.IsStableRelease, $"{nameof(DockerHubReadmePublish)} works only for tagged releases.");
diff --git a/docs/input/docs/reference/build-servers/bitbucket-pipelines.md b/docs/input/docs/reference/build-servers/bitbucket-pipelines.md
index 8218605144..f2e91f83db 100644
--- a/docs/input/docs/reference/build-servers/bitbucket-pipelines.md
+++ b/docs/input/docs/reference/build-servers/bitbucket-pipelines.md
@@ -16,7 +16,7 @@ in your build step.
 An example pipeline is shown below:
 
 ```yml
-image: mcr.microsoft.com/dotnet/sdk:6.0
+image: mcr.microsoft.com/dotnet/sdk:8.0
 
 clone:
   depth: full
@@ -50,7 +50,7 @@ If you want to share the text file across multiple build steps, then you will ne
 is shown below:
 
 ```yml
-image: mcr.microsoft.com/dotnet/sdk:6.0
+image: mcr.microsoft.com/dotnet/sdk:8.0
 
 clone:
   depth: full
diff --git a/docs/input/docs/reference/modes/continuous-deployment.md b/docs/input/docs/reference/modes/continuous-deployment.md
index d393f299ec..88d7f7887e 100644
--- a/docs/input/docs/reference/modes/continuous-deployment.md
+++ b/docs/input/docs/reference/modes/continuous-deployment.md
@@ -23,7 +23,7 @@ to deploy on production. This means that GitVersion will build
 * 1.1.0
 * 1.1.1
 
-Tags are required in this mode to communicate when the deployement happens on production.
+Tags are required in this mode to communicate when the deployment happens on production.
 
 ## Resources
 
diff --git a/docs/input/docs/reference/version-increments.md b/docs/input/docs/reference/version-increments.md
index 7dd4f83f82..3098cad889 100644
--- a/docs/input/docs/reference/version-increments.md
+++ b/docs/input/docs/reference/version-increments.md
@@ -83,11 +83,6 @@ If the incrementing `mode` is set to `MergeMessageOnly` you can add this
 information when merging a pull request. This prevents commits within a PR to
 bump the version number.
 
-One thing to be aware of: If the current version is an alpha-version (i.e.
-`0.x.y`.), attempting to bump the major version will merely bump the minor (eg
-from `0.2.0` to `0.3.0` instead of `1.0.0`). Once the current version is greater
-than `1.0.0`, bumping the major version works as expected.
-
 #### Conventional commit messages
 
 If you want to use the [Conventional Commits][conventional-commits] standard,
diff --git a/global.json b/global.json
index 7806149646..7b200833ee 100644
--- a/global.json
+++ b/global.json
@@ -5,6 +5,6 @@
     "src"
   ],
   "sdk": {
-    "version": "9.0.100"
+    "version": "9.0.101"
   }
 }
diff --git a/new-cli/.run/Calculate.run.xml b/new-cli/.run/Calculate.run.xml
index 7af3dd5395..018cb7f4fc 100644
--- a/new-cli/.run/Calculate.run.xml
+++ b/new-cli/.run/Calculate.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Calculate" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net8.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="@docs/calculate.rsp" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 107d2fe60d..4e0be82dd7 100644
--- a/new-cli/.run/Config Help.run.xml	
+++ b/new-cli/.run/Config Help.run.xml	
@@ -1,6 +1,6 @@
 <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/net8.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.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" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 4a26c6190d..f188a379c1 100644
--- a/new-cli/.run/Config Init.run.xml	
+++ b/new-cli/.run/Config Init.run.xml	
@@ -1,6 +1,6 @@
 <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/net8.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.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" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 d2361cc5b1..72e1fdcd29 100644
--- a/new-cli/.run/Config Show.run.xml	
+++ b/new-cli/.run/Config Show.run.xml	
@@ -1,6 +1,6 @@
 <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/net8.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.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" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 d4f4a02193..1baa8e5ef1 100644
--- a/new-cli/.run/Help.run.xml
+++ b/new-cli/.run/Help.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Help" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net8.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="@docs/help.rsp" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 6855c15695..f77ee611de 100644
--- a/new-cli/.run/Normalize.run.xml
+++ b/new-cli/.run/Normalize.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Normalize" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net8.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="@docs/normalize.rsp" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 6564e89e4c..514f75ccfe 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/net8.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.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,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/new-cli/.run/Output Help.run.xml b/new-cli/.run/Output Help.run.xml
index 061fc9a7cb..eb86159ea7 100644
--- a/new-cli/.run/Output Help.run.xml	
+++ b/new-cli/.run/Output Help.run.xml	
@@ -1,6 +1,6 @@
 <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/net8.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.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" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 3893cef93b..23976608fd 100644
--- a/new-cli/.run/Output Project.run.xml	
+++ b/new-cli/.run/Output Project.run.xml	
@@ -1,6 +1,6 @@
 <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/net8.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.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" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 514e150f52..7c35b9079a 100644
--- a/new-cli/.run/Output Wix.run.xml	
+++ b/new-cli/.run/Output Wix.run.xml	
@@ -1,6 +1,6 @@
 <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/net8.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.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" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 df9daa2fe8..cba78f023e 100644
--- a/new-cli/.run/Tester.run.xml
+++ b/new-cli/.run/Tester.run.xml
@@ -1,8 +1,8 @@
 <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/net8.0/gv" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Core.Tester/bin/Debug/net9.0/gv" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/GitVersion.Core.Tester/bin/Debug/net8.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/GitVersion.Core.Tester/bin/Debug/net9.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 af8feac392..1c5607e906 100644
--- a/new-cli/.run/Version.run.xml
+++ b/new-cli/.run/Version.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Version" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net8.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Cli/bin/Debug/net9.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="@docs/version.rsp" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/new-cli/Directory.Build.props b/new-cli/Directory.Build.props
index ea7d0c9db2..88b7cf62da 100644
--- a/new-cli/Directory.Build.props
+++ b/new-cli/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <RootNamespace>GitVersion</RootNamespace>
 
         <LangVersion>latest</LangVersion>
diff --git a/new-cli/Directory.Packages.props b/new-cli/Directory.Packages.props
index 7421cb3f91..954cffd0ea 100644
--- a/new-cli/Directory.Packages.props
+++ b/new-cli/Directory.Packages.props
@@ -9,18 +9,18 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-    <PackageVersion Include="Polly" Version="8.4.2" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Polly" Version="8.5.0" />
     <PackageVersion Include="Roslynator.Analyzers" Version="4.12.9" />
     <PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.12.9" />
     <!-- specific packages -->
-    <PackageVersion Include="Scriban" Version="5.11.0" />
+    <PackageVersion Include="Scriban" Version="5.12.0" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageVersion Include="Serilog.Sinks.Map" Version="2.0.0" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24528.1" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/schemas/6.1/GitVersion.configuration.json b/schemas/6.1/GitVersion.configuration.json
new file mode 100644
index 0000000000..affb98d33e
--- /dev/null
+++ b/schemas/6.1/GitVersion.configuration.json
@@ -0,0 +1,394 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://gitversion.net/schemas/6.1/GitVersion.configuration.json",
+  "title": "GitVersion Configuration (6.1)",
+  "description": "GitVersion configuration schema (6.1)",
+  "type": "object",
+  "properties": {
+    "assembly-file-versioning-format": {
+      "description": "Specifies the format of AssemblyFileVersion and overwrites the value of assembly-file-versioning-scheme.",
+      "type": "string"
+    },
+    "assembly-file-versioning-scheme": {
+      "description": "The scheme to use when setting AssemblyFileVersion attribute. Can be 'MajorMinorPatchTag', 'MajorMinorPatch', 'MajorMinor', 'Major', 'None'. Defaults to 'MajorMinorPatch'.",
+      "default": "MajorMinorPatch",
+      "enum": [
+        "MajorMinorPatchTag",
+        "MajorMinorPatch",
+        "MajorMinor",
+        "Major",
+        "None"
+      ]
+    },
+    "assembly-informational-format": {
+      "description": "Specifies the format of AssemblyInformationalVersion. Defaults to '{InformationalVersion}'.",
+      "default": "'{InformationalVersion}'",
+      "type": "string"
+    },
+    "assembly-versioning-format": {
+      "description": "Specifies the format of AssemblyVersion and overwrites the value of assembly-versioning-scheme.",
+      "type": "string"
+    },
+    "assembly-versioning-scheme": {
+      "description": "The scheme to use when setting AssemblyVersion attribute. Can be 'MajorMinorPatchTag', 'MajorMinorPatch', 'MajorMinor', 'Major', 'None'. Defaults to 'MajorMinorPatch'.",
+      "default": "MajorMinorPatch",
+      "enum": [
+        "MajorMinorPatchTag",
+        "MajorMinorPatch",
+        "MajorMinor",
+        "Major",
+        "None"
+      ]
+    },
+    "branches": {
+      "description": "The header for all the individual branch configuration.",
+      "type": "object",
+      "additionalProperties": {
+        "$ref": "#/$defs/branchConfiguration"
+      }
+    },
+    "commit-date-format": {
+      "description": "The format to use when calculating the commit date. Defaults to 'yyyy-MM-dd'. See [Standard Date and Time Format Strings](https://learn.microsoft.com/en-us/dotnet/standard/base-types/standard-date-and-time-format-strings) and [Custom Date and Time Format Strings](https://learn.microsoft.com/en-us/dotnet/standard/base-types/standard-date-and-time-format-strings).",
+      "default": "yyyy-MM-dd",
+      "type": "string"
+    },
+    "commit-message-incrementing": {
+      "$ref": "#/$defs/nullableOfCommitMessageIncrementMode"
+    },
+    "mode": {
+      "$ref": "#/$defs/nullableOfDeploymentMode"
+    },
+    "ignore": {
+      "description": "The header property for the ignore configuration.",
+      "type": "object",
+      "properties": {
+        "commits-before": {
+          "$ref": "#/$defs/string3"
+        },
+        "sha": {
+          "$ref": "#/$defs/hashSetOfString2"
+        }
+      }
+    },
+    "increment": {
+      "$ref": "#/$defs/incrementStrategy"
+    },
+    "is-main-branch": {
+      "$ref": "#/$defs/nullableOfBoolean"
+    },
+    "is-release-branch": {
+      "$ref": "#/$defs/nullableOfBoolean1"
+    },
+    "is-source-branch-for": {
+      "$ref": "#/$defs/hashSetOfString"
+    },
+    "label": {
+      "$ref": "#/$defs/string"
+    },
+    "label-number-pattern": {
+      "$ref": "#/$defs/string1"
+    },
+    "major-version-bump-message": {
+      "format": "regex",
+      "description": "The regular expression to match commit messages with to perform a major version increment. Defaults to '\\+semver:\\s?(breaking|major)'",
+      "default": "\\+semver:\\s?(breaking|major)",
+      "type": "string"
+    },
+    "merge-message-formats": {
+      "description": "Custom merge message formats to enable identification of merge messages that do not follow the built-in conventions.",
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
+    "minor-version-bump-message": {
+      "format": "regex",
+      "description": "The regular expression to match commit messages with to perform a minor version increment. Defaults to '\\+semver:\\s?(feature|minor)'",
+      "default": "\\+semver:\\s?(feature|minor)",
+      "type": "string"
+    },
+    "next-version": {
+      "description": "Allows you to bump the next version explicitly. Useful for bumping main or a feature branch with breaking changes",
+      "type": "string"
+    },
+    "no-bump-message": {
+      "format": "regex",
+      "description": "Used to tell GitVersion not to increment when in Mainline development mode. Defaults to '\\+semver:\\s?(none|skip)'",
+      "default": "\\+semver:\\s?(none|skip)",
+      "type": "string"
+    },
+    "patch-version-bump-message": {
+      "format": "regex",
+      "description": "The regular expression to match commit messages with to perform a patch version increment. Defaults to '\\+semver:\\s?(fix|patch)'",
+      "default": "\\+semver:\\s?(fix|patch)",
+      "type": "string"
+    },
+    "pre-release-weight": {
+      "$ref": "#/$defs/nullableOfInt32"
+    },
+    "prevent-increment": {
+      "$ref": "#/$defs/preventIncrementConfiguration"
+    },
+    "regex": {
+      "$ref": "#/$defs/string2"
+    },
+    "semantic-version-format": {
+      "description": "Specifies the semantic version format that is used when parsing the string. Can be 'Strict' or 'Loose'. Defaults to 'Strict'.",
+      "default": "Strict",
+      "enum": [
+        "Strict",
+        "Loose"
+      ]
+    },
+    "source-branches": {
+      "$ref": "#/$defs/hashSetOfString1"
+    },
+    "tag-prefix": {
+      "format": "regex",
+      "description": "A regular expression which is used to trim Git tags before processing. Defaults to '[vV]?'",
+      "default": "[vV]?",
+      "type": "string"
+    },
+    "tag-pre-release-weight": {
+      "description": "The pre-release weight in case of tagged commits. Defaults to 60000.",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "track-merge-message": {
+      "$ref": "#/$defs/nullableOfBoolean4"
+    },
+    "track-merge-target": {
+      "$ref": "#/$defs/nullableOfBoolean5"
+    },
+    "tracks-release-branches": {
+      "$ref": "#/$defs/nullableOfBoolean6"
+    },
+    "update-build-number": {
+      "description": "Whether to update the build number in the project file. Defaults to true.",
+      "default": "true",
+      "type": "boolean"
+    },
+    "version-in-branch-pattern": {
+      "format": "regex",
+      "description": "A regular expression which is used to determine the version number in the branch name or commit message (e.g., v1.0.0-LTS). Defaults to '(?<version>[vV]?\\d+(\\.\\d+)?(\\.\\d+)?).*'.",
+      "default": "(?<version>[vV]?\\d+(\\.\\d+)?(\\.\\d+)?).*",
+      "type": "string"
+    },
+    "strategies": {
+      "description": "Specifies which version strategies (one or more) will be used to determine the next version. Following values are available: 'ConfiguredNextVersion', 'MergeMessage', 'TaggedCommit', 'TrackReleaseBranches', 'VersionInBranchName' and 'Mainline'.",
+      "type": "array",
+      "items": {
+        "description": "Specifies which version strategies (one or more) will be used to determine the next version. Following values are available: 'ConfiguredNextVersion', 'MergeMessage', 'TaggedCommit', 'TrackReleaseBranches', 'VersionInBranchName' and 'Mainline'.",
+        "enum": [
+          "None",
+          "Fallback",
+          "ConfiguredNextVersion",
+          "MergeMessage",
+          "TaggedCommit",
+          "TrackReleaseBranches",
+          "VersionInBranchName",
+          "Mainline"
+        ]
+      }
+    },
+    "workflow": {
+      "description": "The base template of the configuration to use. Possible values are: 'GitFlow/v1' or 'GitHubFlow/v1'",
+      "type": "string"
+    }
+  },
+  "$defs": {
+    "branchConfiguration": {
+      "type": "object",
+      "properties": {
+        "commit-message-incrementing": {
+          "$ref": "#/$defs/nullableOfCommitMessageIncrementMode"
+        },
+        "mode": {
+          "$ref": "#/$defs/nullableOfDeploymentMode"
+        },
+        "increment": {
+          "$ref": "#/$defs/incrementStrategy"
+        },
+        "is-main-branch": {
+          "$ref": "#/$defs/nullableOfBoolean"
+        },
+        "is-release-branch": {
+          "$ref": "#/$defs/nullableOfBoolean1"
+        },
+        "is-source-branch-for": {
+          "$ref": "#/$defs/hashSetOfString"
+        },
+        "label": {
+          "$ref": "#/$defs/string"
+        },
+        "label-number-pattern": {
+          "$ref": "#/$defs/string1"
+        },
+        "pre-release-weight": {
+          "$ref": "#/$defs/nullableOfInt32"
+        },
+        "prevent-increment": {
+          "$ref": "#/$defs/preventIncrementConfiguration"
+        },
+        "regex": {
+          "$ref": "#/$defs/string2"
+        },
+        "source-branches": {
+          "$ref": "#/$defs/hashSetOfString1"
+        },
+        "track-merge-message": {
+          "$ref": "#/$defs/nullableOfBoolean4"
+        },
+        "track-merge-target": {
+          "$ref": "#/$defs/nullableOfBoolean5"
+        },
+        "tracks-release-branches": {
+          "$ref": "#/$defs/nullableOfBoolean6"
+        }
+      }
+    },
+    "nullableOfCommitMessageIncrementMode": {
+      "description": "Sets whether it should be possible to increment the version with special syntax in the commit message. Can be 'Disabled', 'Enabled' or 'MergeMessageOnly'.",
+      "enum": [
+        "Enabled",
+        "Disabled",
+        "MergeMessageOnly"
+      ]
+    },
+    "nullableOfDeploymentMode": {
+      "description": "The deployment mode for this branch. Can be 'ManualDeployment', 'ContinuousDelivery', 'ContinuousDeployment'.",
+      "enum": [
+        "ManualDeployment",
+        "ContinuousDelivery",
+        "ContinuousDeployment"
+      ]
+    },
+    "incrementStrategy": {
+      "description": "The increment strategy for this branch. Can be 'Inherit', 'Patch', 'Minor', 'Major', 'None'.",
+      "enum": [
+        "None",
+        "Major",
+        "Minor",
+        "Patch",
+        "Inherit"
+      ]
+    },
+    "nullableOfBoolean": {
+      "description": "When using Mainline mode, this indicates that this branch is a mainline. By default main and support/* are mainlines.",
+      "type": [
+        "boolean",
+        "null"
+      ]
+    },
+    "nullableOfBoolean1": {
+      "description": "Indicates this branch configuration represents a release branch in GitFlow.",
+      "type": [
+        "boolean",
+        "null"
+      ]
+    },
+    "hashSetOfString": {
+      "description": "The branches that this branch is a source branch.",
+      "type": "array",
+      "items": {
+        "description": "The branches that this branch is a source branch.",
+        "type": "string"
+      }
+    },
+    "string": {
+      "description": "The label to use for this branch. Use the value {BranchName} or similar as a placeholder to insert a named capture group from RegularExpression (fx. the branch name).",
+      "type": "string"
+    },
+    "string1": {
+      "format": "regex",
+      "description": "The regular expression pattern to use to extract the number from the branch name. Defaults to '[/-](?<number>\\d+)'.",
+      "default": "[/-](?<number>\\d+)",
+      "type": "string"
+    },
+    "nullableOfInt32": {
+      "description": "Provides a way to translate the PreReleaseLabel to a number.",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "preventIncrementConfiguration": {
+      "description": "The prevent increment configuration section.",
+      "type": "object",
+      "properties": {
+        "of-merged-branch": {
+          "$ref": "#/$defs/nullableOfBoolean2"
+        },
+        "when-branch-merged": {
+          "$ref": "#/$defs/nullableOfBoolean2"
+        },
+        "when-current-commit-tagged": {
+          "$ref": "#/$defs/nullableOfBoolean3"
+        }
+      }
+    },
+    "nullableOfBoolean2": {
+      "description": "Prevent increment when branch merged.",
+      "type": [
+        "boolean",
+        "null"
+      ]
+    },
+    "nullableOfBoolean3": {
+      "description": "This branch related property controls the behavior whether to use the tagged (value set to true) or the incremented (value set to false) semantic version. Defaults to true.",
+      "type": [
+        "boolean",
+        "null"
+      ]
+    },
+    "string2": {
+      "format": "regex",
+      "description": "The regular expression pattern to use to match this branch.",
+      "type": "string"
+    },
+    "hashSetOfString1": {
+      "description": "The source branches for this branch.",
+      "type": "array",
+      "items": {
+        "description": "The source branches for this branch.",
+        "type": "string"
+      }
+    },
+    "nullableOfBoolean4": {
+      "description": "This property is a branch related property and gives the user the possibility to control the behavior of whether the merge commit message will be interpreted as a next version or not.",
+      "type": [
+        "boolean",
+        "null"
+      ]
+    },
+    "nullableOfBoolean5": {
+      "description": "Strategy which will look for tagged merge commits directly off the current branch.",
+      "type": [
+        "boolean",
+        "null"
+      ]
+    },
+    "nullableOfBoolean6": {
+      "description": "Indicates this branch configuration represents develop in GitFlow.",
+      "type": [
+        "boolean",
+        "null"
+      ]
+    },
+    "string3": {
+      "format": "date-time",
+      "description": "Commits before this date will be ignored. Format: yyyy-MM-ddTHH:mm:ss.",
+      "type": "string"
+    },
+    "hashSetOfString2": {
+      "description": "A sequence of SHAs to be excluded from the version calculations.",
+      "type": "array",
+      "items": {
+        "description": "A sequence of SHAs to be excluded from the version calculations.",
+        "type": "string"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/6.1/GitVersion.json b/schemas/6.1/GitVersion.json
new file mode 100644
index 0000000000..037e6acbf4
--- /dev/null
+++ b/schemas/6.1/GitVersion.json
@@ -0,0 +1,133 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://gitversion.net/schemas/6.1/GitVersion.json",
+  "title": "GitVersion version variables output",
+  "description": "GitVersion output schema",
+  "type": "object",
+  "properties": {
+    "AssemblySemFileVer": {
+      "description": "Suitable for .NET AssemblyFileVersion. Defaults to Major.Minor.Patch.0.",
+      "type": "string"
+    },
+    "AssemblySemVer": {
+      "description": "Suitable for .NET AssemblyVersion. Defaults to Major.Minor.0.0",
+      "type": "string"
+    },
+    "BranchName": {
+      "description": "The name of the checked out Git branch.",
+      "type": "string"
+    },
+    "BuildMetaData": {
+      "description": "The build metadata, usually representing number of commits since the VersionSourceSha.",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "CommitDate": {
+      "description": "The ISO-8601 formatted date of the commit identified by Sha.",
+      "type": "string"
+    },
+    "CommitsSinceVersionSource": {
+      "description": "The number of commits since the version source.",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "EscapedBranchName": {
+      "description": "Equal to BranchName, but with / replaced with -.",
+      "type": "string"
+    },
+    "FullBuildMetaData": {
+      "description": "The BuildMetaData suffixed with BranchName and Sha.",
+      "type": "string"
+    },
+    "FullSemVer": {
+      "description": "The full, SemVer 2.0 compliant version number.",
+      "type": "string"
+    },
+    "InformationalVersion": {
+      "description": "Suitable for .NET AssemblyInformationalVersion. Defaults to FullSemVer suffixed by FullBuildMetaData.",
+      "type": "string"
+    },
+    "Major": {
+      "description": "The major version. Should be incremented on breaking changes.",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "MajorMinorPatch": {
+      "description": "Major, Minor and Patch joined together, separated by '.'.",
+      "type": "string"
+    },
+    "Minor": {
+      "description": "The minor version. Should be incremented on new features.",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "Patch": {
+      "description": "The patch version. Should be incremented on bug fixes.",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "PreReleaseLabel": {
+      "description": "The pre-release label is the name of the pre-release.",
+      "type": "string"
+    },
+    "PreReleaseLabelWithDash": {
+      "description": "The pre-release label prefixed with a dash.",
+      "type": "string"
+    },
+    "PreReleaseNumber": {
+      "description": "The pre-release number is the number of commits since the last version bump.",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "PreReleaseTag": {
+      "description": "The pre-release tag is the pre-release label suffixed by the PreReleaseNumber.",
+      "type": "string"
+    },
+    "PreReleaseTagWithDash": {
+      "description": "The pre-release tag prefixed with a dash.",
+      "type": "string"
+    },
+    "SemVer": {
+      "description": "The semantic version number, including PreReleaseTagWithDash for pre-release version numbers.",
+      "type": "string"
+    },
+    "Sha": {
+      "description": "The SHA of the Git commit.",
+      "type": "string"
+    },
+    "ShortSha": {
+      "description": "The Sha limited to 7 characters.",
+      "type": "string"
+    },
+    "UncommittedChanges": {
+      "description": "The number of uncommitted changes present in the repository.",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "VersionSourceSha": {
+      "description": "The SHA of the commit used as version source.",
+      "type": "string"
+    },
+    "WeightedPreReleaseNumber": {
+      "description": "A summation of branch specific pre-release-weight and the PreReleaseNumber. Can be used to obtain a monotonically increasing version number across the branches.",
+      "type": [
+        "integer",
+        "null"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/.run/cli (help).run.xml b/src/.run/cli (help).run.xml
index cbce06caa5..38d1df084c 100644
--- a/src/.run/cli (help).run.xml	
+++ b/src/.run/cli (help).run.xml	
@@ -1,6 +1,6 @@
 <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/net8.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net9.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="-help" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 9d94e05847..ef335cde5a 100644
--- a/src/.run/cli (showconfig).run.xml	
+++ b/src/.run/cli (showconfig).run.xml	
@@ -1,6 +1,6 @@
 <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/net8.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net9.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="-showconfig" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.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 563da554e3..023092b8a6 100644
--- a/src/.run/cli (version).run.xml	
+++ b/src/.run/cli (version).run.xml	
@@ -1,6 +1,6 @@
 <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/net8.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net9.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="-version" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/src/.run/cli.run.xml b/src/.run/cli.run.xml
index 9a1566af50..5721110b54 100644
--- a/src/.run/cli.run.xml
+++ b/src/.run/cli.run.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="cli" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net8.0/gitversion" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net9.0/gitversion" />
     <option name="PROGRAM_PARAMETERS" value="-nocache -l console" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net8.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net9.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <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="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/src/.run/schema.run.xml b/src/.run/schema.run.xml
index 35d74cd3e0..78490c7719 100644
--- a/src/.run/schema.run.xml
+++ b/src/.run/schema.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="schema" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Schema/bin/Debug/net8.0/schema" />
-    <option name="PROGRAM_PARAMETERS" value="--OutputDirectory schemas --Version 6.0" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Schema/bin/Debug/net9.0/schema" />
+    <option name="PROGRAM_PARAMETERS" value="--OutputDirectory schemas --Version 6.1" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 27dfc49416..af1ddcba7f 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 
         <EndYear>$([System.DateTime]::Today.Year)</EndYear>
         <Authors>GitTools and Contributors</Authors>
@@ -22,7 +22,7 @@
         <WarningsAsErrors>$(WarningsAsErrors);RS0016;RS0017;RS0022;RS0024;RS0025;RS0026;RS0027</WarningsAsErrors>
 
         <DebugType>embedded</DebugType>
-        <LangVersion>12</LangVersion>
+        <LangVersion>latest</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index cc96645729..7b94376646 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -11,35 +11,35 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.IO.Redist" Version="6.0.1" />
-    <PackageVersion Include="Polly" Version="8.4.2" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.IO.Redist" Version="6.1.0" />
+    <PackageVersion Include="Polly" Version="8.5.0" />
     <PackageVersion Include="Roslynator.Analyzers" Version="4.12.9" />
     <PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.12.9" />
     <!-- specific packages -->
-    <PackageVersion Include="Buildalyzer" Version="7.0.2" />
-    <PackageVersion Include="JsonSchema.Net.Generation" Version="4.5.1" />
+    <PackageVersion Include="Buildalyzer" Version="7.1.0" />
+    <PackageVersion Include="JsonSchema.Net.Generation" Version="4.6.0" />
     <PackageVersion Include="JunitXml.TestLogger" Version="4.1.0" />
-    <PackageVersion Include="MSBuild.ProjectCreation" Version="13.0.0" />
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Build" Version="17.11.4" />
-    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.11.4" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="MSBuild.ProjectCreation" Version="14.0.0" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Build" Version="17.12.6" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="NUnit" Version="4.2.2" />
-    <PackageVersion Include="NUnit.Analyzers" Version="4.3.0" />
+    <PackageVersion Include="NUnit.Analyzers" Version="4.4.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageVersion Include="Shouldly" Version="4.2.1" />
-    <PackageVersion Include="System.Drawing.Common" Version="8.0.10" />
-    <PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.2" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
-    <PackageVersion Include="YamlDotNet" Version="16.2.0" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.0" />
+    <PackageVersion Include="System.Security.Cryptography.Xml" Version="9.0.0" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.0" />
+    <PackageVersion Include="YamlDotNet" Version="16.2.1" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/GitVersion.App.Tests/ArgumentParserTests.cs b/src/GitVersion.App.Tests/ArgumentParserTests.cs
index b8650499c8..6569742bb3 100644
--- a/src/GitVersion.App.Tests/ArgumentParserTests.cs
+++ b/src/GitVersion.App.Tests/ArgumentParserTests.cs
@@ -12,6 +12,7 @@ public class ArgumentParserTests : TestBase
 {
     private IEnvironment environment;
     private IArgumentParser argumentParser;
+    private IFileSystem fileSystem;
 
     [SetUp]
     public void SetUp()
@@ -23,6 +24,7 @@ public void SetUp()
         });
         this.environment = sp.GetRequiredService<IEnvironment>();
         this.argumentParser = sp.GetRequiredService<IArgumentParser>();
+        this.fileSystem = sp.GetRequiredService<IFileSystem>();
     }
 
     [Test]
@@ -337,7 +339,8 @@ public void UpdateAssemblyInfoWithMultipleFilenamesMatchingGlobbing()
         using var file2 = File.Create(assemblyFile2);
 
         var subdir = PathHelper.Combine(repo.RepositoryPath, "subdir");
-        Directory.CreateDirectory(subdir);
+
+        this.fileSystem.CreateDirectory(subdir);
         var assemblyFile3 = PathHelper.Combine(subdir, "LocalAssemblyInfo.cs");
         using var file3 = File.Create(assemblyFile3);
 
@@ -358,7 +361,7 @@ public void UpdateAssemblyInfoWithRelativeFilename()
         using var file = File.Create(assemblyFile);
 
         var targetPath = PathHelper.Combine(repo.RepositoryPath, "subdir1", "subdir2");
-        Directory.CreateDirectory(targetPath);
+        this.fileSystem.CreateDirectory(targetPath);
 
         var arguments = this.argumentParser.ParseArguments($"-targetpath {targetPath} -updateAssemblyInfo ..\\..\\CommonAssemblyInfo.cs");
         arguments.UpdateAssemblyInfo.ShouldBe(true);
diff --git a/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj b/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj
index 0d2f6f3e71..111e288a9f 100644
--- a/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj
+++ b/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj
@@ -19,9 +19,7 @@
         <Compile Include="..\GitVersion.Core.Tests\Helpers\ExecutableHelper.cs" Link="Helpers\ExecutableHelper.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestConsoleAdapter.cs" Link="Helpers\TestConsoleAdapter.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestEnvironment.cs" Link="Helpers\TestEnvironment.cs" />
-        <Compile Include="..\GitVersion.Core.Tests\Helpers\TestFileSystem.cs" Link="Helpers\TestFileSystem.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestLogAppender.cs" Link="Helpers\TestLogAppender.cs" />
-        <Compile Include="..\GitVersion.Core.Tests\Helpers\TestStream.cs" Link="Helpers\TestStream.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestBase.cs" Link="Helpers\TestBase.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\GitVersionCoreTestModule.cs" Link="Helpers\GitVersionCoreTestModule.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Extensions\GitVersionVariablesExtensions.cs" Link="Extensions\GitVersionVariablesExtensions.cs" />
diff --git a/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs b/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs
index 5b05685c41..38678c4987 100644
--- a/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs
+++ b/src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs
@@ -2,30 +2,11 @@
 
 namespace GitVersion.App.Tests;
 
-public class ArgumentBuilder
+public class ArgumentBuilder(string? workingDirectory, string? additionalArguments, string? logFile)
 {
-    public ArgumentBuilder(string? workingDirectory) => this.WorkingDirectory = workingDirectory;
+    public string? WorkingDirectory { get; } = workingDirectory;
 
-    public ArgumentBuilder(string? workingDirectory, string? exec, string? execArgs, string? projectFile, string? projectArgs, string? logFile)
-    {
-        this.WorkingDirectory = workingDirectory;
-        this.exec = exec;
-        this.execArgs = execArgs;
-        this.projectFile = projectFile;
-        this.projectArgs = projectArgs;
-        this.LogFile = logFile;
-    }
-
-    public ArgumentBuilder(string? workingDirectory, string? additionalArguments, string? logFile)
-    {
-        this.WorkingDirectory = workingDirectory;
-        this.additionalArguments = additionalArguments;
-        this.LogFile = logFile;
-    }
-
-    public string? WorkingDirectory { get; }
-
-    public string? LogFile { get; }
+    public string? LogFile { get; } = logFile;
 
     public override string ToString()
     {
@@ -36,39 +17,13 @@ public override string ToString()
             arguments.Append(" /targetpath \"").Append(this.WorkingDirectory).Append('\"');
         }
 
-        if (!this.exec.IsNullOrWhiteSpace())
-        {
-            arguments.Append(" /exec \"").Append(this.exec).Append('\"');
-        }
-
-        if (!this.execArgs.IsNullOrWhiteSpace())
-        {
-            arguments.Append(" /execArgs \"").Append(this.execArgs).Append('\"');
-        }
-
-        if (!this.projectFile.IsNullOrWhiteSpace())
-        {
-            arguments.Append(" /proj \"").Append(this.projectFile).Append('\"');
-        }
-
-        if (!this.projectArgs.IsNullOrWhiteSpace())
-        {
-            arguments.Append(" /projargs \"").Append(this.projectArgs).Append('\"');
-        }
-
         if (!this.LogFile.IsNullOrWhiteSpace())
         {
             arguments.Append(" /l \"").Append(this.LogFile).Append('\"');
         }
 
-        arguments.Append(this.additionalArguments);
+        arguments.Append(additionalArguments);
 
         return arguments.ToString();
     }
-
-    private readonly string? additionalArguments;
-    private readonly string? exec;
-    private readonly string? execArgs;
-    private readonly string? projectArgs;
-    private readonly string? projectFile;
 }
diff --git a/src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs b/src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs
index 2e8aa0e3ae..6e46593bb2 100644
--- a/src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs
+++ b/src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs
@@ -7,20 +7,6 @@ namespace GitVersion.App.Tests;
 
 public static class GitVersionHelper
 {
-    public static ExecutionResults ExecuteIn(string? workingDirectory,
-        string? exec = null,
-        string? execArgs = null,
-        string? projectFile = null,
-        string? projectArgs = null,
-        bool logToFile = true,
-        params KeyValuePair<string, string?>[] environments
-    )
-    {
-        var logFile = logToFile ? PathHelper.Combine(workingDirectory, "log.txt") : null;
-        var args = new ArgumentBuilder(workingDirectory, exec, execArgs, projectFile, projectArgs, logFile);
-        return ExecuteIn(args, environments);
-    }
-
     public static ExecutionResults ExecuteIn(
         string? workingDirectory,
         string? arguments,
diff --git a/src/GitVersion.App/ArgumentParser.cs b/src/GitVersion.App/ArgumentParser.cs
index dc16d9d7ca..7e273f99da 100644
--- a/src/GitVersion.App/ArgumentParser.cs
+++ b/src/GitVersion.App/ArgumentParser.cs
@@ -6,10 +6,15 @@
 
 namespace GitVersion;
 
-internal class ArgumentParser(IEnvironment environment, ICurrentBuildAgent buildAgent, IConsole console, IGlobbingResolver globbingResolver)
+internal class ArgumentParser(IEnvironment environment,
+                              IFileSystem fileSystem,
+                              ICurrentBuildAgent buildAgent,
+                              IConsole console,
+                              IGlobbingResolver globbingResolver)
     : IArgumentParser
 {
     private readonly IEnvironment environment = environment.NotNull();
+    private readonly IFileSystem fileSystem = fileSystem.NotNull();
     private readonly ICurrentBuildAgent buildAgent = buildAgent.NotNull();
     private readonly IConsole console = console.NotNull();
     private readonly IGlobbingResolver globbingResolver = globbingResolver.NotNull();
@@ -97,19 +102,19 @@ public Arguments ParseArguments(string[] commandLineArguments)
         return arguments;
     }
 
-    private static void ValidateConfigurationFile(Arguments arguments)
+    private void ValidateConfigurationFile(Arguments arguments)
     {
         if (arguments.ConfigurationFile.IsNullOrWhiteSpace()) return;
 
         if (Path.IsPathRooted(arguments.ConfigurationFile))
         {
-            if (!File.Exists(arguments.ConfigurationFile)) throw new WarningException($"Could not find config file at '{arguments.ConfigurationFile}'");
+            if (!this.fileSystem.Exists(arguments.ConfigurationFile)) throw new WarningException($"Could not find config file at '{arguments.ConfigurationFile}'");
             arguments.ConfigurationFile = Path.GetFullPath(arguments.ConfigurationFile);
         }
         else
         {
             var configFilePath = Path.GetFullPath(PathHelper.Combine(arguments.TargetPath, arguments.ConfigurationFile));
-            if (!File.Exists(configFilePath)) throw new WarningException($"Could not find config file at '{configFilePath}'");
+            if (!this.fileSystem.Exists(configFilePath)) throw new WarningException($"Could not find config file at '{configFilePath}'");
             arguments.ConfigurationFile = configFilePath;
         }
     }
@@ -161,7 +166,7 @@ private void ParseTargetPath(Arguments arguments, string? name, IReadOnlyList<st
         {
             EnsureArgumentValueCount(values);
             arguments.TargetPath = value;
-            if (!Directory.Exists(value))
+            if (string.IsNullOrWhiteSpace(value) || !this.fileSystem.DirectoryExists(value))
             {
                 this.console.WriteLine($"The working directory '{value}' does not exist.");
             }
diff --git a/src/GitVersion.App/GitVersionExecutor.cs b/src/GitVersion.App/GitVersionExecutor.cs
index 41bc2d8d0b..9510449a5f 100644
--- a/src/GitVersion.App/GitVersionExecutor.cs
+++ b/src/GitVersion.App/GitVersionExecutor.cs
@@ -8,6 +8,7 @@ namespace GitVersion;
 
 internal class GitVersionExecutor(
     ILog log,
+    IFileSystem fileSystem,
     IConsole console,
     IVersionWriter versionWriter,
     IHelpWriter helpWriter,
@@ -21,6 +22,7 @@ internal class GitVersionExecutor(
     : IGitVersionExecutor
 {
     private readonly ILog log = log.NotNull();
+    private readonly IFileSystem fileSystem = fileSystem.NotNull();
     private readonly IConsole console = console.NotNull();
     private readonly IVersionWriter versionWriter = versionWriter.NotNull();
     private readonly IHelpWriter helpWriter = helpWriter.NotNull();
@@ -131,7 +133,7 @@ private bool HandleNonMainCommand(GitVersionOptions gitVersionOptions, out int e
             GitExtensions.DumpGraphLog(logMessage => this.log.Info(logMessage));
         }
 
-        if (!Directory.Exists(workingDirectory))
+        if (!this.fileSystem.DirectoryExists(workingDirectory))
         {
             this.log.Warning($"The working directory '{workingDirectory}' does not exist.");
         }
diff --git a/src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs b/src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs
index 9ece53a3f5..f693649640 100644
--- a/src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs
+++ b/src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs
@@ -285,7 +285,8 @@ public void NoWarnOnGitVersionYmlFile()
 
         this.configurationProvider.ProvideForDirectory(this.repoPath);
 
-        stringLogger.Length.ShouldBe(0);
+        var filePath = PathHelper.Combine(this.repoPath, ConfigurationFileLocator.DefaultFileName);
+        stringLogger.ShouldContain($"Found configuration file at '{filePath}'");
     }
 
     [Test]
diff --git a/src/GitVersion.Configuration.Tests/Configuration/Extensions.cs b/src/GitVersion.Configuration.Tests/Configuration/Extensions.cs
index 96db0f145c..6000db6c6c 100644
--- a/src/GitVersion.Configuration.Tests/Configuration/Extensions.cs
+++ b/src/GitVersion.Configuration.Tests/Configuration/Extensions.cs
@@ -13,6 +13,12 @@ public static IDisposable<string> SetupConfigFile(this IFileSystem fileSystem, s
         }
 
         var fullPath = PathHelper.Combine(path, fileName);
+        var directory = PathHelper.GetDirectoryName(fullPath);
+        if (!fileSystem.DirectoryExists(directory))
+        {
+            fileSystem.CreateDirectory(directory);
+        }
+
         fileSystem.WriteAllText(fullPath, text);
 
         return Disposable.Create(fullPath, () => fileSystem.Delete(fullPath));
diff --git a/src/GitVersion.Configuration/ConfigurationProvider.cs b/src/GitVersion.Configuration/ConfigurationProvider.cs
index daf2fc1a28..cf1a89a74f 100644
--- a/src/GitVersion.Configuration/ConfigurationProvider.cs
+++ b/src/GitVersion.Configuration/ConfigurationProvider.cs
@@ -21,7 +21,7 @@ public IGitVersionConfiguration Provide(IReadOnlyDictionary<object, object?>? ov
     {
         var gitVersionOptions = this.options.Value;
         var workingDirectory = gitVersionOptions.WorkingDirectory;
-        var projectRootDirectory = workingDirectory.FindGitDir()?.WorkingTreeDirectory;
+        var projectRootDirectory = this.fileSystem.FindGitDir(workingDirectory)?.WorkingTreeDirectory;
 
         var configurationFile = this.configFileLocator.GetConfigurationFile(workingDirectory)
                              ?? this.configFileLocator.GetConfigurationFile(projectRootDirectory);
diff --git a/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs b/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs
index 0535fc714e..9fe51feda9 100644
--- a/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs
+++ b/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs
@@ -10,46 +10,18 @@ public class DynamicRepositoryTests : TestBase
 {
     private string? workDirectory;
 
-    private static void ClearReadOnly(DirectoryInfo parentDirectory)
-    {
-        parentDirectory.Attributes = FileAttributes.Normal;
-        foreach (var fi in parentDirectory.GetFiles())
-        {
-            fi.Attributes = FileAttributes.Normal;
-        }
-        foreach (var di in parentDirectory.GetDirectories())
-        {
-            ClearReadOnly(di);
-        }
-    }
+    [SetUp]
+    public void SetUp() => this.workDirectory = PathHelper.Combine(Path.GetTempPath(), "GV");
 
-    [OneTimeSetUp]
-    public void CreateTemporaryRepository()
-    {
-        // Note: we can't use guid because paths will be too long
-        this.workDirectory = PathHelper.Combine(Path.GetTempPath(), "GV");
-
-        // Clean directory upfront, some build agents are having troubles
-        if (Directory.Exists(this.workDirectory))
-        {
-            var di = new DirectoryInfo(this.workDirectory);
-            ClearReadOnly(di);
-
-            Directory.Delete(this.workDirectory, true);
-        }
-
-        Directory.CreateDirectory(this.workDirectory);
-    }
-
-    [OneTimeTearDown]
-    public void Cleanup()
+    [TearDown]
+    public void TearDown()
     {
     }
 
     // Note: use same name twice to see if changing commits works on same (cached) repository
     [NonParallelizable]
-    [TestCase("GV_main", "https://github.com/GitTools/GitVersion", MainBranch, "efddf2f92c539a9c27f1904d952dcab8fb955f0e", "5.8.2-56")]
     [TestCase("GV_main", "https://github.com/GitTools/GitVersion", MainBranch, "2dc142a4a4df77db61a00d9fb7510b18b3c2c85a", "5.8.2-47")]
+    [TestCase("GV_main", "https://github.com/GitTools/GitVersion", MainBranch, "efddf2f92c539a9c27f1904d952dcab8fb955f0e", "5.8.2-56")]
     public void FindsVersionInDynamicRepo(string name, string url, string targetBranch, string commitId, string expectedFullSemVer)
     {
         var root = PathHelper.Combine(this.workDirectory, name);
@@ -64,14 +36,11 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
                 TargetBranch = targetBranch,
                 CommitId = commitId
             },
-            Settings = { NoFetch = false },
+            Settings = { NoFetch = false, NoCache = true },
             WorkingDirectory = workingDirectory
         };
         var options = Options.Create(gitVersionOptions);
 
-        Directory.CreateDirectory(dynamicDirectory);
-        Directory.CreateDirectory(workingDirectory);
-
         var sp = ConfigureServices(services => services.AddSingleton(options));
 
         sp.DiscoverRepository();
@@ -79,6 +48,10 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
         var gitPreparer = sp.GetRequiredService<IGitPreparer>();
         gitPreparer.Prepare();
 
+        var fileSystem = sp.GetRequiredService<IFileSystem>();
+        fileSystem.CreateDirectory(dynamicDirectory);
+        fileSystem.CreateDirectory(workingDirectory);
+
         var gitVersionCalculator = sp.GetRequiredService<IGitVersionCalculateTool>();
 
         var versionVariables = gitVersionCalculator.CalculateVersionVariables();
diff --git a/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs b/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs
index ebd81f0957..2fea817d8f 100644
--- a/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs
+++ b/src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs
@@ -67,7 +67,7 @@ public void CacheKeyForWorktree()
     {
         using var fixture = new EmptyRepositoryFixture();
         fixture.Repository.MakeACommit();
-        var worktreePath = PathHelper.Combine(Directory.GetParent(fixture.RepositoryPath)?.FullName, Guid.NewGuid().ToString());
+        var worktreePath = GetWorktreePath(fixture);
         try
         {
             // create a branch and a new worktree for it
@@ -395,7 +395,7 @@ public void GetProjectRootDirectoryWorkingDirectoryWithWorktree()
         using var fixture = new EmptyRepositoryFixture();
         fixture.Repository.MakeACommit();
 
-        var worktreePath = PathHelper.Combine(Directory.GetParent(fixture.RepositoryPath)?.FullName, Guid.NewGuid().ToString());
+        var worktreePath = GetWorktreePath(fixture);
         try
         {
             // create a branch and a new worktree for it
@@ -451,7 +451,7 @@ public void GetDotGitDirectoryWorktree()
         using var fixture = new EmptyRepositoryFixture();
         fixture.Repository.MakeACommit();
 
-        var worktreePath = PathHelper.Combine(Directory.GetParent(fixture.RepositoryPath)?.FullName, Guid.NewGuid().ToString());
+        var worktreePath = GetWorktreePath(fixture);
         try
         {
             // create a branch and a new worktree for it
@@ -588,6 +588,12 @@ public void CalculateVersionVariables_ShallowFetch_ThrowException()
         exception?.Message.ShouldBe("Repository is a shallow clone. Git repositories must contain the full history. See https://gitversion.net/docs/reference/requirements#unshallow for more info.");
     }
 
+    private static string GetWorktreePath(EmptyRepositoryFixture fixture)
+    {
+        var worktreePath = PathHelper.Combine(Directory.GetParent(fixture.RepositoryPath)?.FullName, Guid.NewGuid().ToString());
+        return worktreePath;
+    }
+
     private IGitVersionCalculateTool GetGitVersionCalculator(GitVersionOptions gitVersionOptions, ILog? logger = null, IGitRepository? repository = null, IFileSystem? fs = null)
     {
         this.sp = GetServiceProvider(gitVersionOptions, logger, repository, fs);
diff --git a/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs b/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs
index e6410ceb26..755287a94d 100644
--- a/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs
+++ b/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs
@@ -17,7 +17,7 @@ public void RegisterTypes(IServiceCollection services)
         services.AddModule(new GitVersionConfigurationModule());
         services.AddModule(new GitVersionCoreModule());
 
-        services.AddSingleton<IFileSystem, TestFileSystem>();
+        services.AddSingleton<IFileSystem, FileSystem>();
         services.AddSingleton<IEnvironment, TestEnvironment>();
         services.AddSingleton<ILog, NullLog>();
     }
diff --git a/src/GitVersion.Core.Tests/Helpers/TestConsole.cs b/src/GitVersion.Core.Tests/Helpers/TestConsole.cs
index 6484730db2..8a73e0e7db 100644
--- a/src/GitVersion.Core.Tests/Helpers/TestConsole.cs
+++ b/src/GitVersion.Core.Tests/Helpers/TestConsole.cs
@@ -1,3 +1,4 @@
+using GitVersion.Extensions;
 using GitVersion.Helpers;
 using GitVersion.Logging;
 
@@ -12,7 +13,7 @@ public class TestConsole(params string[] responses) : IConsole
 
     public void WriteLine() => this.log.Info(PathHelper.NewLine);
 
-    public void Write(string? msg) => this.log.Info(msg ?? throw new ArgumentNullException(nameof(msg)));
+    public void Write(string? msg) => this.log.Info(msg.NotNull());
 
     public string ReadLine() => this.responses.Dequeue();
 
diff --git a/src/GitVersion.Core.Tests/Helpers/TestFileSystem.cs b/src/GitVersion.Core.Tests/Helpers/TestFileSystem.cs
deleted file mode 100644
index 06a4f74ee4..0000000000
--- a/src/GitVersion.Core.Tests/Helpers/TestFileSystem.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using GitVersion.Helpers;
-
-namespace GitVersion.Core.Tests.Helpers;
-
-public class TestFileSystem : IFileSystem
-{
-    private readonly Dictionary<string, byte[]> fileSystem = new(SysEnv.OSVersion.Platform == PlatformID.Unix ? StringComparer.Ordinal : StringComparer.OrdinalIgnoreCase);
-
-    public void Copy(string from, string to, bool overwrite)
-    {
-        var fromPath = Path.GetFullPath(from);
-        var toPath = Path.GetFullPath(to);
-        if (this.fileSystem.ContainsKey(toPath))
-        {
-            if (overwrite)
-                this.fileSystem.Remove(toPath);
-            else
-                throw new IOException("File already exists");
-        }
-
-        if (!this.fileSystem.TryGetValue(fromPath, out var source))
-            throw new FileNotFoundException($"The source file '{fromPath}' was not found", from);
-
-        this.fileSystem.Add(toPath, source);
-    }
-
-    public void Move(string from, string to)
-    {
-        var fromPath = Path.GetFullPath(from);
-        Copy(from, to, false);
-        this.fileSystem.Remove(fromPath);
-    }
-
-    public bool Exists(string file)
-    {
-        var path = Path.GetFullPath(file);
-        return this.fileSystem.ContainsKey(path);
-    }
-
-    public void Delete(string path)
-    {
-        var fullPath = Path.GetFullPath(path);
-        this.fileSystem.Remove(fullPath);
-    }
-
-    public string ReadAllText(string path)
-    {
-        var fullPath = Path.GetFullPath(path);
-        if (!this.fileSystem.TryGetValue(fullPath, out var content))
-            throw new FileNotFoundException($"The file '{fullPath}' was not found", fullPath);
-
-        var encoding = EncodingHelper.DetectEncoding(content) ?? Encoding.UTF8;
-        return encoding.GetString(content);
-    }
-
-    public void WriteAllText(string? file, string fileContents)
-    {
-        var path = Path.GetFullPath(file ?? throw new ArgumentNullException(nameof(file)));
-        var encoding = fileSystem.TryGetValue(path, out var value) ? EncodingHelper.DetectEncoding(value) ?? Encoding.UTF8
-            : Encoding.UTF8;
-        WriteAllText(path, fileContents, encoding);
-    }
-
-    public void WriteAllText(string? file, string fileContents, Encoding encoding)
-    {
-        var path = Path.GetFullPath(file ?? throw new ArgumentNullException(nameof(file)));
-        this.fileSystem[path] = encoding.GetBytes(fileContents);
-    }
-
-    public IEnumerable<string> DirectoryEnumerateFiles(string? directory, string searchPattern, SearchOption searchOption) => throw new NotImplementedException();
-
-    public Stream OpenWrite(string path) => new TestStream(path, this);
-
-    public Stream OpenRead(string path)
-    {
-        var fullPath = Path.GetFullPath(path);
-        if (!this.fileSystem.TryGetValue(fullPath, out var content))
-            throw new FileNotFoundException("File not found.", fullPath);
-
-        return new MemoryStream(content);
-    }
-
-    public void CreateDirectory(string path)
-    {
-        var fullPath = Path.GetFullPath(path);
-        this.fileSystem[fullPath] = [];
-    }
-
-    public bool DirectoryExists(string path)
-    {
-        var fullPath = Path.GetFullPath(path);
-        return this.fileSystem.ContainsKey(fullPath);
-    }
-
-    public long GetLastDirectoryWrite(string path) => 1;
-}
diff --git a/src/GitVersion.Core.Tests/Helpers/TestStream.cs b/src/GitVersion.Core.Tests/Helpers/TestStream.cs
deleted file mode 100644
index 836a45474f..0000000000
--- a/src/GitVersion.Core.Tests/Helpers/TestStream.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-namespace GitVersion.Core.Tests.Helpers;
-
-public class TestStream(string path, IFileSystem testFileSystem) : Stream
-{
-    private readonly MemoryStream underlying = new();
-
-    protected override void Dispose(bool disposing)
-    {
-        Flush();
-        base.Dispose(disposing);
-    }
-
-    public override void Flush()
-    {
-        this.underlying.Position = 0;
-        var readToEnd = new StreamReader(this.underlying).ReadToEnd();
-        testFileSystem.WriteAllText(path, readToEnd);
-    }
-
-    public override long Seek(long offset, SeekOrigin origin) => this.underlying.Seek(offset, origin);
-
-    public override void SetLength(long value) => this.underlying.SetLength(value);
-
-    public override int Read(byte[] buffer, int offset, int count) => this.underlying.Read(buffer, offset, count);
-
-    public override void Write(byte[] buffer, int offset, int count) => this.underlying.Write(buffer, offset, count);
-
-    public override bool CanRead => this.underlying.CanRead;
-    public override bool CanSeek => this.underlying.CanSeek;
-    public override bool CanWrite => this.underlying.CanWrite;
-    public override long Length => this.underlying.Length;
-
-    public override long Position
-    {
-        get => this.underlying.Position;
-        set => this.underlying.Position = value;
-    }
-}
diff --git a/src/GitVersion.Core/Core/Abstractions/IFileSystem.cs b/src/GitVersion.Core/Core/Abstractions/IFileSystem.cs
index 32e4646809..7678d8c373 100644
--- a/src/GitVersion.Core/Core/Abstractions/IFileSystem.cs
+++ b/src/GitVersion.Core/Core/Abstractions/IFileSystem.cs
@@ -9,10 +9,13 @@ public interface IFileSystem
     string ReadAllText(string path);
     void WriteAllText(string? file, string fileContents);
     void WriteAllText(string? file, string fileContents, Encoding encoding);
-    IEnumerable<string> DirectoryEnumerateFiles(string? directory, string searchPattern, SearchOption searchOption);
     Stream OpenWrite(string path);
     Stream OpenRead(string path);
     void CreateDirectory(string path);
     bool DirectoryExists(string path);
+    string[] GetFiles(string path);
+    string[] GetDirectories(string path);
+    IEnumerable<string> DirectoryEnumerateFiles(string? directory, string searchPattern, SearchOption searchOption);
     long GetLastDirectoryWrite(string path);
+    long GetLastWriteTime(string path);
 }
diff --git a/src/GitVersion.Core/Core/FileSystem.cs b/src/GitVersion.Core/Core/FileSystem.cs
index d3c41b59ea..1187b06528 100644
--- a/src/GitVersion.Core/Core/FileSystem.cs
+++ b/src/GitVersion.Core/Core/FileSystem.cs
@@ -24,20 +24,11 @@ public void WriteAllText(string? file, string fileContents)
 
     public void WriteAllText(string? file, string fileContents, Encoding encoding)
     {
-        if (string.IsNullOrEmpty(file))
-            throw new ArgumentNullException(nameof(file));
+        ArgumentException.ThrowIfNullOrWhiteSpace(file);
 
         File.WriteAllText(file, fileContents, encoding);
     }
 
-    public IEnumerable<string> DirectoryEnumerateFiles(string? directory, string searchPattern, SearchOption searchOption)
-    {
-        if (string.IsNullOrEmpty(directory))
-            throw new ArgumentNullException(nameof(directory));
-
-        return Directory.EnumerateFiles(directory, searchPattern, searchOption);
-    }
-
     public Stream OpenWrite(string path) => File.OpenWrite(path);
 
     public Stream OpenRead(string path) => File.OpenRead(path);
@@ -46,6 +37,19 @@ public IEnumerable<string> DirectoryEnumerateFiles(string? directory, string sea
 
     public bool DirectoryExists(string path) => Directory.Exists(path);
 
+    public string[] GetFiles(string path) => Directory.GetFiles(path);
+
+    public string[] GetDirectories(string path) => Directory.GetDirectories(path);
+
+    public IEnumerable<string> DirectoryEnumerateFiles(string? directory, string searchPattern, SearchOption searchOption)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(directory);
+
+        return Directory.EnumerateFiles(directory, searchPattern, searchOption);
+    }
+
+    public long GetLastWriteTime(string path) => File.GetLastWriteTime(path).Ticks;
+
     public long GetLastDirectoryWrite(string path) => new DirectoryInfo(path)
         .GetDirectories("*.*", SearchOption.AllDirectories)
         .Select(d => d.LastWriteTimeUtc)
diff --git a/src/GitVersion.Core/Core/GitPreparer.cs b/src/GitVersion.Core/Core/GitPreparer.cs
index e33d236d4d..f159e05a0d 100644
--- a/src/GitVersion.Core/Core/GitPreparer.cs
+++ b/src/GitVersion.Core/Core/GitPreparer.cs
@@ -10,6 +10,7 @@ namespace GitVersion;
 
 internal class GitPreparer(
     ILog log,
+    IFileSystem fileSystem,
     IEnvironment environment,
     ICurrentBuildAgent buildAgent,
     IOptions<GitVersionOptions> options,
@@ -19,6 +20,7 @@ internal class GitPreparer(
     : IGitPreparer
 {
     private readonly ILog log = log.NotNull();
+    private readonly IFileSystem fileSystem = fileSystem.NotNull();
     private readonly IEnvironment environment = environment.NotNull();
     private readonly IMutatingGitRepository repository = repository.NotNull();
     private readonly IOptions<GitVersionOptions> options = options.NotNull();
@@ -112,7 +114,11 @@ private void CreateDynamicRepository(string? targetBranch)
         {
             var gitVersionOptions = this.options.Value;
             var authentication = gitVersionOptions.AuthenticationInfo;
-            if (!Directory.Exists(gitDirectory))
+            if (string.IsNullOrWhiteSpace(gitDirectory))
+            {
+                throw new("Dynamic Git repositories should have a path specified");
+            }
+            if (!this.fileSystem.DirectoryExists(gitDirectory))
             {
                 CloneRepository(gitVersionOptions.RepositoryInfo.TargetUrl, gitDirectory, authentication);
             }
diff --git a/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs b/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs
index caa4032bdd..b10b2b9ae8 100644
--- a/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs
+++ b/src/GitVersion.Core/Extensions/ConfigurationExtensions.cs
@@ -123,24 +123,24 @@ public static bool IsReleaseBranch(this IGitVersionConfiguration configuration,
         return label;
     }
 
-    public static (string GitDirectory, string WorkingTreeDirectory)? FindGitDir(this string path)
+    public static (string GitDirectory, string WorkingTreeDirectory)? FindGitDir(this IFileSystem fileSystem, string path)
     {
         string? startingDir = path;
         while (startingDir is not null)
         {
             var dirOrFilePath = PathHelper.Combine(startingDir, ".git");
-            if (Directory.Exists(dirOrFilePath))
+            if (fileSystem.DirectoryExists(dirOrFilePath))
             {
                 return (dirOrFilePath, Path.GetDirectoryName(dirOrFilePath)!);
             }
 
-            if (File.Exists(dirOrFilePath))
+            if (fileSystem.Exists(dirOrFilePath))
             {
                 string? relativeGitDirPath = ReadGitDirFromFile(dirOrFilePath);
                 if (!string.IsNullOrWhiteSpace(relativeGitDirPath))
                 {
                     var fullGitDirPath = Path.GetFullPath(PathHelper.Combine(startingDir, relativeGitDirPath));
-                    if (Directory.Exists(fullGitDirPath))
+                    if (fileSystem.DirectoryExists(fullGitDirPath))
                     {
                         return (fullGitDirPath, Path.GetDirectoryName(dirOrFilePath)!);
                     }
diff --git a/src/GitVersion.Core/Extensions/EnumerableExtensions.cs b/src/GitVersion.Core/Extensions/EnumerableExtensions.cs
index 085de0f618..764fb89008 100644
--- a/src/GitVersion.Core/Extensions/EnumerableExtensions.cs
+++ b/src/GitVersion.Core/Extensions/EnumerableExtensions.cs
@@ -4,12 +4,11 @@ public static class EnumerableExtensions
 {
     public static T? OnlyOrDefault<T>(this IEnumerable<T> source)
     {
-        switch (source)
+        ArgumentNullException.ThrowIfNull(source);
+
+        if (source is IList<T> { Count: 1 } list)
         {
-            case null:
-                throw new ArgumentNullException(nameof(source));
-            case IList<T> { Count: 1 } list:
-                return list[0];
+            return list[0];
         }
 
         using var e = source.GetEnumerator();
@@ -21,10 +20,7 @@ public static class EnumerableExtensions
 
     public static T SingleOfType<T>(this IEnumerable source)
     {
-        if (source == null)
-        {
-            throw new ArgumentNullException(nameof(source));
-        }
+        ArgumentNullException.ThrowIfNull(source);
 
         return source.OfType<T>().Single();
     }
diff --git a/src/GitVersion.Core/Helpers/PathHelper.cs b/src/GitVersion.Core/Helpers/PathHelper.cs
index b89918ed75..3c9d853a1d 100644
--- a/src/GitVersion.Core/Helpers/PathHelper.cs
+++ b/src/GitVersion.Core/Helpers/PathHelper.cs
@@ -26,6 +26,13 @@ public static string GetTempPath()
 
     public static string GetRepositoryTempPath() => Combine(GetTempPath(), "TestRepositories", Guid.NewGuid().ToString());
 
+    public static string GetDirectoryName(string? path)
+    {
+        ArgumentNullException.ThrowIfNull(path, nameof(path));
+
+        return Path.GetDirectoryName(path)!;
+    }
+
     public static string GetFullPath(string? path)
     {
         ArgumentNullException.ThrowIfNull(path, nameof(path));
@@ -35,8 +42,8 @@ public static string GetFullPath(string? path)
 
     public static string Combine(string? path1, string? path2)
     {
-        if (path1 == null || path2 == null)
-            throw new ArgumentNullException((path1 == null) ? nameof(path1) : nameof(path2));
+        ArgumentException.ThrowIfNullOrWhiteSpace(path1);
+        ArgumentException.ThrowIfNullOrWhiteSpace(path2);
 
         return Path.Combine(path1, path2);
     }
@@ -50,16 +57,19 @@ public static string Combine(string? path1)
 
     public static string Combine(string? path1, string? path2, string? path3)
     {
-        if (path1 == null || path2 == null || path3 == null)
-            throw new ArgumentNullException((path1 == null) ? nameof(path1) : (path2 == null) ? nameof(path2) : nameof(path3));
+        ArgumentException.ThrowIfNullOrWhiteSpace(path1);
+        ArgumentException.ThrowIfNullOrWhiteSpace(path2);
+        ArgumentException.ThrowIfNullOrWhiteSpace(path3);
 
         return Path.Combine(path1, path2, path3);
     }
 
     public static string Combine(string? path1, string? path2, string? path3, string? path4)
     {
-        if (path1 == null || path2 == null || path3 == null || path4 == null)
-            throw new ArgumentNullException((path1 == null) ? nameof(path1) : (path2 == null) ? nameof(path2) : (path3 == null) ? nameof(path3) : nameof(path4));
+        ArgumentException.ThrowIfNullOrWhiteSpace(path1);
+        ArgumentException.ThrowIfNullOrWhiteSpace(path2);
+        ArgumentException.ThrowIfNullOrWhiteSpace(path3);
+        ArgumentException.ThrowIfNullOrWhiteSpace(path4);
 
         return Path.Combine(path1, path2, path3, path4);
     }
diff --git a/src/GitVersion.Core/Helpers/StringFormatWith.cs b/src/GitVersion.Core/Helpers/StringFormatWith.cs
index c6732c24c5..5aa51b5ae0 100644
--- a/src/GitVersion.Core/Helpers/StringFormatWith.cs
+++ b/src/GitVersion.Core/Helpers/StringFormatWith.cs
@@ -30,15 +30,8 @@ internal static class StringFormatWithExtension
     /// </example>
     public static string FormatWith<T>(this string template, T? source, IEnvironment environment)
     {
-        if (template is null)
-        {
-            throw new ArgumentNullException(nameof(template));
-        }
-
-        if (source is null)
-        {
-            throw new ArgumentNullException(nameof(source));
-        }
+        ArgumentNullException.ThrowIfNull(template);
+        ArgumentNullException.ThrowIfNull(source);
 
         foreach (Match match in RegexPatterns.Common.ExpandTokensRegex.Matches(template).Cast<Match>())
         {
diff --git a/src/GitVersion.Core/Logging/LogExtensions.cs b/src/GitVersion.Core/Logging/LogExtensions.cs
index 77dff958a6..56d83b3321 100644
--- a/src/GitVersion.Core/Logging/LogExtensions.cs
+++ b/src/GitVersion.Core/Logging/LogExtensions.cs
@@ -96,10 +96,7 @@ private static void Write(this ILog log, LogLevel level, LogAction? logAction)
 
     private static IDisposable WithVerbosity(this ILog log, Verbosity verbosity)
     {
-        if (log == null)
-        {
-            throw new ArgumentNullException(nameof(log));
-        }
+        ArgumentNullException.ThrowIfNull(log);
         var lastVerbosity = log.Verbosity;
         log.Verbosity = verbosity;
         return Disposable.Create(() => log.Verbosity = lastVerbosity);
diff --git a/src/GitVersion.Core/Polyfills/StringSyntaxAttribute.cs b/src/GitVersion.Core/Polyfills/StringSyntaxAttribute.cs
deleted file mode 100644
index f3faee9ed6..0000000000
--- a/src/GitVersion.Core/Polyfills/StringSyntaxAttribute.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-#if !NET7_0_OR_GREATER
-
-// The namespace is important
-namespace System.Diagnostics.CodeAnalysis;
-
-/// <summary>Fake version of the StringSyntaxAttribute, which was introduced in .NET 7</summary>
-[SuppressMessage("ApiDesign", "RS0016:Add public types and members to the declared API")]
-[SuppressMessage("Style", "IDE0060:Remove unused parameter")]
-[AttributeUsage(AttributeTargets.All)]
-public sealed class StringSyntaxAttribute : Attribute
-{
-    /// <summary>The syntax identifier for strings containing composite formats.</summary>
-    public const string CompositeFormat = nameof(CompositeFormat);
-
-    /// <summary>The syntax identifier for strings containing regular expressions.</summary>
-    public const string Regex = nameof(Regex);
-
-    /// <summary>The syntax identifier for strings containing date information.</summary>
-    public const string DateTimeFormat = nameof(DateTimeFormat);
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="StringSyntaxAttribute"/> class.
-    /// </summary>
-    public StringSyntaxAttribute(string syntax)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="StringSyntaxAttribute"/> class.
-    /// </summary>
-    public StringSyntaxAttribute(string syntax, params object?[] arguments)
-    {
-    }
-}
-#endif
diff --git a/src/GitVersion.Core/PublicAPI.Shipped.txt b/src/GitVersion.Core/PublicAPI.Shipped.txt
index c7172416bd..d3f010c444 100644
--- a/src/GitVersion.Core/PublicAPI.Shipped.txt
+++ b/src/GitVersion.Core/PublicAPI.Shipped.txt
@@ -361,7 +361,10 @@ GitVersion.IFileSystem.Delete(string! path) -> void
 GitVersion.IFileSystem.DirectoryEnumerateFiles(string? directory, string! searchPattern, System.IO.SearchOption searchOption) -> System.Collections.Generic.IEnumerable<string!>!
 GitVersion.IFileSystem.DirectoryExists(string! path) -> bool
 GitVersion.IFileSystem.Exists(string! file) -> bool
+GitVersion.IFileSystem.GetDirectories(string! path) -> string![]!
+GitVersion.IFileSystem.GetFiles(string! path) -> string![]!
 GitVersion.IFileSystem.GetLastDirectoryWrite(string! path) -> long
+GitVersion.IFileSystem.GetLastWriteTime(string! path) -> long
 GitVersion.IFileSystem.Move(string! from, string! to) -> void
 GitVersion.IFileSystem.OpenRead(string! path) -> System.IO.Stream!
 GitVersion.IFileSystem.OpenWrite(string! path) -> System.IO.Stream!
diff --git a/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheKeyFactory.cs b/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheKeyFactory.cs
index f2cd6919a1..c91350e733 100644
--- a/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheKeyFactory.cs
+++ b/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheKeyFactory.cs
@@ -57,7 +57,7 @@ private List<string> CalculateDirectoryContents(string root)
         // examined for files.
         var dirs = new Stack<string>();
 
-        if (!Directory.Exists(root))
+        if (!this.fileSystem.DirectoryExists(root))
         {
             throw new DirectoryNotFoundException($"Root directory does not exist: {root}");
         }
@@ -74,7 +74,7 @@ private List<string> CalculateDirectoryContents(string root)
             string[] subDirs;
             try
             {
-                subDirs = Directory.GetDirectories(currentDir);
+                subDirs = this.fileSystem.GetDirectories(currentDir);
             }
             // An UnauthorizedAccessException exception will be thrown if we do not have
             // discovery permission on a folder or file. It may or may not be acceptable
@@ -99,7 +99,7 @@ private List<string> CalculateDirectoryContents(string root)
             string[] files;
             try
             {
-                files = Directory.GetFiles(currentDir);
+                files = this.fileSystem.GetFiles(currentDir);
             }
             catch (UnauthorizedAccessException e)
             {
@@ -116,9 +116,9 @@ private List<string> CalculateDirectoryContents(string root)
             {
                 try
                 {
-                    var fi = new FileInfo(file);
-                    result.Add(fi.Name);
-                    result.Add(File.ReadAllText(file));
+                    if (!this.fileSystem.Exists(file)) continue;
+                    result.Add(Path.GetFileName(file));
+                    result.Add(this.fileSystem.ReadAllText(file));
                 }
                 catch (IOException e)
                 {
diff --git a/src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs
index 5111804989..8e4ebc4640 100644
--- a/src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs
+++ b/src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs
@@ -244,35 +244,36 @@ IEnumerable<NextVersion> GetNextVersionsInternal()
             var effectiveBranchConfigurations = this.effectiveBranchConfigurationFinder.GetConfigurations(branch, configuration).ToArray();
             foreach (var effectiveBranchConfiguration in effectiveBranchConfigurations)
             {
-                this.log.Info($"Calculating base versions for '{effectiveBranchConfiguration.Branch.Name}'");
-
-                var strategies = this.versionStrategies.ToList();
-                var fallbackVersionStrategy = strategies.Find(element => element is FallbackVersionStrategy);
-                if (fallbackVersionStrategy is not null)
-                {
-                    strategies.Remove(fallbackVersionStrategy);
-                    strategies.Add(fallbackVersionStrategy);
-                }
-
-                var atLeastOneBaseVersionReturned = false;
-                foreach (var versionStrategy in strategies)
+                using (this.log.IndentLog($"Calculating base versions for '{effectiveBranchConfiguration.Branch.Name}'"))
                 {
-                    if (atLeastOneBaseVersionReturned && versionStrategy is FallbackVersionStrategy) continue;
+                    var strategies = this.versionStrategies.ToList();
+                    var fallbackVersionStrategy = strategies.Find(element => element is FallbackVersionStrategy);
+                    if (fallbackVersionStrategy is not null)
+                    {
+                        strategies.Remove(fallbackVersionStrategy);
+                        strategies.Add(fallbackVersionStrategy);
+                    }
 
-                    using (this.log.IndentLog($"[Using '{versionStrategy.GetType().Name}' strategy]"))
+                    var atLeastOneBaseVersionReturned = false;
+                    foreach (var versionStrategy in strategies)
                     {
-                        foreach (var baseVersion in versionStrategy.GetBaseVersions(effectiveBranchConfiguration))
+                        if (atLeastOneBaseVersionReturned && versionStrategy is FallbackVersionStrategy) continue;
+
+                        using (this.log.IndentLog($"[Using '{versionStrategy.GetType().Name}' strategy]"))
                         {
-                            log.Info(baseVersion.ToString());
-                            if (IncludeVersion(baseVersion, configuration.Ignore))
+                            foreach (var baseVersion in versionStrategy.GetBaseVersions(effectiveBranchConfiguration))
                             {
-                                atLeastOneBaseVersionReturned = true;
-
-                                yield return new NextVersion(
-                                    incrementedVersion: baseVersion.GetIncrementedVersion(),
-                                    baseVersion: baseVersion,
-                                    configuration: effectiveBranchConfiguration
-                                );
+                                log.Info(baseVersion.ToString());
+                                if (IncludeVersion(baseVersion, configuration.Ignore))
+                                {
+                                    atLeastOneBaseVersionReturned = true;
+
+                                    yield return new NextVersion(
+                                        incrementedVersion: baseVersion.GetIncrementedVersion(),
+                                        baseVersion: baseVersion,
+                                        configuration: effectiveBranchConfiguration
+                                    );
+                                }
                             }
                         }
                     }
diff --git a/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj b/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj
index b7677e977d..428b5be4a2 100644
--- a/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj
+++ b/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj
@@ -31,9 +31,7 @@
         <Compile Include="..\GitVersion.Core.Tests\Helpers\ExecutableHelper.cs" Link="Helpers\ExecutableHelper.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestBase.cs" Link="Helpers\TestBase.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestEnvironment.cs" Link="Helpers\TestEnvironment.cs" />
-        <Compile Include="..\GitVersion.Core.Tests\Helpers\TestFileSystem.cs" Link="Helpers\TestFileSystem.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestLogAppender.cs" Link="Helpers\TestLogAppender.cs" />
-        <Compile Include="..\GitVersion.Core.Tests\Helpers\TestStream.cs" Link="Helpers\TestStream.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Extensions\GitToolsTestingExtensions.cs" Link="Extensions\GitToolsTestingExtensions.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Extensions\GitVersionVariablesExtensions.cs" Link="Extensions\GitVersionVariablesExtensions.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Extensions\MockCollectionExtensions.cs" Link="Extensions\MockCollectionExtensions.cs" />
diff --git a/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj b/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj
index cd922f14c1..033f10f2b4 100644
--- a/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj
+++ b/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj
@@ -38,8 +38,8 @@
         <None Include="msbuild/build/*.*" Pack="true" PackagePath="build" />
         <None Include="msbuild/buildMultiTargeting/*.*" Pack="true" PackagePath="buildMultiTargeting" />
 
-        <None Include="$(ExePublishPath)/net6.0/publish/**/*;$(BinPath)/net6.0/GitVersion.MsBuild.*" Pack="true" PackagePath="tools/net6.0" />
         <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" />
     </ItemGroup>
 
 </Project>
diff --git a/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs b/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs
index 9252d5a6b5..d51d364d95 100644
--- a/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs
+++ b/src/GitVersion.MsBuild/GitVersionTaskExecutor.cs
@@ -34,7 +34,7 @@ public void GetVersion(GetVersion task)
     public void UpdateAssemblyInfo(UpdateAssemblyInfo task)
     {
         var versionVariables = GitVersionVariables(task);
-        FileHelper.DeleteTempFiles();
+        DeleteTempFiles();
         FileHelper.CheckForInvalidFiles(task.CompileFiles, task.ProjectFile);
 
         if (!string.IsNullOrEmpty(task.IntermediateOutputPath))
@@ -46,6 +46,10 @@ public void UpdateAssemblyInfo(UpdateAssemblyInfo task)
         var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "AssemblyInfo");
         task.AssemblyInfoTempFilePath = PathHelper.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);
 
+        if (!this.fileSystem.DirectoryExists(fileWriteInfo.WorkingDirectory))
+        {
+            this.fileSystem.CreateDirectory(fileWriteInfo.WorkingDirectory);
+        }
         var gitVersionOptions = this.options.Value;
         gitVersionOptions.WorkingDirectory = fileWriteInfo.WorkingDirectory;
         gitVersionOptions.AssemblySettingsInfo.UpdateAssemblyInfo = true;
@@ -68,6 +72,10 @@ public void GenerateGitVersionInformation(GenerateGitVersionInformation task)
         var fileWriteInfo = task.IntermediateOutputPath.GetFileWriteInfo(task.Language, task.ProjectFile, "GitVersionInformation");
         task.GitVersionInformationFilePath = PathHelper.Combine(fileWriteInfo.WorkingDirectory, fileWriteInfo.FileName);
 
+        if (!this.fileSystem.DirectoryExists(fileWriteInfo.WorkingDirectory))
+        {
+            this.fileSystem.CreateDirectory(fileWriteInfo.WorkingDirectory);
+        }
         var gitVersionOptions = this.options.Value;
         gitVersionOptions.WorkingDirectory = fileWriteInfo.WorkingDirectory;
         var targetNamespace = GetTargetNamespace(task);
@@ -100,5 +108,28 @@ public void WriteVersionInfoToBuildLog(WriteVersionInfoToBuildLog task)
         gitVersionOutputTool.OutputVariables(versionVariables, configuration.UpdateBuildNumber);
     }
 
+    private void DeleteTempFiles()
+    {
+        var tempPath = FileHelper.TempPath;
+        if (!this.fileSystem.DirectoryExists(tempPath))
+        {
+            return;
+        }
+
+        foreach (var file in this.fileSystem.GetFiles(tempPath))
+        {
+            if (this.fileSystem.GetLastWriteTime(file) >= DateTime.Now.AddDays(-1).Ticks)
+                continue;
+            try
+            {
+                this.fileSystem.Delete(file);
+            }
+            catch (UnauthorizedAccessException)
+            {
+                //ignore contention
+            }
+        }
+    }
+
     private GitVersionVariables GitVersionVariables(GitVersionTaskBase task) => serializer.FromFile(task.VersionFile);
 }
diff --git a/src/GitVersion.MsBuild/Helpers/FileHelper.cs b/src/GitVersion.MsBuild/Helpers/FileHelper.cs
index e8b478ee42..ce3d1e9da7 100644
--- a/src/GitVersion.MsBuild/Helpers/FileHelper.cs
+++ b/src/GitVersion.MsBuild/Helpers/FileHelper.cs
@@ -1,42 +1,16 @@
 using System.Text.RegularExpressions;
-using GitVersion.Core;
 using GitVersion.Helpers;
 using Microsoft.Build.Framework;
 
+using static GitVersion.Core.RegexPatterns.AssemblyVersion;
+
 namespace GitVersion.MsBuild;
 
 internal static class FileHelper
 {
     public static readonly string TempPath = MakeAndGetTempPath();
 
-    private static string MakeAndGetTempPath()
-    {
-        var tempPath = PathHelper.Combine(Path.GetTempPath(), "GitVersionTask");
-        Directory.CreateDirectory(tempPath);
-        return tempPath;
-    }
-
-    public static void DeleteTempFiles()
-    {
-        if (!Directory.Exists(TempPath))
-        {
-            return;
-        }
-
-        foreach (var file in Directory.GetFiles(TempPath))
-        {
-            if (File.GetLastWriteTime(file) >= DateTime.Now.AddDays(-1))
-                continue;
-            try
-            {
-                File.Delete(file);
-            }
-            catch (UnauthorizedAccessException)
-            {
-                //ignore contention
-            }
-        }
-    }
+    private static string MakeAndGetTempPath() => PathHelper.Combine(Path.GetTempPath(), "GitVersionTask");
 
     public static string GetFileExtension(string language) => language switch
     {
@@ -69,9 +43,9 @@ private static bool FileContainsVersionAttribute(string compileFile, string proj
 
         var (attributeRegex, triviaRegex) = compileFileExtension switch
         {
-            ".cs" => (RegexPatterns.AssemblyVersion.CSharp.AttributeRegex, RegexPatterns.AssemblyVersion.CSharp.TriviaRegex),
-            ".fs" => (RegexPatterns.AssemblyVersion.FSharp.AttributeRegex, RegexPatterns.AssemblyVersion.FSharp.TriviaRegex),
-            ".vb" => (RegexPatterns.AssemblyVersion.VisualBasic.AttributeRegex, RegexPatterns.AssemblyVersion.VisualBasic.TriviaRegex),
+            ".cs" => (CSharp.AttributeRegex, CSharp.TriviaRegex),
+            ".fs" => (FSharp.AttributeRegex, FSharp.TriviaRegex),
+            ".vb" => (VisualBasic.AttributeRegex, VisualBasic.TriviaRegex),
             _ => throw new WarningException("File with name containing AssemblyInfo could not be checked for assembly version attributes which conflict with the attributes generated by GitVersion " + compileFile)
         };
 
diff --git a/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets b/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets
index 974a840d88..680bf52a1a 100644
--- a/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets
+++ b/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets
@@ -10,8 +10,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), 'net6.0')) == 'true'">net6.0</GitVersionTargetFramework>
-        <!-- Fall back to net8.0 if the target framework is not compatible with net6.0 and net8.0 -->
+        <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)' == ''">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/Approved/cs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt b/src/GitVersion.Output.Tests/Output/Approved/cs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt
index 9c6b2b9a43..1289bd4dc8 100644
--- a/src/GitVersion.Output.Tests/Output/Approved/cs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt
+++ b/src/GitVersion.Output.Tests/Output/Approved/cs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt
@@ -8,22 +8,6 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-#if NET20 || NET35 || NETCOREAPP1_0 || NETCOREAPP1_1 || NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2 || NETSTANDARD1_3 || NETSTANDARD1_4 || NETSTANDARD1_5 || NETSTANDARD1_6
-namespace System.Diagnostics.CodeAnalysis
-{
-    [global::System.AttributeUsage(
-        global::System.AttributeTargets.Assembly |
-        global::System.AttributeTargets.Class |
-        global::System.AttributeTargets.Struct |
-        global::System.AttributeTargets.Constructor |
-        global::System.AttributeTargets.Method |
-        global::System.AttributeTargets.Property |
-        global::System.AttributeTargets.Event,
-        Inherited = false, AllowMultiple = false)]
-    internal sealed class ExcludeFromCodeCoverageAttribute : global::System.Attribute { }
-}
-#endif
-
 [global::System.Runtime.CompilerServices.CompilerGenerated]
 [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
 static class GitVersionInformation
diff --git a/src/GitVersion.Output.Tests/Output/Approved/cs/GitVersionInfoGeneratorTests.ShouldProperlyOutputNamespaceDeclaration.approved.txt b/src/GitVersion.Output.Tests/Output/Approved/cs/GitVersionInfoGeneratorTests.ShouldProperlyOutputNamespaceDeclaration.approved.txt
index 14109e5d29..8cb6fbe737 100644
--- a/src/GitVersion.Output.Tests/Output/Approved/cs/GitVersionInfoGeneratorTests.ShouldProperlyOutputNamespaceDeclaration.approved.txt
+++ b/src/GitVersion.Output.Tests/Output/Approved/cs/GitVersionInfoGeneratorTests.ShouldProperlyOutputNamespaceDeclaration.approved.txt
@@ -8,22 +8,6 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-#if NET20 || NET35 || NETCOREAPP1_0 || NETCOREAPP1_1 || NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2 || NETSTANDARD1_3 || NETSTANDARD1_4 || NETSTANDARD1_5 || NETSTANDARD1_6
-namespace System.Diagnostics.CodeAnalysis
-{
-    [global::System.AttributeUsage(
-        global::System.AttributeTargets.Assembly |
-        global::System.AttributeTargets.Class |
-        global::System.AttributeTargets.Struct |
-        global::System.AttributeTargets.Constructor |
-        global::System.AttributeTargets.Method |
-        global::System.AttributeTargets.Property |
-        global::System.AttributeTargets.Event,
-        Inherited = false, AllowMultiple = false)]
-    internal sealed class ExcludeFromCodeCoverageAttribute : global::System.Attribute { }
-}
-#endif
-
 namespace My.Custom.Namespace
 {
     [global::System.Runtime.CompilerServices.CompilerGenerated]
diff --git a/src/GitVersion.Output.Tests/Output/Approved/fs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt b/src/GitVersion.Output.Tests/Output/Approved/fs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt
index 52f2f04d87..f653c20b31 100644
--- a/src/GitVersion.Output.Tests/Output/Approved/fs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt
+++ b/src/GitVersion.Output.Tests/Output/Approved/fs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt
@@ -8,22 +8,6 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-#if NET20 || NET35 || NETCOREAPP1_0 || NETCOREAPP1_1 || NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2 || NETSTANDARD1_3 || NETSTANDARD1_4 || NETSTANDARD1_5 || NETSTANDARD1_6
-namespace System.Diagnostics.CodeAnalysis
-
-[<Sealed>]
-[<global.System.AttributeUsage(
-    global.System.AttributeTargets.Assembly ||| 
-    global.System.AttributeTargets.Class ||| 
-    global.System.AttributeTargets.Struct ||| 
-    global.System.AttributeTargets.Constructor ||| 
-    global.System.AttributeTargets.Method ||| 
-    global.System.AttributeTargets.Property ||| 
-    global.System.AttributeTargets.Event, 
-    Inherited = false, AllowMultiple = false)>]
-type ExcludeFromCodeCoverageAttribute() = inherit global.System.Attribute()
-#endif
-
 namespace global
 
 [<AbstractClass; Sealed>]
diff --git a/src/GitVersion.Output.Tests/Output/Approved/fs/GitVersionInfoGeneratorTests.ShouldProperlyOutputNamespaceDeclaration.approved.txt b/src/GitVersion.Output.Tests/Output/Approved/fs/GitVersionInfoGeneratorTests.ShouldProperlyOutputNamespaceDeclaration.approved.txt
new file mode 100644
index 0000000000..c73ca5fba9
--- /dev/null
+++ b/src/GitVersion.Output.Tests/Output/Approved/fs/GitVersionInfoGeneratorTests.ShouldProperlyOutputNamespaceDeclaration.approved.txt
@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     GitVersion
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace My.Custom.Namespace
+
+[<AbstractClass; Sealed>]
+[<global.System.Runtime.CompilerServices.CompilerGenerated>]
+[<global.System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>]
+type GitVersionInformation =
+    static member AssemblySemFileVer = "1.2.3.0"
+    static member AssemblySemVer = "1.2.3.0"
+    static member BranchName = "feature1"
+    static member BuildMetaData = "5"
+    static member CommitDate = "2014-03-06"
+    static member CommitsSinceVersionSource = "5"
+    static member EscapedBranchName = "feature1"
+    static member FullBuildMetaData = "5.Branch.feature1.Sha.commitSha"
+    static member FullSemVer = "1.2.3-unstable.4+5"
+    static member InformationalVersion = "1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha"
+    static member Major = "1"
+    static member MajorMinorPatch = "1.2.3"
+    static member Minor = "2"
+    static member Patch = "3"
+    static member PreReleaseLabel = "unstable"
+    static member PreReleaseLabelWithDash = "-unstable"
+    static member PreReleaseNumber = "4"
+    static member PreReleaseTag = "unstable.4"
+    static member PreReleaseTagWithDash = "-unstable.4"
+    static member SemVer = "1.2.3-unstable.4"
+    static member Sha = "commitSha"
+    static member ShortSha = "commitShortSha"
+    static member UncommittedChanges = "0"
+    static member VersionSourceSha = "versionSourceSha"
+    static member WeightedPreReleaseNumber = "4"
diff --git a/src/GitVersion.Output.Tests/Output/Approved/vb/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt b/src/GitVersion.Output.Tests/Output/Approved/vb/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt
index 200b58a1e2..91cb09fa24 100644
--- a/src/GitVersion.Output.Tests/Output/Approved/vb/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt
+++ b/src/GitVersion.Output.Tests/Output/Approved/vb/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt
@@ -8,22 +8,6 @@
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
-#If NET20 OrElse NET35 OrElse NETCOREAPP1_0 OrElse NETCOREAPP1_1 OrElse NETSTANDARD1_0 OrElse NETSTANDARD1_1 OrElse NETSTANDARD1_2 OrElse NETSTANDARD1_3 OrElse NETSTANDARD1_4 OrElse NETSTANDARD1_5 OrElse NETSTANDARD1_6 Then
-Namespace Global.System.Diagnostics.CodeAnalysis
-    <Global.System.AttributeUsage(
-        Global.System.AttributeTargets.Assembly Or
-        Global.System.AttributeTargets.Class Or
-        Global.System.AttributeTargets.Struct Or
-        Global.System.AttributeTargets.Constructor Or
-        Global.System.AttributeTargets.Method Or
-        Global.System.AttributeTargets.Property Or
-        Global.System.AttributeTargets.Event, Inherited:=False, AllowMultiple:=False)>
-    Friend NotInheritable Class ExcludeFromCodeCoverageAttribute
-        Inherits Global.System.Attribute
-    End Class
-End Namespace
-#End If
-
 Namespace Global
 
     <Global.System.Runtime.CompilerServices.CompilerGenerated()>
diff --git a/src/GitVersion.Output.Tests/Output/Approved/vb/GitVersionInfoGeneratorTests.ShouldProperlyOutputNamespaceDeclaration.approved.txt b/src/GitVersion.Output.Tests/Output/Approved/vb/GitVersionInfoGeneratorTests.ShouldProperlyOutputNamespaceDeclaration.approved.txt
new file mode 100644
index 0000000000..153d3275fa
--- /dev/null
+++ b/src/GitVersion.Output.Tests/Output/Approved/vb/GitVersionInfoGeneratorTests.ShouldProperlyOutputNamespaceDeclaration.approved.txt
@@ -0,0 +1,45 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     This code was generated by a tool.
+'     GitVersion
+'
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Namespace My.Custom.Namespace
+
+    <Global.System.Runtime.CompilerServices.CompilerGenerated()>
+    <Global.System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage()>
+    NotInheritable Class GitVersionInformation
+        Private Sub New()
+        End Sub
+        Public Shared AssemblySemFileVer As String = "1.2.3.0"
+        Public Shared AssemblySemVer As String = "1.2.3.0"
+        Public Shared BranchName As String = "feature1"
+        Public Shared BuildMetaData As String = "5"
+        Public Shared CommitDate As String = "2014-03-06"
+        Public Shared CommitsSinceVersionSource As String = "5"
+        Public Shared EscapedBranchName As String = "feature1"
+        Public Shared FullBuildMetaData As String = "5.Branch.feature1.Sha.commitSha"
+        Public Shared FullSemVer As String = "1.2.3-unstable.4+5"
+        Public Shared InformationalVersion As String = "1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha"
+        Public Shared Major As String = "1"
+        Public Shared MajorMinorPatch As String = "1.2.3"
+        Public Shared Minor As String = "2"
+        Public Shared Patch As String = "3"
+        Public Shared PreReleaseLabel As String = "unstable"
+        Public Shared PreReleaseLabelWithDash As String = "-unstable"
+        Public Shared PreReleaseNumber As String = "4"
+        Public Shared PreReleaseTag As String = "unstable.4"
+        Public Shared PreReleaseTagWithDash As String = "-unstable.4"
+        Public Shared SemVer As String = "1.2.3-unstable.4"
+        Public Shared Sha As String = "commitSha"
+        Public Shared ShortSha As String = "commitShortSha"
+        Public Shared UncommittedChanges As String = "0"
+        Public Shared VersionSourceSha As String = "versionSourceSha"
+        Public Shared WeightedPreReleaseNumber As String = "4"
+    End Class
+
+End Namespace
diff --git a/src/GitVersion.Output.Tests/Output/AssemblyInfoFileUpdaterTests.cs b/src/GitVersion.Output.Tests/Output/AssemblyInfoFileUpdaterTests.cs
index 8ce95285be..557d7d1abd 100644
--- a/src/GitVersion.Output.Tests/Output/AssemblyInfoFileUpdaterTests.cs
+++ b/src/GitVersion.Output.Tests/Output/AssemblyInfoFileUpdaterTests.cs
@@ -19,7 +19,7 @@ public class AssemblyInfoFileUpdaterTests : TestBase
     private string workingDir;
 
     [OneTimeSetUp]
-    public void OneTimeSetUp() => workingDir = PathHelper.Combine(PathHelper.GetTempPath(), "AssemblyInfoFileUpdaterTests");
+    public void OneTimeSetUp() => workingDir = PathHelper.Combine(PathHelper.GetTempPath(), nameof(AssemblyInfoFileUpdaterTests));
 
     [OneTimeTearDown]
     public void OneTimeTearDown() => DirectoryHelper.DeleteDirectory(workingDir);
@@ -93,7 +93,7 @@ public void ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInf
     [TestCase("vb")]
     public void ShouldNotCreateAssemblyInfoFileWhenNotExistsAndNotEnsureAssemblyInfo(string fileExtension)
     {
-        var assemblyInfoFile = "VersionAssemblyInfo." + fileExtension;
+        var assemblyInfoFile = "NoVersionAssemblyInfo." + fileExtension;
         var fullPath = PathHelper.Combine(workingDir, assemblyInfoFile);
         var variables = this.variableProvider.GetVariablesFor(
             SemanticVersion.Parse("1.0.0", RegexPatterns.Configuration.DefaultTagPrefixPattern), EmptyConfigurationBuilder.New.Build(), 0
diff --git a/src/GitVersion.Output.Tests/Output/GitVersionInfoGeneratorTests.cs b/src/GitVersion.Output.Tests/Output/GitVersionInfoGeneratorTests.cs
index 2fa8cb6a09..284f3d6b65 100644
--- a/src/GitVersion.Output.Tests/Output/GitVersionInfoGeneratorTests.cs
+++ b/src/GitVersion.Output.Tests/Output/GitVersionInfoGeneratorTests.cs
@@ -19,12 +19,6 @@ public class GitVersionInfoGeneratorTests : TestBase
     [TestCase("vb")]
     public void ShouldCreateFile(string fileExtension)
     {
-        var directory = PathHelper.Combine(PathHelper.GetTempPath(), "GitVersionInfoGeneratorTests", Guid.NewGuid().ToString());
-        if (!Directory.Exists(directory))
-            Directory.CreateDirectory(directory);
-        var fileName = "GitVersionInformation.g." + fileExtension;
-        var fullPath = PathHelper.Combine(directory, fileName);
-
         var semanticVersion = new SemanticVersion
         {
             Major = 1,
@@ -32,14 +26,20 @@ public void ShouldCreateFile(string fileExtension)
             Patch = 3,
             PreReleaseTag = "unstable4",
             BuildMetaData = new("versionSourceSha", 5,
-                "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"), 0)
+                 "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"), 0)
         };
 
         var sp = ConfigureServices();
 
         var fileSystem = sp.GetRequiredService<IFileSystem>();
-        var variableProvider = sp.GetRequiredService<IVariableProvider>();
 
+        var directory = PathHelper.Combine(PathHelper.GetTempPath(), "GitVersionInfoGeneratorTests", Guid.NewGuid().ToString());
+        if (!fileSystem.DirectoryExists(directory))
+            fileSystem.CreateDirectory(directory);
+        var fileName = "GitVersionInformation.g." + fileExtension;
+        var fullPath = PathHelper.Combine(directory, fileName);
+
+        var variableProvider = sp.GetRequiredService<IVariableProvider>();
         var variables = variableProvider.GetVariablesFor(semanticVersion, EmptyConfigurationBuilder.New.Build(), 0);
         using var generator = sp.GetRequiredService<IGitVersionInfoGenerator>();
 
@@ -53,18 +53,13 @@ public void ShouldCreateFile(string fileExtension)
     /// <summary>
     /// Regression test for issue #4196 (https://github.com/GitTools/GitVersion/issues/4196)
     /// </summary>
-    [TestCase]
-    public void ShouldProperlyOutputNamespaceDeclaration()
+    [TestCase("cs")]
+    [TestCase("fs")]
+    [TestCase("vb")]
+    public void ShouldProperlyOutputNamespaceDeclaration(string fileExtension)
     {
-        const string fileExtension = "cs";
         const string targetNamespace = "My.Custom.Namespace";
 
-        var directory = PathHelper.Combine(PathHelper.GetTempPath(), "GitVersionInfoGeneratorTests", Guid.NewGuid().ToString());
-        if (!Directory.Exists(directory))
-            Directory.CreateDirectory(directory);
-        var fileName = "GitVersionInformation.g." + fileExtension;
-        var fullPath = PathHelper.Combine(directory, fileName);
-
         var semanticVersion = new SemanticVersion
         {
             Major = 1,
@@ -78,8 +73,14 @@ public void ShouldProperlyOutputNamespaceDeclaration()
         var sp = ConfigureServices();
 
         var fileSystem = sp.GetRequiredService<IFileSystem>();
-        var variableProvider = sp.GetRequiredService<IVariableProvider>();
 
+        var directory = PathHelper.Combine(PathHelper.GetTempPath(), "GitVersionInfoGeneratorTests", Guid.NewGuid().ToString());
+        if (!fileSystem.DirectoryExists(directory))
+            fileSystem.CreateDirectory(directory);
+        var fileName = "GitVersionInformation.g." + fileExtension;
+        var fullPath = PathHelper.Combine(directory, fileName);
+
+        var variableProvider = sp.GetRequiredService<IVariableProvider>();
         var variables = variableProvider.GetVariablesFor(semanticVersion, EmptyConfigurationBuilder.New.Build(), 0);
         using var generator = sp.GetRequiredService<IGitVersionInfoGenerator>();
 
diff --git a/src/GitVersion.Output.Tests/Output/WixFileTests.cs b/src/GitVersion.Output.Tests/Output/WixFileTests.cs
index 4d41fec15b..ebd91284f2 100644
--- a/src/GitVersion.Output.Tests/Output/WixFileTests.cs
+++ b/src/GitVersion.Output.Tests/Output/WixFileTests.cs
@@ -95,6 +95,10 @@ public void UpdateWixVersionFileWhenFileAlreadyExists()
 
         // fake an already existing file
         var file = PathHelper.Combine(workingDir, WixVersionFileUpdater.WixVersionFileName);
+        if (!fileSystem.DirectoryExists(workingDir))
+        {
+            fileSystem.CreateDirectory(workingDir);
+        }
         fileSystem.WriteAllText(file, new('x', 1024 * 1024));
 
         wixVersionFileUpdater.Execute(versionVariables, new(workingDir));
diff --git a/src/GitVersion.Output/GitVersionInfo/Templates/GitVersionInformation.cs b/src/GitVersion.Output/GitVersionInfo/Templates/GitVersionInformation.cs
index 12deef9fa3..46527b8ca3 100644
--- a/src/GitVersion.Output/GitVersionInfo/Templates/GitVersionInformation.cs
+++ b/src/GitVersion.Output/GitVersionInfo/Templates/GitVersionInformation.cs
@@ -7,22 +7,6 @@
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
-
-#if NET20 || NET35 || NETCOREAPP1_0 || NETCOREAPP1_1 || NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2 || NETSTANDARD1_3 || NETSTANDARD1_4 || NETSTANDARD1_5 || NETSTANDARD1_6
-namespace System.Diagnostics.CodeAnalysis
-{{
-    [global::System.AttributeUsage(
-        global::System.AttributeTargets.Assembly |
-        global::System.AttributeTargets.Class |
-        global::System.AttributeTargets.Struct |
-        global::System.AttributeTargets.Constructor |
-        global::System.AttributeTargets.Method |
-        global::System.AttributeTargets.Property |
-        global::System.AttributeTargets.Event,
-        Inherited = false, AllowMultiple = false)]
-    internal sealed class ExcludeFromCodeCoverageAttribute : global::System.Attribute {{ }}
-}}
-#endif
 {1}{2}
 {4}[global::System.Runtime.CompilerServices.CompilerGenerated]
 {4}[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
diff --git a/src/GitVersion.Output/GitVersionInfo/Templates/GitVersionInformation.fs b/src/GitVersion.Output/GitVersionInfo/Templates/GitVersionInformation.fs
index 0862986636..5fff544676 100644
--- a/src/GitVersion.Output/GitVersionInfo/Templates/GitVersionInformation.fs
+++ b/src/GitVersion.Output/GitVersionInfo/Templates/GitVersionInformation.fs
@@ -8,22 +8,6 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-#if NET20 || NET35 || NETCOREAPP1_0 || NETCOREAPP1_1 || NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2 || NETSTANDARD1_3 || NETSTANDARD1_4 || NETSTANDARD1_5 || NETSTANDARD1_6
-namespace System.Diagnostics.CodeAnalysis
-
-[<Sealed>]
-[<global.System.AttributeUsage(
-    global.System.AttributeTargets.Assembly ||| 
-    global.System.AttributeTargets.Class ||| 
-    global.System.AttributeTargets.Struct ||| 
-    global.System.AttributeTargets.Constructor ||| 
-    global.System.AttributeTargets.Method ||| 
-    global.System.AttributeTargets.Property ||| 
-    global.System.AttributeTargets.Event, 
-    Inherited = false, AllowMultiple = false)>]
-type ExcludeFromCodeCoverageAttribute() = inherit global.System.Attribute()
-#endif
-
 namespace {1}
 
 [<AbstractClass; Sealed>]
diff --git a/src/GitVersion.Output/GitVersionInfo/Templates/GitVersionInformation.vb b/src/GitVersion.Output/GitVersionInfo/Templates/GitVersionInformation.vb
index b7f3b7b923..48105ab7ce 100644
--- a/src/GitVersion.Output/GitVersionInfo/Templates/GitVersionInformation.vb
+++ b/src/GitVersion.Output/GitVersionInfo/Templates/GitVersionInformation.vb
@@ -8,22 +8,6 @@
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
-#If NET20 OrElse NET35 OrElse NETCOREAPP1_0 OrElse NETCOREAPP1_1 OrElse NETSTANDARD1_0 OrElse NETSTANDARD1_1 OrElse NETSTANDARD1_2 OrElse NETSTANDARD1_3 OrElse NETSTANDARD1_4 OrElse NETSTANDARD1_5 OrElse NETSTANDARD1_6 Then
-Namespace Global.System.Diagnostics.CodeAnalysis
-    <Global.System.AttributeUsage(
-        Global.System.AttributeTargets.Assembly Or
-        Global.System.AttributeTargets.Class Or
-        Global.System.AttributeTargets.Struct Or
-        Global.System.AttributeTargets.Constructor Or
-        Global.System.AttributeTargets.Method Or
-        Global.System.AttributeTargets.Property Or
-        Global.System.AttributeTargets.Event, Inherited:=False, AllowMultiple:=False)>
-    Friend NotInheritable Class ExcludeFromCodeCoverageAttribute
-        Inherits Global.System.Attribute
-    End Class
-End Namespace
-#End If
-
 Namespace {1}
 
     <Global.System.Runtime.CompilerServices.CompilerGenerated()>
diff --git a/src/GitVersion.Output/TemplateManager.cs b/src/GitVersion.Output/TemplateManager.cs
index 8246369fc2..7eb60d3d54 100644
--- a/src/GitVersion.Output/TemplateManager.cs
+++ b/src/GitVersion.Output/TemplateManager.cs
@@ -15,10 +15,7 @@ internal class TemplateManager(TemplateType templateType)
 
     public string? GetTemplateFor(string fileExtension)
     {
-        if (fileExtension == null)
-        {
-            throw new ArgumentNullException(nameof(fileExtension));
-        }
+        ArgumentNullException.ThrowIfNull(fileExtension);
 
         string? result = null;
 
@@ -32,10 +29,7 @@ internal class TemplateManager(TemplateType templateType)
 
     public string? GetAddFormatFor(string fileExtension)
     {
-        if (fileExtension == null)
-        {
-            throw new ArgumentNullException(nameof(fileExtension));
-        }
+        ArgumentNullException.ThrowIfNull(fileExtension);
 
         string? result = null;
 
@@ -49,10 +43,7 @@ internal class TemplateManager(TemplateType templateType)
 
     public bool IsSupported(string fileExtension)
     {
-        if (fileExtension == null)
-        {
-            throw new ArgumentNullException(nameof(fileExtension));
-        }
+        ArgumentNullException.ThrowIfNull(fileExtension);
 
         return this.templates.ContainsKey(fileExtension);
     }
diff --git a/src/GitVersion.Output/WixUpdater/WixVersionFileUpdater.cs b/src/GitVersion.Output/WixUpdater/WixVersionFileUpdater.cs
index 3d2dfe0104..4f76e347ac 100644
--- a/src/GitVersion.Output/WixUpdater/WixVersionFileUpdater.cs
+++ b/src/GitVersion.Output/WixUpdater/WixVersionFileUpdater.cs
@@ -25,7 +25,15 @@ public void Execute(GitVersionVariables variables, WixVersionContext context)
         var root = doc.DocumentElement;
         doc.InsertBefore(xmlDecl, root);
 
-        this.fileSystem.Delete(this.wixVersionFile);
+        if (this.fileSystem.Exists(this.wixVersionFile))
+        {
+            this.fileSystem.Delete(this.wixVersionFile);
+        }
+
+        if (!this.fileSystem.DirectoryExists(context.WorkingDirectory))
+        {
+            this.fileSystem.CreateDirectory(context.WorkingDirectory);
+        }
         using var fs = this.fileSystem.OpenWrite(this.wixVersionFile);
         doc.Save(fs);
     }
diff --git a/src/GitVersion.Schema/Program.cs b/src/GitVersion.Schema/Program.cs
index 3bed198c98..ba84aed254 100644
--- a/src/GitVersion.Schema/Program.cs
+++ b/src/GitVersion.Schema/Program.cs
@@ -21,6 +21,15 @@
 AttributeHandler.AddHandler<DescriptionAttributeHandler2>();
 AttributeHandler.AddHandler<FormatAttributeHandler>();
 
+if (!Directory.Exists(schemasDirectory))
+{
+    Directory.CreateDirectory(schemasDirectory);
+}
+if (!Directory.Exists(Path.Combine(schemasDirectory, schemaVersion)))
+{
+    Directory.CreateDirectory(Path.Combine(schemasDirectory, schemaVersion));
+}
+
 var builder = new JsonSchemaBuilder();
 builder.Schema("http://json-schema.org/draft-07/schema#");
 builder.Id($"https://gitversion.net/schemas/{schemaVersion}/GitVersion.configuration.json");
diff --git a/src/GitVersion.Testing/Fixtures/RepositoryFixtureBase.cs b/src/GitVersion.Testing/Fixtures/RepositoryFixtureBase.cs
index 2da6a5069f..1ac92f2086 100644
--- a/src/GitVersion.Testing/Fixtures/RepositoryFixtureBase.cs
+++ b/src/GitVersion.Testing/Fixtures/RepositoryFixtureBase.cs
@@ -1,6 +1,7 @@
 using GitVersion.Helpers;
 using GitVersion.Testing.Internal;
 using LibGit2Sharp;
+using Shouldly;
 
 namespace GitVersion.Testing;
 
@@ -17,7 +18,7 @@ protected RepositoryFixtureBase(Func<string, Repository> repositoryBuilder)
     protected RepositoryFixtureBase(Repository repository)
     {
         SequenceDiagram = new();
-        Repository = repository ?? throw new ArgumentNullException(nameof(repository));
+        Repository = repository.ShouldNotBeNull();
         Repository.Config.Set("user.name", "Test");
         Repository.Config.Set("user.email", "test@email.com");
     }
diff --git a/src/GitVersion.Testing/Helpers/ProcessHelper.cs b/src/GitVersion.Testing/Helpers/ProcessHelper.cs
index b5f269ce95..466472bd1e 100644
--- a/src/GitVersion.Testing/Helpers/ProcessHelper.cs
+++ b/src/GitVersion.Testing/Helpers/ProcessHelper.cs
@@ -76,10 +76,8 @@ public static class ProcessHelper
     // http://csharptest.net/532/using-processstart-to-capture-console-output/
     public static int Run(Action<string> output, Action<string> errorOutput, TextReader? input, string exe, string args, string workingDirectory, params KeyValuePair<string, string?>[] environmentalVariables)
     {
-        if (string.IsNullOrEmpty(exe))
-            throw new ArgumentNullException(nameof(exe));
-        if (output == null)
-            throw new ArgumentNullException(nameof(output));
+        ArgumentException.ThrowIfNullOrWhiteSpace(exe);
+        ArgumentNullException.ThrowIfNull(output);
 
         var psi = new ProcessStartInfo
         {
diff --git a/src/GitVersion.Testing/Helpers/StringBuilderExtensions.cs b/src/GitVersion.Testing/Helpers/StringBuilderExtensions.cs
index a17c0d4e1a..2893be4336 100644
--- a/src/GitVersion.Testing/Helpers/StringBuilderExtensions.cs
+++ b/src/GitVersion.Testing/Helpers/StringBuilderExtensions.cs
@@ -1,15 +1,11 @@
-#if NET7_0_OR_GREATER
 using System.Diagnostics.CodeAnalysis;
-#endif
 
 namespace GitVersion.Testing.Internal;
 
 internal static class StringBuilderExtensions
 {
     public static void AppendLineFormat(this StringBuilder stringBuilder,
-#if NET7_0_OR_GREATER
                                         [StringSyntax(StringSyntaxAttribute.CompositeFormat)]
-#endif
                                         string format,
                                         params object?[] args)
     {
diff --git a/src/GitVersion.sln.DotSettings b/src/GitVersion.sln.DotSettings
index 9d9eae6664..970fd59ec8 100644
--- a/src/GitVersion.sln.DotSettings
+++ b/src/GitVersion.sln.DotSettings
@@ -707,16 +707,11 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsParsFormattingSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EUnitTestFramework_002EMigrations_002EEnableDisabledProvidersMigration/@EntryIndexedValue">True</s:Boolean>
-
-
-	<s:Boolean x:Key="/Default/Environment/UnitTesting/SeparateAppDomainPerAssembly/@EntryValue">True</s:Boolean>
+  <s:Boolean x:Key="/Default/Environment/UnitTesting/SeparateAppDomainPerAssembly/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/ShadowCopy/@EntryValue">False</s:Boolean>
-
-
-
-
-	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String>
+  <s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String>
 	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=asbjornu/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gitversion/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Reacheable/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Reacheable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=veyor/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>