Skip to content

Commit d485fb3

Browse files
InokInok
committed
Merge branch 'master' into refactor-configuration
2 parents f10d90e + 3fccbc3 commit d485fb3

File tree

8 files changed

+23
-22
lines changed

8 files changed

+23
-22
lines changed

‎README.md

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,23 @@
66
Versioning when using git, solved. GitVersion looks at your git history and
77
works out the [semantic version][semver] of the commit being built.
88

9-
[![Gitter][gitter-badge]][gitter]
109
[![Build status][appveyor-badge]][appveyor]
1110
[![Build status][azure-pipeline-badge]][azure-pipeline]
1211
[![Build status][github-actions-badge]][github-actions]
12+
1313
[![codecov][codecov-badge]][codecov]
14-
<!-- [![Build status][github-actions-badge]][github-actions] -->
15-
16-
| | Stable | Pre-release |
17-
| ------------------------------------: | :----------------------------------------------------------------: | :------------------------------------------------------------------------: |
18-
| **GitHub Release** | [![GitHub release][gh-rel-badge]][gh-rel] | - |
19-
| **GitVersion.Portable** | [![Chocolatey][choco-badge]][choco] | [![Chocolatey][choco-pre-badge]][choco] |
20-
| **GitVersionTask** | [![NuGet][gvt-badge]][gvt] | [![NuGet][gvt-pre-badge]][gvt] |
21-
| **GitVersion.CommandLine** | [![NuGet][gvcl-badge]][gvcl] | [![NuGet][gvcl-pre-badge]][gvcl] |
22-
| **GitVersion.Tool** | [![NuGet][gvgt-badge]][gvgt] | [![NuGet][gvgt-pre-badge]][gvgt] |
23-
| **Homebrew** | [![homebrew][brew-badge]][brew] | - |
24-
| **Docker** | [![Docker Pulls][dockerhub-badge]][dockerhub] | - |
25-
| **Azure Pipeline Task** | [![Azure Pipeline Task][az-pipeline-task-badge]][az-pipeline-task] | - |
26-
| **Github Action** | [![Github Action][gh-actions-badge]][gh-actions] | - |
14+
[![Gitter][gitter-badge]][gitter]
15+
16+
| Artifact | Stable |
17+
| :------------------------- | :----------------------------------------------------------------- |
18+
| **GitHub Release** | [![GitHub release][gh-rel-badge]][gh-rel] |
19+
| **GitVersion.Portable** | [![Chocolatey][choco-badge]][choco] |
20+
| **GitVersion.Tool** | [![NuGet][gvgt-badge]][gvgt] |
21+
| **GitVersion.CommandLine** | [![NuGet][gvcl-badge]][gvcl] |
22+
| **GitVersionTask** | [![NuGet][gvt-badge]][gvt] |
23+
| **Azure Pipeline Task** | [![Azure Pipeline Task][az-pipeline-task-badge]][az-pipeline-task] |
24+
| **Github Action** | [![Github Action][gh-actions-badge]][gh-actions] |
25+
| **Docker** | [![Docker Pulls][dockerhub-badge]][dockerhub] |
2726

2827
## Compatibility
2928

@@ -78,16 +77,12 @@ from The Noun Project.
7877
[gh-rel-badge]: https://img.shields.io/github/release/gittools/gitversion.svg?logo=github
7978
[choco]: https://chocolatey.org/packages/GitVersion.Portable
8079
[choco-badge]: https://img.shields.io/chocolatey/v/gitversion.portable.svg?logo=nuget
81-
[choco-pre-badge]: https://img.shields.io/chocolatey/vpre/gitversion.portable.svg?logo=nuget
8280
[gvt]: https://www.nuget.org/packages/GitVersionTask
8381
[gvt-badge]: https://img.shields.io/nuget/v/GitVersionTask.svg?logo=nuget
84-
[gvt-pre-badge]: https://img.shields.io/nuget/vpre/GitVersionTask.svg?logo=nuget
8582
[gvcl]: https://www.nuget.org/packages/GitVersion.CommandLine
8683
[gvcl-badge]: https://img.shields.io/nuget/v/GitVersion.CommandLine.svg?logo=nuget
87-
[gvcl-pre-badge]: https://img.shields.io/nuget/vpre/GitVersion.CommandLine.svg?logo=nuget
8884
[gvgt]: https://www.nuget.org/packages/GitVersion.Tool
8985
[gvgt-badge]: https://img.shields.io/nuget/v/GitVersion.Tool.svg?logo=nuget
90-
[gvgt-pre-badge]: https://img.shields.io/nuget/vpre/GitVersion.Tool.svg?logo=nuget
9186
[brew]: http://brew.sh/
9287
[brew-badge]: https://img.shields.io/homebrew/v/gitversion.svg?logo=homebrew
9388
[dockerhub]: https://hub.docker.com/r/gittools/gitversion/

‎src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<PackageVersion_MicrosoftTestSdk>16.6.1</PackageVersion_MicrosoftTestSdk>
3030
<PackageVersion_NSubstitute>4.2.1</PackageVersion_NSubstitute>
31-
<PackageVersion_CoverletMsBuild>2.8.1</PackageVersion_CoverletMsBuild>
31+
<PackageVersion_CoverletMsBuild>2.9.0</PackageVersion_CoverletMsBuild>
3232
<PackageVersion_NUnit>3.12.0</PackageVersion_NUnit>
3333
<PackageVersion_GitToolsTesting>1.2.0</PackageVersion_GitToolsTesting>
3434
<PackageVersion_NUnit3TestAdapter>3.16.1</PackageVersion_NUnit3TestAdapter>

‎src/GitVersionCore.Tests/VersionConverters/Approved/cs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
//------------------------------------------------------------------------------
1010

1111
[global::System.Runtime.CompilerServices.CompilerGenerated]
12+
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
1213
static class GitVersionInformation
1314
{
1415
public static string Major = "1";

‎src/GitVersionCore.Tests/VersionConverters/Approved/fs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
[<AbstractClass; Sealed>]
1212
[<global.System.Runtime.CompilerServices.CompilerGenerated>]
13+
[<global.System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>]
1314
module GitVersionInformation
1415
let Major = "1"
1516
let Minor = "2"

‎src/GitVersionCore.Tests/VersionConverters/Approved/vb/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
'------------------------------------------------------------------------------
1010

1111
<Global.System.Runtime.CompilerServices.CompilerGenerated()>
12+
<Global.System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage()>
1213
NotInheritable Class GitVersionInformation
1314
Private Sub New()
1415
End Sub

‎src/GitVersionCore/VersionConverters/GitVersionInfo/Templates/GitVersionInformation.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//------------------------------------------------------------------------------
1+
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was generated by a tool.
44
// GitVersion
@@ -9,6 +9,7 @@
99
//------------------------------------------------------------------------------
1010

1111
[global::System.Runtime.CompilerServices.CompilerGenerated]
12+
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
1213
static class GitVersionInformation
1314
{{
1415
{0}

‎src/GitVersionCore/VersionConverters/GitVersionInfo/Templates/GitVersionInformation.fs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//------------------------------------------------------------------------------
1+
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was generated by a tool.
44
// GitVersion
@@ -10,5 +10,6 @@
1010

1111
[<AbstractClass; Sealed>]
1212
[<global.System.Runtime.CompilerServices.CompilerGenerated>]
13+
[<global.System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>]
1314
module GitVersionInformation
1415
{0}

‎src/GitVersionCore/VersionConverters/GitVersionInfo/Templates/GitVersionInformation.vb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'------------------------------------------------------------------------------
1+
'------------------------------------------------------------------------------
22
' <auto-generated>
33
' This code was generated by a tool.
44
' GitVersion
@@ -9,6 +9,7 @@
99
'------------------------------------------------------------------------------
1010

1111
<Global.System.Runtime.CompilerServices.CompilerGenerated()>
12+
<Global.System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage()>
1213
NotInheritable Class GitVersionInformation
1314
Private Sub New()
1415
End Sub

0 commit comments

Comments
 (0)