Skip to content

Commit d5d9033

Browse files
arturcicarturcic
committed
(build) prepare for release
cleanup
1 parent f777262 commit d5d9033

File tree

11 files changed

+168
-173
lines changed

11 files changed

+168
-173
lines changed

‎README.md

+11-14
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@ works out the [Semantic Version][semver] of the commit being built.
88
[![codecov][codecov-badge]][codecov]
99
[![Gitter][gitter-badge]][gitter]
1010

11-
| Artifact | Stable | |
12-
|:---------------------------|:-------------------------------------------------------------------|---------------------------------------------------------|
13-
| **GitHub Release** | [![GitHub release][gh-rel-badge]][gh-rel] | |
14-
| **GitVersion.Portable** | [![Chocolatey][choco-badge]][choco] | |
15-
| **GitVersion.Tool** | [![NuGet][gvgt-badge]][gvgt] | |
16-
| **GitVersion.CommandLine** | [![NuGet][gvcl-badge]][gvcl] | |
17-
| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt] | Known as [GitVersionTask][gitversiontask] before v5.6.0 |
18-
| **Homebrew** | [![homebrew][brew-badge]][brew] | |
19-
| **Winget** | [![winget][winget-badge]][winget] | `winget install gitversion` |
20-
| **Azure Pipeline Task** | [![Azure Pipeline Task][az-pipeline-task-badge]][az-pipeline-task] | |
21-
| **Github Action** | [![Github Action][gh-actions-badge]][gh-actions] | |
22-
| **Docker** | [![Docker Pulls][dockerhub-badge]][dockerhub] | |
11+
| Artifact | Stable |
12+
|:---------------------------|:-------------------------------------------------------------------|
13+
| **GitHub Release** | [![GitHub release][gh-rel-badge]][gh-rel] |
14+
| **GitVersion.Portable** | [![Chocolatey][choco-badge]][choco] |
15+
| **GitVersion.Tool** | [![NuGet][gvgt-badge]][gvgt] |
16+
| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt] |
17+
| **Homebrew** | [![homebrew][brew-badge]][brew] |
18+
| **Winget** | [![winget][winget-badge]][winget] |
19+
| **Azure Pipeline Task** | [![Azure Pipeline Task][az-pipeline-task-badge]][az-pipeline-task] |
20+
| **Github Action** | [![Github Action][gh-actions-badge]][gh-actions] |
21+
| **Docker** | [![Docker Pulls][dockerhub-badge]][dockerhub] |
2322

2423
## Compatibility
2524

@@ -67,8 +66,6 @@ from The Noun Project.
6766
[gvt]: https://www.nuget.org/packages/GitVersion.MsBuild
6867
[gvt-badge]: https://img.shields.io/nuget/v/GitVersion.MsBuild.svg?logo=nuget
6968
[gitversiontask]: https://www.nuget.org/packages/GitVersionTask/
70-
[gvcl]: https://www.nuget.org/packages/GitVersion.CommandLine
71-
[gvcl-badge]: https://img.shields.io/nuget/v/GitVersion.CommandLine.svg?logo=nuget
7269
[gvgt]: https://www.nuget.org/packages/GitVersion.Tool
7370
[gvgt-badge]: https://img.shields.io/nuget/v/GitVersion.Tool.svg?logo=nuget
7471
[brew]: https://formulae.brew.sh/formula/gitversion

‎build/.run/PublishCoverage.run.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="PublishCoverage" type="DotNetProject" factoryName=".NET Project" folderName="Unit Test">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=PublishCoverage --dotnet_target=net8.0" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=PublishCoverage --dotnet_target=8.0" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/.run/UnitTest (6.0).run.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="UnitTest (6.0)" type="DotNetProject" factoryName=".NET Project" folderName="Unit Test">
3-
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_target=net6.0" />
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_target=6.0" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/.run/UnitTest (8.0).run.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="UnitTest (8.0)" type="DotNetProject" factoryName=".NET Project" folderName="Unit Test">
3-
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_target=net8.0" />
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_target=8.0" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<option name="USE_EXTERNAL_CONSOLE" value="0" />

‎build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs

+1-9
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,7 @@ public override void Run(BuildContext context)
2828
{
2929
if (context.SkipImageTesting(dockerImage)) continue;
3030

31-
var framework = dockerImage.TargetFramework;
32-
33-
var targetFramework = framework switch
34-
{
35-
Constants.Version60 or Constants.Version80 => $"net{framework}",
36-
_ => framework
37-
};
38-
39-
var cmd = $"{rootPrefix}/scripts/test-msbuild-task.sh --version {version} --nugetPath {rootPrefix}/nuget --repoPath {rootPrefix}/repo/tests/integration --targetframework {targetFramework}";
31+
var cmd = $"{rootPrefix}/scripts/test-msbuild-task.sh --version {version} --nugetPath {rootPrefix}/nuget --repoPath {rootPrefix}/repo/tests/integration --targetframework net{dockerImage.TargetFramework}";
4032

4133
context.DockerTestArtifact(dockerImage, cmd);
4234
}

‎build/docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG REGISTRY='docker.io'
22
ARG DISTRO='debian.11'
3-
ARG DOTNET_VERSION='6.0'
3+
ARG DOTNET_VERSION='8.0'
44
ARG VERSION='5.12.0'
55

66
FROM $REGISTRY/gittools/build-images:$DISTRO-sdk-$DOTNET_VERSION as installer

‎build/nuspec/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ works out the [Semantic Version][semver] of the commit being built.
55

66
[![Gitter][gitter-badge]][gitter]
77

8-
| Artifact | Stable | |
9-
|:-----------------------|:-----------------------------|---------------------------------------------------------|
8+
| Artifact | Stable |
9+
|:-----------------------|:-----------------------------|
1010
| **GitVersion.Tool** | [![NuGet][gvgt-badge]][gvgt] |
11-
| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt] | Known as [GitVersionTask][gitversiontask] before v5.6.0 |
11+
| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt] |
1212

1313
## Compatibility
1414

‎docs/input/docs/usage/msbuild.md

+2-6
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ version information that is compiled into the resulting artifact.
1818
It currently works with desktop `MSBuild`. Support for CoreCLR with `dotnet build`
1919
is coming soon.
2020

21-
> **Note**\
22-
> The nuget package was "_[GitVersionTask](https://www.nuget.org/packages/GitVersionTask/)_" up until version 5.5.1.\
23-
> From version 5.6.0 it has been called "_[GitVersion.MsBuild](https://www.nuget.org/packages/GitVersion.MsBuild/)_"
24-
2521
## TL;DR
2622

2723
### Install the MSTask targets
@@ -40,7 +36,7 @@ If you're using `PackageReference` style NuGet dependencies (VS 2017+), add
4036
dependency of your package:
4137

4238
```xml
43-
<PackageReference Include="GitVersion.MsBuild" Version="5.6.10*">
39+
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
4440
<PrivateAssets>All</PrivateAssets>
4541
</PackageReference>
4642
```
@@ -278,7 +274,7 @@ You can configure GitVersion to generate the `GitVersionInformation` class in a
278274

279275
## Extra properties
280276

281-
There are properties that correspont to certain
277+
There are properties that correspond to certain
282278
[command line arguments](/docs/usage/cli/arguments) for GetVersion task.
283279
In particular, setting `GitVersion_NoFetchEnabled` to `true` disables `git fetch`
284280
during version calculation, setting `GitVersion_NoNormalizeEnabled` to `true` disables

0 commit comments

Comments
 (0)