From 8474eeed4e561fd9884bb3aade07d3616d828fc2 Mon Sep 17 00:00:00 2001 From: vip32 Date: Thu, 12 Nov 2020 17:13:15 +0100 Subject: [PATCH 1/6] targetframework 5.0 for GitVersionExe --- src/GitVersionExe.Tests/GitVersionExe.Tests.csproj | 2 +- src/GitVersionExe/GitVersionExe.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj index 58d1d0088e..2ec65e49fa 100644 --- a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj +++ b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj @@ -1,6 +1,6 @@ - net48;netcoreapp2.1;netcoreapp3.1 + net48;netcoreapp2.1;netcoreapp3.1;net5.0 true diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj index e4410bcd5e..5166819903 100644 --- a/src/GitVersionExe/GitVersionExe.csproj +++ b/src/GitVersionExe/GitVersionExe.csproj @@ -4,7 +4,7 @@ Exe GitVersion gitversion - netcoreapp2.1;netcoreapp3.1 + netcoreapp2.1;netcoreapp3.1;net5.0 AnyCPU MIT bin\$(Configuration)\GitVersion.xml From 96291af0507f966f3e8713cbce03736864256118 Mon Sep 17 00:00:00 2001 From: vip32 Date: Thu, 12 Nov 2020 17:23:35 +0100 Subject: [PATCH 2/6] build with net50 too --- build.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.config b/build.config index 0b174f00f5..62d1da12b0 100644 --- a/build.config +++ b/build.config @@ -1,2 +1,2 @@ #!/usr/bin/env bash -DOTNET_VERSION=2.1.811,3.1.403 \ No newline at end of file +DOTNET_VERSION=2.1.811,3.1.403,5.0.100 From f26a80b5e68b12462e9b36add990e3f50be1f406 Mon Sep 17 00:00:00 2001 From: vip32 Date: Fri, 13 Nov 2020 10:07:29 +0100 Subject: [PATCH 3/6] NetVersion50 framework tests --- build/test.cake | 6 +++--- build/utils/parameters.cake | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/test.cake b/build/test.cake index 43e7ced903..669c4a98e0 100644 --- a/build/test.cake +++ b/build/test.cake @@ -5,7 +5,7 @@ Task("UnitTest") .IsDependentOn("Build") .Does((parameters) => { - var frameworks = new[] { parameters.CoreFxVersion31, parameters.FullFxVersion48 }; + var frameworks = new[] { parameters.CoreFxVersion31, parameters.FullFxVersion48, parameters.NetVersion50 }; var testResultsPath = parameters.Paths.Directories.TestResultsOutput; foreach(var framework in frameworks) @@ -39,7 +39,7 @@ Task("UnitTest") Exclude = new List { "[GitVersion*.Tests]*", "[GitVersionTask.MsBuild]*" } }; - if (string.Equals(framework, parameters.FullFxVersion48)) + if (string.Equals(framework, parameters.FullFxVersion48)) { if (IsRunningOnUnix()) { settings.Filter = "TestCategory!=NoMono"; @@ -47,7 +47,7 @@ Task("UnitTest") settings.Filter = "TestCategory!=NoNet48"; } } - + DotNetCoreTest(project.FullPath, settings, coverletSettings); }); } diff --git a/build/utils/parameters.cake b/build/utils/parameters.cake index 882efbe788..6b48261a84 100644 --- a/build/utils/parameters.cake +++ b/build/utils/parameters.cake @@ -12,6 +12,7 @@ public class BuildParameters public const string MainRepoName = "GitVersion"; public string CoreFxVersion21 { get; private set; } = "netcoreapp2.1"; public string CoreFxVersion31 { get; private set; } = "netcoreapp3.1"; + public string NetVersion50 { get; private set; } = "net5.0"; public string FullFxVersion48 { get; private set; } = "net48"; public string DockerDistro { get; private set; } From 1fe4e67004a34614ae2c996b4eb63e630e300b17 Mon Sep 17 00:00:00 2001 From: vip32 Date: Fri, 13 Nov 2020 10:26:16 +0100 Subject: [PATCH 4/6] more parameters.NetVersion50 --- build/artifacts-test.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/artifacts-test.cake b/build/artifacts-test.cake index 230be3ece9..9441e8844e 100644 --- a/build/artifacts-test.cake +++ b/build/artifacts-test.cake @@ -134,7 +134,7 @@ Task("Artifacts-MsBuildFull-Test") var nugetSource = MakeAbsolute(parameters.Paths.Directories.NugetRoot).FullPath; Information("\nTesting msbuild task with dotnet build (for .net core)\n"); - var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion31 }; + var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion31, parameters.NetVersion50 }; foreach(var framework in frameworks) { var dotnetCoreMsBuildSettings = new DotNetCoreMSBuildSettings(); From 025031e587207d4f9e2479ae2de413b9b22a03da Mon Sep 17 00:00:00 2001 From: vip32 Date: Fri, 13 Nov 2020 10:33:46 +0100 Subject: [PATCH 5/6] net50 targetframework for all test projects --- src/GitVersionCore.Tests/GitVersionCore.Tests.csproj | 2 +- src/GitVersionTask.Tests/GitVersionTask.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj index 0c4d78924a..43cfb264e8 100644 --- a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj +++ b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj @@ -1,7 +1,7 @@ - net48;netcoreapp2.1;netcoreapp3.1 + net48;netcoreapp2.1;netcoreapp3.1;net5.0 full false diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj index e83c06bf74..45d58d913c 100644 --- a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj +++ b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj @@ -1,6 +1,6 @@ - net48;netcoreapp2.1;netcoreapp3.1 + net48;netcoreapp2.1;netcoreapp3.1;net5.0 true From 3d9ff8394af8d61905b1f27e3a2e3ad1b9cf4884 Mon Sep 17 00:00:00 2001 From: vp Date: Fri, 13 Nov 2020 11:06:17 +0100 Subject: [PATCH 6/6] net5.0 docker images --- .github/workflows/build.yml | 4 ++-- azure-pipelines.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index efe2574997..2d2b0d457e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -103,7 +103,7 @@ jobs: strategy: matrix: os: [linux] - targetFramework: [3.1] + targetFramework: [3.1, 5.0] distro: [alpine.3.10-x64, centos.7-x64, debian.9-x64, fedora.30-x64, ubuntu.16.04-x64, ubuntu.18.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.10-x64, centos.7-x64, debian.9-x64, fedora.30-x64, ubuntu.16.04-x64, ubuntu.18.04-x64] fail-fast: false diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0406592a51..5a6c1b5060 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -60,7 +60,7 @@ stages: name: Linux vmImage: 'ubuntu-latest' distros: [ 'alpine.3.10-x64', 'centos.7-x64', 'debian.9-x64', 'fedora.30-x64', 'ubuntu.16.04-x64', 'ubuntu.18.04-x64' ] - dotnetVersions: [ '3.1' ] + dotnetVersions: [ '3.1', '5.0' ] - stage: Docker displayName: 'Docker Build & Test' @@ -72,7 +72,7 @@ stages: name: Linux vmImage: 'ubuntu-latest' distros: [ 'alpine.3.10-x64', 'centos.7-x64', 'debian.9-x64', 'fedora.30-x64', 'ubuntu.16.04-x64', 'ubuntu.18.04-x64' ] - dotnetVersions: [ '3.1' ] + dotnetVersions: [ '3.1', '5.0' ] - stage: Publish displayName: 'Publish'