(build) prepare for release

cleanup
GitTools · Jul 22, 2024 · d5d9033 · d5d9033
1 parent f777262
commit d5d9033
Show file tree

Hide file tree

Showing 11 changed files with 168 additions and 173 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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