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, 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, 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, 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, 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

@@ -113,6 +113,8 @@ Task("Artifacts-MsBuildCore-Test")
 
         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}";

build/utils/artifacts.cake

@@ -100,7 +100,7 @@ public class DockerImages
 
     public static DockerImages GetDockerImages(ICakeContext context, BuildParameters parameters)
     {
-        var versions =  new[] { "3.1" };
+        var versions =  new[] { "3.1", "5.0" };
         var distros  = parameters.DockerDistros;
 
         var dockerImages =

build/utils/docker.cake

@@ -150,7 +150,7 @@ string[] GetDockerTags(DockerImage dockerImage, BuildParameters parameters) {
         $"{name}:{parameters.Version.SemVersion}-{distro}-{targetframework}",
     };
 
-    if (distro == "debian.10-x64" && targetframework == parameters.CoreFxVersion31) {
+    if (distro == "debian.10-x64" && targetframework == parameters.NetVersion50) {
         tags.AddRange(new[] {
             $"{name}:{parameters.Version.Version}",
             $"{name}:{parameters.Version.SemVersion}",