From d5d903370f6545aa6cd03c4d4729788df52efb5a Mon Sep 17 00:00:00 2001
From: Artur Stolear <artur.stolear@gmail.com>
Date: Sun, 21 Jul 2024 23:25:34 +0200
Subject: [PATCH] (build) prepare for release

cleanup
---
 README.md                                     |  25 +-
 build/.run/PublishCoverage.run.xml            |   2 +-
 build/.run/UnitTest (6.0).run.xml             |   4 +-
 build/.run/UnitTest (8.0).run.xml             |   4 +-
 .../Tasks/ArtifactsMsBuildCoreTest.cs         |  10 +-
 build/docker/Dockerfile                       |   2 +-
 build/nuspec/README.md                        |   6 +-
 docs/input/docs/usage/msbuild.md              |   8 +-
 .../Output/ProjectFileUpdaterTests.cs         | 276 +++++++++---------
 tests/scripts/test-global-tool.sh             |   2 +-
 tests/scripts/test-native-tool.sh             |   2 +-
 11 files changed, 168 insertions(+), 173 deletions(-)

diff --git a/README.md b/README.md
index 3627b83c90..a68504eb4b 100644
--- a/README.md
+++ b/README.md
@@ -8,18 +8,17 @@ works out the [Semantic Version][semver] of the commit being built.
 [![codecov][codecov-badge]][codecov]
 [![Gitter][gitter-badge]][gitter]
 
-| Artifact                   | Stable                                                             |                                                         |
-|:---------------------------|:-------------------------------------------------------------------|---------------------------------------------------------|
-| **GitHub Release**         | [![GitHub release][gh-rel-badge]][gh-rel]                          |                                                         |
-| **GitVersion.Portable**    | [![Chocolatey][choco-badge]][choco]                                |                                                         |
-| **GitVersion.Tool**        | [![NuGet][gvgt-badge]][gvgt]                                       |                                                         |
-| **GitVersion.CommandLine** | [![NuGet][gvcl-badge]][gvcl]                                       |                                                         |
-| **GitVersion.MsBuild**     | [![NuGet][gvt-badge]][gvt]                                         | Known as [GitVersionTask][gitversiontask] before v5.6.0 |
-| **Homebrew**               | [![homebrew][brew-badge]][brew]                                    |                                                         |
-| **Winget**                 | [![winget][winget-badge]][winget]                                  | `winget install gitversion`                             |
-| **Azure Pipeline Task**    | [![Azure Pipeline Task][az-pipeline-task-badge]][az-pipeline-task] |                                                         |
-| **Github Action**          | [![Github Action][gh-actions-badge]][gh-actions]                   |                                                         |
-| **Docker**                 | [![Docker Pulls][dockerhub-badge]][dockerhub]                      |                                                         |
+| Artifact                   | Stable                                                             |
+|:---------------------------|:-------------------------------------------------------------------|
+| **GitHub Release**         | [![GitHub release][gh-rel-badge]][gh-rel]                          |
+| **GitVersion.Portable**    | [![Chocolatey][choco-badge]][choco]                                |
+| **GitVersion.Tool**        | [![NuGet][gvgt-badge]][gvgt]                                       |
+| **GitVersion.MsBuild**     | [![NuGet][gvt-badge]][gvt]                                         |
+| **Homebrew**               | [![homebrew][brew-badge]][brew]                                    |
+| **Winget**                 | [![winget][winget-badge]][winget]                                  |
+| **Azure Pipeline Task**    | [![Azure Pipeline Task][az-pipeline-task-badge]][az-pipeline-task] |
+| **Github Action**          | [![Github Action][gh-actions-badge]][gh-actions]                   |
+| **Docker**                 | [![Docker Pulls][dockerhub-badge]][dockerhub]                      |
 
 ## Compatibility
 
@@ -67,8 +66,6 @@ from The Noun Project.
 [gvt]:                             https://www.nuget.org/packages/GitVersion.MsBuild
 [gvt-badge]:                       https://img.shields.io/nuget/v/GitVersion.MsBuild.svg?logo=nuget
 [gitversiontask]:                  https://www.nuget.org/packages/GitVersionTask/
-[gvcl]:                            https://www.nuget.org/packages/GitVersion.CommandLine
-[gvcl-badge]:                      https://img.shields.io/nuget/v/GitVersion.CommandLine.svg?logo=nuget
 [gvgt]:                            https://www.nuget.org/packages/GitVersion.Tool
 [gvgt-badge]:                      https://img.shields.io/nuget/v/GitVersion.Tool.svg?logo=nuget
 [brew]:                            https://formulae.brew.sh/formula/gitversion
diff --git a/build/.run/PublishCoverage.run.xml b/build/.run/PublishCoverage.run.xml
index e5179a9657..7a91587fb3 100644
--- a/build/.run/PublishCoverage.run.xml
+++ b/build/.run/PublishCoverage.run.xml
@@ -1,7 +1,7 @@
 <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="PROGRAM_PARAMETERS" value="--target=PublishCoverage --dotnet_target=net8.0" />
+    <option name="PROGRAM_PARAMETERS" value="--target=PublishCoverage --dotnet_target=8.0" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
diff --git a/build/.run/UnitTest (6.0).run.xml b/build/.run/UnitTest (6.0).run.xml
index 72c6d1aa38..160f4737c6 100644
--- a/build/.run/UnitTest (6.0).run.xml	
+++ b/build/.run/UnitTest (6.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">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_target=net6.0" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
+    <option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_target=6.0" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
diff --git a/build/.run/UnitTest (8.0).run.xml b/build/.run/UnitTest (8.0).run.xml
index 509643230c..542a0d60c9 100644
--- a/build/.run/UnitTest (8.0).run.xml	
+++ b/build/.run/UnitTest (8.0).run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="UnitTest (8.0)" type="DotNetProject" factoryName=".NET Project" folderName="Unit Test">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_target=net8.0" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
+    <option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_target=8.0" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
index ce7d792164..c210ddae6f 100644
--- a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
+++ b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
@@ -28,15 +28,7 @@ public override void Run(BuildContext context)
         {
             if (context.SkipImageTesting(dockerImage)) continue;
 
-            var framework = dockerImage.TargetFramework;
-
-            var targetFramework = framework switch
-            {
-                Constants.Version60 or Constants.Version80 => $"net{framework}",
-                _ => framework
-            };
-
-            var cmd = $"{rootPrefix}/scripts/test-msbuild-task.sh --version {version} --nugetPath {rootPrefix}/nuget --repoPath {rootPrefix}/repo/tests/integration --targetframework {targetFramework}";
+            var cmd = $"{rootPrefix}/scripts/test-msbuild-task.sh --version {version} --nugetPath {rootPrefix}/nuget --repoPath {rootPrefix}/repo/tests/integration --targetframework net{dockerImage.TargetFramework}";
 
             context.DockerTestArtifact(dockerImage, cmd);
         }
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index 8cc24a2574..da8fb898f2 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -1,6 +1,6 @@
 ARG REGISTRY='docker.io'
 ARG DISTRO='debian.11'
-ARG DOTNET_VERSION='6.0'
+ARG DOTNET_VERSION='8.0'
 ARG VERSION='5.12.0'
 
 FROM $REGISTRY/gittools/build-images:$DISTRO-sdk-$DOTNET_VERSION as installer
diff --git a/build/nuspec/README.md b/build/nuspec/README.md
index 9ab06f932c..e91094077a 100644
--- a/build/nuspec/README.md
+++ b/build/nuspec/README.md
@@ -5,10 +5,10 @@ works out the [Semantic Version][semver] of the commit being built.
 
 [![Gitter][gitter-badge]][gitter]
 
-| Artifact               | Stable                       |                                                         |
-|:-----------------------|:-----------------------------|---------------------------------------------------------|
+| Artifact               | Stable                       |
+|:-----------------------|:-----------------------------|
 | **GitVersion.Tool**    | [![NuGet][gvgt-badge]][gvgt] |
-| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt]   | Known as [GitVersionTask][gitversiontask] before v5.6.0 |
+| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt]   |
 
 ## Compatibility
 
diff --git a/docs/input/docs/usage/msbuild.md b/docs/input/docs/usage/msbuild.md
index d76398b578..f5ff401e5a 100644
--- a/docs/input/docs/usage/msbuild.md
+++ b/docs/input/docs/usage/msbuild.md
@@ -18,10 +18,6 @@ version information that is compiled into the resulting artifact.
 It currently works with desktop `MSBuild`. Support for CoreCLR with `dotnet build`
 is coming soon.
 
-> **Note**\
-> The nuget package was "_[GitVersionTask](https://www.nuget.org/packages/GitVersionTask/)_" up until version 5.5.1.\
-> From version 5.6.0 it has been called "_[GitVersion.MsBuild](https://www.nuget.org/packages/GitVersion.MsBuild/)_"
-
 ## TL;DR
 
 ### Install the MSTask targets
@@ -40,7 +36,7 @@ If you're using `PackageReference` style NuGet dependencies (VS 2017+), add
 dependency of your package:
 
 ```xml
-<PackageReference Include="GitVersion.MsBuild" Version="5.6.10*">
+<PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
   <PrivateAssets>All</PrivateAssets>
 </PackageReference>
 ```
@@ -278,7 +274,7 @@ You can configure GitVersion to generate the `GitVersionInformation` class in a
 
 ## Extra properties
 
-There are properties that correspont to certain
+There are properties that correspond to certain
 [command line arguments](/docs/usage/cli/arguments) for GetVersion task.
 In particular, setting `GitVersion_NoFetchEnabled` to `true` disables `git fetch`
 during version calculation, setting `GitVersion_NoNormalizeEnabled` to `true` disables
diff --git a/src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs b/src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs
index 90f92f91c4..0eff6f3bb9 100644
--- a/src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs
+++ b/src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs
@@ -14,6 +14,7 @@ namespace GitVersion.Core.Tests;
 [Parallelizable(ParallelScope.None)]
 public class ProjectFileUpdaterTests : TestBase
 {
+    private const string TargetFramework = "net8.0";
     private IVariableProvider variableProvider;
     private ILog log;
     private IFileSystem fileSystem;
@@ -45,28 +46,28 @@ public void Setup()
     [TestCase("Microsoft.NET.Sdk.BlazorWebAssembly")]
     public void CanUpdateProjectFileWithSdkProjectFileXml(string sdk)
     {
-        var xml = $@"
-<Project Sdk=""{sdk}"">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-</Project>
-";
+        var xml = $"""
+                   <Project Sdk="{sdk}">
+                     <PropertyGroup>
+                       <OutputType>Exe</OutputType>
+                       <TargetFramework>{TargetFramework}</TargetFramework>
+                     </PropertyGroup>
+                   </Project>
+                   """;
         var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
 
         canUpdate.ShouldBe(true);
         logMessages.ShouldBeEmpty();
     }
 
-    [TestCase(@"
-<Project Sdk=""SomeOtherProject.Sdk"">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-</Project>
-")]
+    [TestCase($"""
+               <Project Sdk="SomeOtherProject.Sdk">
+                 <PropertyGroup>
+                   <OutputType>Exe</OutputType>
+                   <TargetFramework>{TargetFramework}</TargetFramework>
+                 </PropertyGroup>
+               </Project>
+               """)]
     public void CannotUpdateProjectFileWithIncorrectProjectSdk(string xml)
     {
         var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
@@ -78,14 +79,14 @@ public void CannotUpdateProjectFileWithIncorrectProjectSdk(string xml)
         logMessages[0].ShouldContain("Specified project file Sdk (SomeOtherProject.Sdk) is not supported, please ensure the project sdk starts with 'Microsoft.NET.Sdk'");
     }
 
-    [TestCase(@"
-<Project>
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-</Project>
-")]
+    [TestCase($"""
+               <Project>
+                 <PropertyGroup>
+                   <OutputType>Exe</OutputType>
+                   <TargetFramework>{TargetFramework}</TargetFramework>
+                 </PropertyGroup>
+               </Project>
+               """)]
     public void CannotUpdateProjectFileWithMissingProjectSdk(string xml)
     {
         var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
@@ -97,15 +98,15 @@ public void CannotUpdateProjectFileWithMissingProjectSdk(string xml)
         logMessages[0].ShouldContain("Specified project file Sdk () is not supported, please ensure the project sdk starts with 'Microsoft.NET.Sdk'");
     }
 
-    [TestCase(@"
-<Project Sdk=""Microsoft.NET.Sdk"">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
-</Project>
-")]
+    [TestCase($"""
+               <Project Sdk="Microsoft.NET.Sdk">
+                 <PropertyGroup>
+                   <OutputType>Exe</OutputType>
+                   <TargetFramework>{TargetFramework}</TargetFramework>
+                   <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+                 </PropertyGroup>
+               </Project>
+               """)]
     public void CannotUpdateProjectFileWithoutAssemblyInfoGeneration(string xml)
     {
         var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
@@ -117,10 +118,10 @@ public void CannotUpdateProjectFileWithoutAssemblyInfoGeneration(string xml)
         logMessages[0].ShouldContain("Project file specifies <GenerateAssemblyInfo>false</GenerateAssemblyInfo>: versions set in this project file will not affect the output artifacts");
     }
 
-    [TestCase(@"
-<Project Sdk=""Microsoft.NET.Sdk"">
-</Project>
-")]
+    [TestCase("""
+              <Project Sdk="Microsoft.NET.Sdk">
+              </Project>
+              """)]
     public void CannotUpdateProjectFileWithoutAPropertyGroup(string xml)
     {
         var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
@@ -132,13 +133,14 @@ public void CannotUpdateProjectFileWithoutAPropertyGroup(string xml)
         logMessages[0].ShouldContain("Unable to locate any <PropertyGroup> elements in specified project file. Are you sure it is in a correct format?");
     }
 
-    [TestCase(@"
-<Project Sdk=""Microsoft.NET.Sdk"">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-</Project>"
+    [TestCase($"""
+               <Project Sdk="Microsoft.NET.Sdk">
+                 <PropertyGroup>
+                   <OutputType>Exe</OutputType>
+                   <TargetFramework>{TargetFramework}</TargetFramework>
+                 </PropertyGroup>
+               </Project>
+               """
     )]
     public void UpdateProjectXmlVersionElementWithStandardXmlInsertsElement(string xml)
     {
@@ -149,25 +151,28 @@ public void UpdateProjectXmlVersionElementWithStandardXmlInsertsElement(string x
         variables.AssemblySemVer.ShouldNotBeNull();
         ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
 
-        var expectedXml = XElement.Parse(@"
-<Project Sdk=""Microsoft.NET.Sdk"">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-  </PropertyGroup>
-</Project>");
+        const string projectFileContent = $"""
+                                           <Project Sdk="Microsoft.NET.Sdk">
+                                             <PropertyGroup>
+                                               <OutputType>Exe</OutputType>
+                                               <TargetFramework>{TargetFramework}</TargetFramework>
+                                               <AssemblyVersion>2.0.0.0</AssemblyVersion>
+                                             </PropertyGroup>
+                                           </Project>
+                                           """;
+        var expectedXml = XElement.Parse(projectFileContent);
         xmlRoot.ToString().ShouldBe(expectedXml.ToString());
     }
 
-    [TestCase(@"
-<Project Sdk=""Microsoft.NET.Sdk"">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-  </PropertyGroup>
-</Project>"
+    [TestCase($"""
+               <Project Sdk="Microsoft.NET.Sdk">
+                 <PropertyGroup>
+                   <OutputType>Exe</OutputType>
+                   <TargetFramework>{TargetFramework}</TargetFramework>
+                   <AssemblyVersion>1.0.0.0</AssemblyVersion>
+                 </PropertyGroup>
+               </Project>
+               """
     )]
     public void UpdateProjectXmlVersionElementWithStandardXmlModifiesElement(string xml)
     {
@@ -176,28 +181,31 @@ public void UpdateProjectXmlVersionElementWithStandardXmlModifiesElement(string
         variables.AssemblySemVer.ShouldNotBeNull();
         ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
 
-        var expectedXml = XElement.Parse(@"
-<Project Sdk=""Microsoft.NET.Sdk"">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-  </PropertyGroup>
-</Project>");
+        var projectFileContent = $"""
+                                  <Project Sdk="Microsoft.NET.Sdk">
+                                    <PropertyGroup>
+                                      <OutputType>Exe</OutputType>
+                                      <TargetFramework>{TargetFramework}</TargetFramework>
+                                      <AssemblyVersion>2.0.0.0</AssemblyVersion>
+                                    </PropertyGroup>
+                                  </Project>
+                                  """;
+        var expectedXml = XElement.Parse(projectFileContent);
         xmlRoot.ToString().ShouldBe(expectedXml.ToString());
     }
 
-    [TestCase(@"
-<Project Sdk=""Microsoft.NET.Sdk"">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-  </PropertyGroup>
-</Project>"
+    [TestCase($"""
+               <Project Sdk="Microsoft.NET.Sdk">
+                 <PropertyGroup>
+                   <OutputType>Exe</OutputType>
+                   <TargetFramework>{TargetFramework}</TargetFramework>
+                   <AssemblyVersion>1.0.0.0</AssemblyVersion>
+                 </PropertyGroup>
+                 <PropertyGroup>
+                   <AssemblyVersion>1.0.0.0</AssemblyVersion>
+                 </PropertyGroup>
+               </Project>
+               """
     )]
     public void UpdateProjectXmlVersionElementWithDuplicatePropertyGroupsModifiesLastElement(string xml)
     {
@@ -206,29 +214,32 @@ public void UpdateProjectXmlVersionElementWithDuplicatePropertyGroupsModifiesLas
         variables.AssemblySemVer.ShouldNotBeNull();
         ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
 
-        var expectedXml = XElement.Parse(@"
-<Project Sdk=""Microsoft.NET.Sdk"">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-  </PropertyGroup>
-</Project>");
+        var projectFileContent = $"""
+                                  <Project Sdk="Microsoft.NET.Sdk">
+                                    <PropertyGroup>
+                                      <OutputType>Exe</OutputType>
+                                      <TargetFramework>{TargetFramework}</TargetFramework>
+                                      <AssemblyVersion>1.0.0.0</AssemblyVersion>
+                                    </PropertyGroup>
+                                    <PropertyGroup>
+                                      <AssemblyVersion>2.0.0.0</AssemblyVersion>
+                                    </PropertyGroup>
+                                  </Project>
+                                  """;
+        var expectedXml = XElement.Parse(projectFileContent);
         xmlRoot.ToString().ShouldBe(expectedXml.ToString());
     }
 
-    [TestCase(@"
-<Project Sdk=""Microsoft.NET.Sdk"">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-  </PropertyGroup>
-</Project>"
+    [TestCase($"""
+               <Project Sdk="Microsoft.NET.Sdk">
+                 <PropertyGroup>
+                   <OutputType>Exe</OutputType>
+                   <TargetFramework>{TargetFramework}</TargetFramework>
+                   <AssemblyVersion>1.0.0.0</AssemblyVersion>
+                   <AssemblyVersion>1.0.0.0</AssemblyVersion>
+                 </PropertyGroup>
+               </Project>
+               """
     )]
     public void UpdateProjectXmlVersionElementWithMultipleVersionElementsLastOneIsModified(string xml)
     {
@@ -237,25 +248,29 @@ public void UpdateProjectXmlVersionElementWithMultipleVersionElementsLastOneIsMo
         variables.AssemblySemVer.ShouldNotBeNull();
         ProjectFileUpdater.UpdateProjectVersionElement(xmlRoot, ProjectFileUpdater.AssemblyVersionElement, variables.AssemblySemVer);
 
-        var expectedXml = XElement.Parse(@"
-<Project Sdk=""Microsoft.NET.Sdk"">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-  </PropertyGroup>
-</Project>");
+        var projectFileContent = $"""
+                                  <Project Sdk="Microsoft.NET.Sdk">
+                                    <PropertyGroup>
+                                      <OutputType>Exe</OutputType>
+                                      <TargetFramework>{TargetFramework}</TargetFramework>
+                                      <AssemblyVersion>1.0.0.0</AssemblyVersion>
+                                      <AssemblyVersion>2.0.0.0</AssemblyVersion>
+                                    </PropertyGroup>
+                                  </Project>
+                                  """;
+        var expectedXml = XElement.Parse(projectFileContent);
         xmlRoot.ToString().ShouldBe(expectedXml.ToString());
     }
 
-    [TestCase(@"
-<Project Sdk=""Microsoft.NET.Sdk"">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-</Project>")]
+    [TestCase("""
+
+              <Project Sdk="Microsoft.NET.Sdk">
+                <PropertyGroup>
+                  <OutputType>Exe</OutputType>
+                  <TargetFramework>net8.0</TargetFramework>
+                </PropertyGroup>
+              </Project>
+              """)]
     public void UpdateProjectFileAddsVersionToFile(string xml)
     {
         var workingDirectory = PathHelper.GetTempPath();
@@ -266,17 +281,18 @@ public void UpdateProjectFileAddsVersionToFile(string xml)
             using var projFileUpdater = new ProjectFileUpdater(this.log, fs);
             projFileUpdater.Execute(variables, new(workingDirectory, false, fileName));
 
-            const string expectedXml = @"
-<Project Sdk=""Microsoft.NET.Sdk"">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <AssemblyVersion>2.3.1.0</AssemblyVersion>
-    <FileVersion>2.3.1.0</FileVersion>
-    <InformationalVersion>2.3.1+3.Branch.foo.Sha.hash</InformationalVersion>
-    <Version>2.3.1</Version>
-  </PropertyGroup>
-</Project>";
+            const string expectedXml = $"""
+                                        <Project Sdk="Microsoft.NET.Sdk">
+                                          <PropertyGroup>
+                                            <OutputType>Exe</OutputType>
+                                            <TargetFramework>{TargetFramework}</TargetFramework>
+                                            <AssemblyVersion>2.3.1.0</AssemblyVersion>
+                                            <FileVersion>2.3.1.0</FileVersion>
+                                            <InformationalVersion>2.3.1+3.Branch.foo.Sha.hash</InformationalVersion>
+                                            <Version>2.3.1</Version>
+                                          </PropertyGroup>
+                                        </Project>
+                                        """;
             var transformedXml = fs.ReadAllText(fileName);
             transformedXml.ShouldBe(XElement.Parse(expectedXml).ToString());
         });
@@ -289,13 +305,7 @@ private void VerifyAssemblyInfoFile(
         Action<IFileSystem, GitVersionVariables>? verify = null)
     {
         this.fileSystem = Substitute.For<IFileSystem>();
-        var version = new SemanticVersion
-        {
-            BuildMetaData = new("versionSourceHash", 3, "foo", "hash", "shortHash", DateTimeOffset.Now, 0),
-            Major = 2,
-            Minor = 3,
-            Patch = 1
-        };
+        var version = new SemanticVersion { BuildMetaData = new("versionSourceHash", 3, "foo", "hash", "shortHash", DateTimeOffset.Now, 0), Major = 2, Minor = 3, Patch = 1 };
 
         this.fileSystem.Exists(fileName).Returns(true);
         this.fileSystem.ReadAllText(fileName).Returns(projectFileContent);
diff --git a/tests/scripts/test-global-tool.sh b/tests/scripts/test-global-tool.sh
index 537921c7de..778863663f 100644
--- a/tests/scripts/test-global-tool.sh
+++ b/tests/scripts/test-global-tool.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/sh
-# sh /scripts/test-global-tool.sh --version 5.7.1-beta1.56 --nugetPath /nuget --repoPath /repo
+# sh /scripts/test-global-tool.sh --version 6.0.0 --nugetPath /nuget --repoPath /repo
 while test "$#" -gt 0
 do
     case $1 in
diff --git a/tests/scripts/test-native-tool.sh b/tests/scripts/test-native-tool.sh
index 557c28e1df..81aa2d9314 100644
--- a/tests/scripts/test-native-tool.sh
+++ b/tests/scripts/test-native-tool.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/sh
-# sh /scripts/test-native-tool.sh --version 5.7.1-beta1-56 --runtime linux-musl-x64 /nuget --repoPath /repo
+# sh /scripts/test-native-tool.sh --version 6.0.0 --runtime linux-musl-x64 /nuget --repoPath /repo
 while test "$#" -gt 0
 do
     case $1 in