Skip to content

Commit 2ea5df6

Browse files
authored
Merge branch 'master' into feature/support_for_wix_format
2 parents f922b4a + 5bf64fb commit 2ea5df6

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ works out the [semantic version][semver] of the commit being built.
77

88
[![Gitter][gitter-badge]][gitter]
99
[![Build status][appveyor-badge]][appveyor]
10-
<!-- [![Build Status][travis-badge]][travis] -->
1110
[![Build Status][azure-pipeline-badge]][azure-pipeline]
1211
[![codecov][codecov-badge]][codecov]
1312

@@ -26,6 +25,7 @@ works out the [semantic version][semver] of the commit being built.
2625
| **Docker** | [![Docker Pulls][dockerhub-badge]][dockerhub] | -
2726

2827
## Compatibility
28+
2929
GitVersion works Windows, Linux, and Mac.
3030

3131
Tip: If you get `System.TypeInitializationException: The type initializer for

build.cake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ Task("Docker-Build")
404404
if (parameters.IsRunningOnWindows)
405405
{
406406
DockerBuild("windows", "nano", "netcoreapp2.1", parameters);
407-
DockerBuild("windows", "windowservercore", "net472", parameters);
407+
DockerBuild("windows", "windowsservercore", "net472", parameters);
408408
}
409409
else if (parameters.IsRunningOnLinux)
410410
{
@@ -627,7 +627,7 @@ Task("Publish-DockerHub")
627627
if (parameters.IsRunningOnWindows)
628628
{
629629
DockerPush("windows", "nano", "netcoreapp2.1", parameters);
630-
DockerPush("windows", "windowservercore", "net472", parameters);
630+
DockerPush("windows", "windowsservercore", "net472", parameters);
631631
}
632632
else if (parameters.IsRunningOnLinux)
633633
{

0 commit comments

Comments
 (0)