net5.0 docker images

Author: arturcic

.github/workflows/build.yml

@@ -103,7 +103,7 @@ jobs:
     strategy:
       matrix:
         os: [linux]
-        targetFramework: [3.1]
+        targetFramework: [3.1, 5.0]
         distro: [alpine.3.12-x64, centos.7-x64, debian.9-x64, debian.10-x64, fedora.32-x64, ubuntu.16.04-x64, ubuntu.18.04-x64, ubuntu.20.04-x64]
       fail-fast: false
 
@@ -233,7 +233,7 @@ jobs:
     strategy:
       matrix:
         os: [linux]
-        targetFramework: [3.1]
+        targetFramework: [3.1, 5.0]
         distro: [alpine.3.12-x64, centos.7-x64, debian.9-x64, debian.10-x64, fedora.32-x64, ubuntu.16.04-x64, ubuntu.18.04-x64, ubuntu.20.04-x64]
       fail-fast: false
 

azure-pipelines.yml

@@ -60,7 +60,7 @@ stages:
       name: Linux
       vmImage: 'ubuntu-latest'
       distros: [ 'alpine.3.12-x64', 'centos.7-x64', 'debian.9-x64', 'debian.10-x64', 'fedora.32-x64', 'ubuntu.16.04-x64', 'ubuntu.18.04-x64', 'ubuntu.20.04-x64' ]
-      dotnetVersions: [ '3.1' ]
+      dotnetVersions: [ '3.1', '5.0' ]
 
 - stage: Artifact_Windows_Test
   displayName: 'Artifacts Windows test'
@@ -83,7 +83,7 @@ stages:
       name: Linux
       vmImage: 'ubuntu-latest'
       distros: [ 'alpine.3.12-x64', 'centos.7-x64', 'debian.9-x64', 'debian.10-x64', 'fedora.32-x64', 'ubuntu.16.04-x64', 'ubuntu.18.04-x64', 'ubuntu.20.04-x64' ]
-      dotnetVersions: [ '3.1' ]
+      dotnetVersions: [ '3.1', '5.0' ]
 
 - stage: Publish
   displayName: 'Publish'

build/artifacts-test.cake

@@ -111,6 +111,12 @@ Task("Artifacts-MsBuildCore-Test")
     {
         var (os, distro, targetframework) = dockerImage;
 
+        if (targetframework == "3.1") {
+            targetframework = $"netcoreapp{targetframework}";
+        } else if (targetframework == "5.0") {
+            targetframework = $"net{targetframework}";
+        }
+
         var cmd = $"-file {rootPrefix}/scripts/Test-MsBuildCore.ps1 -version {version} -repoPath {rootPrefix}/repo/tests/integration/core -nugetPath {rootPrefix}/nuget -targetframework {targetframework}";
 
         DockerTestArtifact(dockerImage, parameters, cmd);

build/utils/artifacts.cake

@@ -109,7 +109,7 @@ public class DockerImages
             {
                 foreach (var distro in ((JArray)targetFramework.Value))
                 {
-                    dockerImages.Add(new DockerImage(os: osItem.Name, distro: distro.ToString(), targetFramework: $"netcoreapp{targetFramework.Name}"));
+                    dockerImages.Add(new DockerImage(os: osItem.Name, distro: distro.ToString(), targetFramework: $"{targetFramework.Name}"));
                 }
             }
         }
@@ -119,7 +119,7 @@ public class DockerImages
         }
 
         if (!string.IsNullOrEmpty(parameters.DockerDotnetVersion)) {
-            dockerImages = dockerImages.Where(x => x.TargetFramework == $"netcoreapp{parameters.DockerDotnetVersion}").ToList();
+            dockerImages = dockerImages.Where(x => x.TargetFramework == $"{parameters.DockerDotnetVersion}").ToList();
         }
 
         var windowsImages = dockerImages.Where(x => x.OS == "windows").ToArray();

build/utils/docker.cake

@@ -37,7 +37,7 @@ void DockerBuild(DockerImage dockerImage, BuildParameters parameters)
         BuildArg = new []
         {
             $"contentFolder=/content",
-            $"DOTNET_VERSION={targetframework.Replace("netcoreapp", "")}",
+            $"DOTNET_VERSION={targetframework}",
             $"DISTRO={distro}",
             $"VERSION={parameters.Version.NugetVersion}"
         },
@@ -92,7 +92,7 @@ void DockerTestArtifact(DockerImage dockerImage, BuildParameters parameters, str
 {
     var settings = GetDockerRunSettings(parameters);
     var (os, distro, targetframework) = dockerImage;
-    var tag = $"gittools/build-images:{distro}-sdk-{targetframework.Replace("netcoreapp", "")}";
+    var tag = $"gittools/build-images:{distro}-sdk-{targetframework}";
 
     Information("Docker tag: {0}", tag);
     Information("Docker cmd: pwsh {0}", cmd);
@@ -103,7 +103,7 @@ void DockerTestArtifact(DockerImage dockerImage, BuildParameters parameters, str
 void DockerPullImage(DockerImage dockerImage, BuildParameters parameters)
 {
     var (os, distro, targetframework) = dockerImage;
-    var tag = $"gittools/build-images:{distro}-sdk-{targetframework.Replace("netcoreapp", "")}";
+    var tag = $"gittools/build-images:{distro}-sdk-{targetframework}";
     DockerPull(tag);
 }
 
@@ -150,7 +150,7 @@ string[] GetDockerTags(DockerImage dockerImage, BuildParameters parameters) {
         $"{name}:{parameters.Version.SemVersion}-{os}-{distro}-{targetframework}",
     };
 
-    if (distro == "debian-9" && targetframework == parameters.CoreFxVersion31 || distro == "nanoserver-1809") {
+    if (distro == "debian.10-x64" && targetframework == parameters.NetVersion50) {
         tags.AddRange(new[] {
             $"{name}:{parameters.Version.Version}-{os}",
             $"{name}:{parameters.Version.SemVersion}-{os}",

src/Docker/docker.json

@@ -9,11 +9,24 @@
             "ubuntu.16.04-x64",
             "ubuntu.18.04-x64",
             "ubuntu.20.04-x64"
+        ],
+        "5.0": [
+            "alpine.3.12-x64",
+            "centos.7-x64",
+            "debian.9-x64",
+            "debian.10-x64",
+            "fedora.32-x64",
+            "ubuntu.16.04-x64",
+            "ubuntu.18.04-x64",
+            "ubuntu.20.04-x64"
         ]
     },
     "windows": {
         "3.1": [
             "nanoserver"
+        ],
+        "5.0": [
+            "nanoserver"
         ]
     }
 }