Revert "(#2998) net5.0 removal"

arturcic · arturcic · commit 670640023f66 · 2022-04-02T18:20:17.000+02:00
This reverts commit d6f3507.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -129,7 +129,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        targetFramework: [net48, net6.0, netcoreapp3.1]
+        targetFramework: [net48, net5.0, net6.0, netcoreapp3.1]
       fail-fast: false
 
     steps:
@@ -213,7 +213,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        targetFramework: [ '3.1', '6.0' ]
+        targetFramework: [ '3.1', '5.0', '6.0' ]
         distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
       fail-fast: false
 
@@ -277,7 +277,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        targetFramework: [ '3.1', '6.0' ]
+        targetFramework: [ '3.1', '5.0', '6.0' ]
         distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
       fail-fast: false
 
diff --git a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
 [TaskName(nameof(ArtifactsDotnetToolTest))]
 [TaskDescription("Tests the dotnet global tool in docker container")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [IsDependentOn(typeof(ArtifactsPrepare))]
 public class ArtifactsDotnetToolTest : FrostingTask<BuildContext>
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
 [TaskName(nameof(ArtifactsMsBuildCoreTest))]
 [TaskDescription("Tests the msbuild package in docker container")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [IsDependentOn(typeof(ArtifactsPrepare))]
 public class ArtifactsMsBuildCoreTest : FrostingTask<BuildContext>
@@ -36,6 +36,7 @@ public override void Run(BuildContext context)
             targetFramework = targetFramework switch
             {
                 Constants.Version31 => $"netcoreapp{targetFramework}",
+                Constants.Version50 => $"net{targetFramework}",
                 Constants.Version60 => $"net{targetFramework}",
                 _ => targetFramework
             };
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
@@ -23,7 +23,7 @@ public override void Run(BuildContext context)
         var nugetSource = context.MakeAbsolute(Paths.Nuget).FullPath;
 
         context.Information("\nTesting msbuild task with dotnet build (for .net core)\n");
-        var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion60 };
+        var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion50, Constants.NetVersion60 };
         foreach (var framework in frameworks)
         {
             var dotnetMsBuildSettings = new DotNetMSBuildSettings();
diff --git a/build/artifacts/Tasks/ArtifactsNativeTest.cs b/build/artifacts/Tasks/ArtifactsNativeTest.cs
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
 [TaskName(nameof(ArtifactsNativeTest))]
 [TaskDescription("Tests the native executables in docker container")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [IsDependentOn(typeof(ArtifactsPrepare))]
 public class ArtifactsNativeTest : FrostingTask<BuildContext>
diff --git a/build/artifacts/Tasks/ArtifactsPrepare.cs b/build/artifacts/Tasks/ArtifactsPrepare.cs
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
 [TaskName(nameof(ArtifactsPrepare))]
 [TaskDescription("Pulls the docker images needed for testing the artifacts")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 public class ArtifactsPrepare : FrostingTask<BuildContext>
 {
diff --git a/build/artifacts/Tasks/ArtifactsTest.cs b/build/artifacts/Tasks/ArtifactsTest.cs
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
 [TaskName(nameof(ArtifactsTest))]
 [TaskDescription("Tests packages in docker container")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [IsDependentOn(typeof(ArtifactsNativeTest))]
 [IsDependentOn(typeof(ArtifactsDotnetToolTest))]
diff --git a/build/build/Tasks/Test/UnitTest.cs b/build/build/Tasks/Test/UnitTest.cs
@@ -8,7 +8,7 @@ namespace Build.Tasks;
 
 [TaskName(nameof(UnitTest))]
 [TaskDescription("Run the unit tests")]
-[TaskArgument(Arguments.DotnetTarget, Constants.NetVersion60, Constants.CoreFxVersion31, Constants.FullFxVersion48)]
+[TaskArgument(Arguments.DotnetTarget, Constants.NetVersion50, Constants.NetVersion60, Constants.CoreFxVersion31, Constants.FullFxVersion48)]
 [IsDependentOn(typeof(Build))]
 public class UnitTest : FrostingTask<BuildContext>
 {
@@ -17,7 +17,7 @@ public class UnitTest : FrostingTask<BuildContext>
     public override void Run(BuildContext context)
     {
         var dotnetTarget = context.Argument(Arguments.DotnetTarget, string.Empty);
-        var frameworks = new[] { Constants.CoreFxVersion31, Constants.FullFxVersion48, Constants.NetVersion60 };
+        var frameworks = new[] { Constants.CoreFxVersion31, Constants.FullFxVersion48, Constants.NetVersion50, Constants.NetVersion60 };
         if (!string.IsNullOrWhiteSpace(dotnetTarget))
         {
             if (!frameworks.Contains(dotnetTarget, StringComparer.OrdinalIgnoreCase))
diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs
@@ -6,16 +6,18 @@ public class Constants
     public const string Repository = "GitVersion";
 
     public const string Version60 = "6.0";
+    public const string Version50 = "5.0";
     public const string Version31 = "3.1";
 
+    public const string NetVersion50 = "net5.0";
     public const string NetVersion60 = "net6.0";
     public const string CoreFxVersion31 = "netcoreapp3.1";
     public const string FullFxVersion48 = "net48";
 
     public const string NoMono = "NoMono";
     public const string NoNet48 = "NoNet48";
 
-    public static readonly string[] VersionsToBuild = { Version60, Version31 };
+    public static readonly string[] VersionsToBuild = { Version60, Version50, Version31 };
     public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };
     public static readonly string[] DistrosToSkip = { Alpine312, Alpine313, Alpine314, Centos7 };
 
diff --git a/build/common/Utilities/DockerContextExtensions.cs b/build/common/Utilities/DockerContextExtensions.cs
@@ -158,7 +158,7 @@ private static IEnumerable<string> GetDockerTags(this BuildContextBase context,
             $"{name}:{context.Version.SemVersion}-{distro}-{targetFramework}",
         };
 
-        if (distro == Constants.DockerDistroLatest && targetFramework == Constants.Version60)
+        if (distro == Constants.DockerDistroLatest && targetFramework == Constants.Version50)
         {
             tags.AddRange(new[]
             {
diff --git a/build/docker/Tasks/DockerBuild.cs b/build/docker/Tasks/DockerBuild.cs
@@ -5,7 +5,7 @@ namespace Docker.Tasks;
 [TaskName(nameof(DockerBuild))]
 [TaskDescription("Build the docker images containing the GitVersion Tool")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
 public class DockerBuild : FrostingTask<BuildContext>
diff --git a/build/docker/Tasks/DockerManifest.cs b/build/docker/Tasks/DockerManifest.cs
@@ -5,7 +5,7 @@ namespace Docker.Tasks;
 [TaskName(nameof(DockerManifest))]
 [TaskDescription("Publish the docker manifest containing the images for amd64 and arm64")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [IsDependentOn(typeof(DockerManifestInternal))]
 public class DockerManifest : FrostingTask<BuildContext>
diff --git a/build/docker/Tasks/DockerPublish.cs b/build/docker/Tasks/DockerPublish.cs
@@ -5,7 +5,7 @@ namespace Docker.Tasks;
 [TaskName(nameof(DockerPublish))]
 [TaskDescription("Publish the docker images containing the GitVersion Tool")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
 [IsDependentOn(typeof(DockerPublishInternal))]
diff --git a/build/docker/Tasks/DockerTest.cs b/build/docker/Tasks/DockerTest.cs
@@ -5,7 +5,7 @@ namespace Docker.Tasks;
 [TaskName(nameof(DockerTest))]
 [TaskDescription("Test the docker images containing the GitVersion Tool")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
 [IsDependentOn(typeof(DockerBuild))]
diff --git a/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj b/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net48;netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net48;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
 
         <IsTestProject>true</IsTestProject>
     </PropertyGroup>
diff --git a/src/GitVersion.App/GitVersion.App.csproj b/src/GitVersion.App/GitVersion.App.csproj
@@ -4,7 +4,7 @@
         <OutputType>Exe</OutputType>
         <RootNamespace>GitVersion</RootNamespace>
         <AssemblyName>gitversion</AssemblyName>
-        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <PlatformTarget>AnyCPU</PlatformTarget>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>
diff --git a/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj b/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net48;netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net48;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
 
         <DebugType>full</DebugType>
         <Optimize>false</Optimize>
diff --git a/src/GitVersion.Core/Extensions/CallerArgumentExpressionAttribute.cs b/src/GitVersion.Core/Extensions/CallerArgumentExpressionAttribute.cs
@@ -1,6 +1,6 @@
 namespace System.Runtime.CompilerServices;
 
-#if !NET6_0
+#if !NET5_0 && !NET6_0
 
 /// <summary>
 /// Allows capturing of the expressions passed to a method.
diff --git a/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj b/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net48;netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net48;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
 
         <IsTestProject>true</IsTestProject>
     </PropertyGroup>
@@ -12,6 +12,12 @@
         <PackageReference Include="Microsoft.Build" Version="16.9.0" />
     </ItemGroup>
 
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
+        <PackageReference Include="Buildalyzer" Version="3.2.8" />
+        <PackageReference Include="MSBuild.ProjectCreation" Version="6.3.3" />
+        <PackageReference Include="Microsoft.Build" Version="16.11.0" />
+    </ItemGroup>
+
     <ItemGroup Condition=" '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net6.0' ">
         <PackageReference Include="Buildalyzer" Version="3.2.8" />
         <PackageReference Include="MSBuild.ProjectCreation" Version="6.3.3" />
diff --git a/src/GitVersion.MsBuild/nuget-files.props b/src/GitVersion.MsBuild/nuget-files.props
@@ -3,9 +3,11 @@
     <PropertyGroup>
         <PublishTask_net48>../GitVersion.App/bin/$(Configuration)/net48</PublishTask_net48>
         <PublishTask_netcore31>../GitVersion.App/bin/$(Configuration)/netcoreapp3.1/publish</PublishTask_netcore31>
+        <PublishTask_net50>../GitVersion.App/bin/$(Configuration)/net5.0/publish</PublishTask_net50>
         <PublishTask_net60>../GitVersion.App/bin/$(Configuration)/net6.0/publish</PublishTask_net60>
         <Target_net48>tools/net48</Target_net48>
         <Target_netcore31>tools/netcoreapp3.1</Target_netcore31>
+        <Target_net50>tools/net5.0</Target_net50>
         <Target_net60>tools/net6.0</Target_net60>
     </PropertyGroup>
     <ItemGroup Condition="$(IsPackaging) != ''">
@@ -15,10 +17,12 @@
 
         <None Include="$(PublishTask_net48)/**/*"                                Pack="true" PackagePath="$(Target_net48)" />
         <None Include="$(PublishTask_netcore31)/**/*"                            Pack="true" PackagePath="$(Target_netcore31)" />
+        <None Include="$(PublishTask_net50)/**/*"                                Pack="true" PackagePath="$(Target_net50)" />
         <None Include="$(PublishTask_net60)/**/*"                                Pack="true" PackagePath="$(Target_net60)" />
 
         <None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net48)" />
         <None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_netcore31)" />
+        <None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net50)" />
         <None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net60)" />
     </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public override void Run(BuildContext context)`
`23`	`23`	`var nugetSource = context.MakeAbsolute(Paths.Nuget).FullPath;`
`24`	`24`
`25`	`25`	`context.Information("\nTesting msbuild task with dotnet build (for .net core)\n");`
`26`		`- var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion60 };`
	`26`	`+ var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion50, Constants.NetVersion60 };`
`27`	`27`	`foreach (var framework in frameworks)`
`28`	`28`	`{`
`29`	`29`	`var dotnetMsBuildSettings = new DotNetMSBuildSettings();`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;`
`5`	`5`	`[TaskName(nameof(ArtifactsPrepare))]`
`6`	`6`	`[TaskDescription("Pulls the docker images needed for testing the artifacts")]`
`7`	`7`	`[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]`
`8`		`-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]`
	`8`	`+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]`
`9`	`9`	`[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]`
`10`	`10`	`public class ArtifactsPrepare : FrostingTask<BuildContext>`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Build.Tasks;`
`8`	`8`
`9`	`9`	`[TaskName(nameof(UnitTest))]`
`10`	`10`	`[TaskDescription("Run the unit tests")]`
`11`		`-[TaskArgument(Arguments.DotnetTarget, Constants.NetVersion60, Constants.CoreFxVersion31, Constants.FullFxVersion48)]`
	`11`	`+[TaskArgument(Arguments.DotnetTarget, Constants.NetVersion50, Constants.NetVersion60, Constants.CoreFxVersion31, Constants.FullFxVersion48)]`
`12`	`12`	`[IsDependentOn(typeof(Build))]`
`13`	`13`	`public class UnitTest : FrostingTask<BuildContext>`
`14`	`14`	`{`
`@@ -17,7 +17,7 @@ public class UnitTest : FrostingTask<BuildContext>`
`17`	`17`	`public override void Run(BuildContext context)`
`18`	`18`	`{`
`19`	`19`	`var dotnetTarget = context.Argument(Arguments.DotnetTarget, string.Empty);`
`20`		`- var frameworks = new[] { Constants.CoreFxVersion31, Constants.FullFxVersion48, Constants.NetVersion60 };`
	`20`	`+ var frameworks = new[] { Constants.CoreFxVersion31, Constants.FullFxVersion48, Constants.NetVersion50, Constants.NetVersion60 };`
`21`	`21`	`if (!string.IsNullOrWhiteSpace(dotnetTarget))`
`22`	`22`	`{`
`23`	`23`	`if (!frameworks.Contains(dotnetTarget, StringComparer.OrdinalIgnoreCase))`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ private static IEnumerable<string> GetDockerTags(this BuildContextBase context,`
`158`	`158`	`$"{name}:{context.Version.SemVersion}-{distro}-{targetFramework}",`
`159`	`159`	`};`
`160`	`160`
`161`		`- if (distro == Constants.DockerDistroLatest && targetFramework == Constants.Version60)`
	`161`	`+ if (distro == Constants.DockerDistroLatest && targetFramework == Constants.Version50)`
`162`	`162`	`{`
`163`	`163`	`tags.AddRange(new[]`
`164`	`164`	`{`