Merge branch 'master' into stazz/NuGetUtilsUpdate

Author: stazz

.travis.yml

@@ -1,7 +1,7 @@
 language: csharp
 sudo: required
 dist: trusty
-dotnet: 2.1.504
+dotnet: 2.1.505
 mono:
   - latest
 os:

azure-pipelines.yml

@@ -1,5 +1,5 @@
 variables:
-  DOTNET_SDK_VERSION: '2.1.504'
+  DOTNET_SDK_VERSION: '2.1.505'
   DOTNET_PACKAGE_TYPE: 'sdk'
   RUBY_VERSION: '2.5'
 

build.cake

@@ -411,17 +411,22 @@ Task("Docker-Build")
 {
     if (parameters.IsRunningOnWindows)
     {
-        DockerBuild("windows", "nano", "netcoreapp2.1", parameters);
         DockerBuild("windows", "windowsservercore", "net472", parameters);
+
+        DockerBuild("windows", "nano", "netcoreapp2.1", parameters);
+
+        DockerBuild("windows", "nano", "netcoreapp2.2", parameters);
     }
     else if (parameters.IsRunningOnLinux)
     {
-        DockerBuild("linux", "debian", "net472", parameters);
-        DockerBuild("linux", "debian", "netcoreapp2.1", parameters);
-        DockerBuild("linux", "centos7", "netcoreapp2.1", parameters);
+        DockerBuild("linux", "debian",   "net472", parameters);
+
+        DockerBuild("linux", "debian",   "netcoreapp2.1", parameters);
+        DockerBuild("linux", "centos7",  "netcoreapp2.1", parameters);
         DockerBuild("linux", "fedora27", "netcoreapp2.1", parameters);
-        DockerBuild("linux", "debian", "netcoreapp2.2", parameters);
-        DockerBuild("linux", "centos7", "netcoreapp2.2", parameters);
+
+        DockerBuild("linux", "debian",   "netcoreapp2.2", parameters);
+        DockerBuild("linux", "centos7",  "netcoreapp2.2", parameters);
         DockerBuild("linux", "fedora27", "netcoreapp2.2", parameters);
     }
 });

build.config

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 CAKE_VERSION=0.32.1
-DOTNET_VERSION=2.1.504
+DOTNET_VERSION=2.1.505

src/Docker/windows/nano/netcoreapp2.1/Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.1-runtime
+FROM mcr.microsoft.com/dotnet/core/runtime:2.1-nanoserver-sac2016
 LABEL maintainers="GitTools Maintainers"
 ARG contentFolder
 

src/Docker/windows/nano/netcoreapp2.2/Dockerfile

@@ -0,0 +1,8 @@
+FROM mcr.microsoft.com/dotnet/core/runtime:2.2-nanoserver-sac2016
+LABEL maintainers="GitTools Maintainers"
+ARG contentFolder
+
+WORKDIR /app
+COPY $contentFolder/ ./
+
+ENTRYPOINT ["dotnet", "GitVersion.dll"]

src/Docker/windows/windowsservercore/net472/Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/dotnet-framework:4.7.2-runtime
+FROM mcr.microsoft.com/dotnet/framework/runtime:4.7.2
 LABEL maintainers="GitTools Maintainers"
 ARG contentFolder
 

src/global.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "2.1.504"
+        "version": "2.1.505"
     }
 }