Skip to content

Commit 35f28bd

Browse files
arturcicarturcic
committed
(#2998) net5.0 removal
1 parent 7892afb commit 35f28bd

File tree

20 files changed

+22
-35
lines changed

20 files changed

+22
-35
lines changed

‎.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
strategy:
130130
matrix:
131131
os: [windows-latest, ubuntu-latest, macos-latest]
132-
targetFramework: [net48, net5.0, net6.0, netcoreapp3.1]
132+
targetFramework: [net48, net6.0, netcoreapp3.1]
133133
fail-fast: false
134134

135135
steps:
@@ -213,7 +213,7 @@ jobs:
213213
runs-on: ubuntu-latest
214214
strategy:
215215
matrix:
216-
targetFramework: [ '3.1', '5.0', '6.0' ]
216+
targetFramework: [ '3.1', '6.0' ]
217217
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 ]
218218
fail-fast: false
219219

@@ -277,7 +277,7 @@ jobs:
277277
runs-on: ubuntu-latest
278278
strategy:
279279
matrix:
280-
targetFramework: [ '3.1', '5.0', '6.0' ]
280+
targetFramework: [ '3.1', '6.0' ]
281281
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 ]
282282
fail-fast: false
283283

‎build/artifacts/Tasks/ArtifactsDotnetToolTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
55
[TaskName(nameof(ArtifactsDotnetToolTest))]
66
[TaskDescription("Tests the dotnet global tool in docker container")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
8-
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
8+
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
99
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1010
[IsDependentOn(typeof(ArtifactsPrepare))]
1111
public class ArtifactsDotnetToolTest : FrostingTask<BuildContext>

‎build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
55
[TaskName(nameof(ArtifactsMsBuildCoreTest))]
66
[TaskDescription("Tests the msbuild package in docker container")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
8-
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
8+
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
99
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1010
[IsDependentOn(typeof(ArtifactsPrepare))]
1111
public class ArtifactsMsBuildCoreTest : FrostingTask<BuildContext>
@@ -36,7 +36,6 @@ public override void Run(BuildContext context)
3636
targetFramework = targetFramework switch
3737
{
3838
Constants.Version31 => $"netcoreapp{targetFramework}",
39-
Constants.Version50 => $"net{targetFramework}",
4039
Constants.Version60 => $"net{targetFramework}",
4140
_ => targetFramework
4241
};

‎build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public override void Run(BuildContext context)
2323
var nugetSource = context.MakeAbsolute(Paths.Nuget).FullPath;
2424

2525
context.Information("\nTesting msbuild task with dotnet build (for .net core)\n");
26-
var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion50, Constants.NetVersion60 };
26+
var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion60 };
2727
foreach (var framework in frameworks)
2828
{
2929
var dotnetMsBuildSettings = new DotNetMSBuildSettings();

‎build/artifacts/Tasks/ArtifactsNativeTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
55
[TaskName(nameof(ArtifactsNativeTest))]
66
[TaskDescription("Tests the native executables in docker container")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
8-
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
8+
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
99
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1010
[IsDependentOn(typeof(ArtifactsPrepare))]
1111
public class ArtifactsNativeTest : FrostingTask<BuildContext>

‎build/artifacts/Tasks/ArtifactsPrepare.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
55
[TaskName(nameof(ArtifactsPrepare))]
66
[TaskDescription("Pulls the docker images needed for testing the artifacts")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
8-
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
8+
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
99
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1010
public class ArtifactsPrepare : FrostingTask<BuildContext>
1111
{

‎build/artifacts/Tasks/ArtifactsTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
55
[TaskName(nameof(ArtifactsTest))]
66
[TaskDescription("Tests packages in docker container")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
8-
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
8+
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
99
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1010
[IsDependentOn(typeof(ArtifactsNativeTest))]
1111
[IsDependentOn(typeof(ArtifactsDotnetToolTest))]

‎build/build/Tasks/Test/UnitTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Build.Tasks;
88

99
[TaskName(nameof(UnitTest))]
1010
[TaskDescription("Run the unit tests")]
11-
[TaskArgument(Arguments.DotnetTarget, Constants.NetVersion50, Constants.NetVersion60, Constants.CoreFxVersion31, Constants.FullFxVersion48)]
11+
[TaskArgument(Arguments.DotnetTarget, Constants.NetVersion60, Constants.CoreFxVersion31, Constants.FullFxVersion48)]
1212
[IsDependentOn(typeof(Build))]
1313
public class UnitTest : FrostingTask<BuildContext>
1414
{
@@ -17,7 +17,7 @@ public class UnitTest : FrostingTask<BuildContext>
1717
public override void Run(BuildContext context)
1818
{
1919
var dotnetTarget = context.Argument(Arguments.DotnetTarget, string.Empty);
20-
var frameworks = new[] { Constants.CoreFxVersion31, Constants.FullFxVersion48, Constants.NetVersion50, Constants.NetVersion60 };
20+
var frameworks = new[] { Constants.CoreFxVersion31, Constants.FullFxVersion48, Constants.NetVersion60 };
2121
if (!string.IsNullOrWhiteSpace(dotnetTarget))
2222
{
2323
if (!frameworks.Contains(dotnetTarget, StringComparer.OrdinalIgnoreCase))

‎build/common/Utilities/Constants.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@ public class Constants
66
public const string Repository = "GitVersion";
77

88
public const string Version60 = "6.0";
9-
public const string Version50 = "5.0";
109
public const string Version31 = "3.1";
1110

12-
public const string NetVersion50 = "net5.0";
1311
public const string NetVersion60 = "net6.0";
1412
public const string CoreFxVersion31 = "netcoreapp3.1";
1513
public const string FullFxVersion48 = "net48";
1614

1715
public const string NoMono = "NoMono";
1816
public const string NoNet48 = "NoNet48";
1917

20-
public static readonly string[] VersionsToBuild = { Version60, Version50, Version31 };
18+
public static readonly string[] VersionsToBuild = { Version60, Version31 };
2119
public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };
2220
public static readonly string[] DistrosToSkip = { Alpine312, Alpine313, Alpine314, Centos7 };
2321

‎build/common/Utilities/DockerContextExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private static IEnumerable<string> GetDockerTags(this BuildContextBase context,
158158
$"{name}:{context.Version.SemVersion}-{distro}-{targetFramework}",
159159
};
160160

161-
if (distro == Constants.DockerDistroLatest && targetFramework == Constants.Version50)
161+
if (distro == Constants.DockerDistroLatest && targetFramework == Constants.Version60)
162162
{
163163
tags.AddRange(new[]
164164
{

‎build/docker/Tasks/DockerBuild.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Docker.Tasks;
55
[TaskName(nameof(DockerBuild))]
66
[TaskDescription("Build the docker images containing the GitVersion Tool")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
8-
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
8+
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
99
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1010
[TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
1111
public class DockerBuild : FrostingTask<BuildContext>

‎build/docker/Tasks/DockerManifest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Docker.Tasks;
55
[TaskName(nameof(DockerManifest))]
66
[TaskDescription("Publish the docker manifest containing the images for amd64 and arm64")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
8-
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
8+
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
99
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1010
[IsDependentOn(typeof(DockerManifestInternal))]
1111
public class DockerManifest : FrostingTask<BuildContext>

‎build/docker/Tasks/DockerPublish.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Docker.Tasks;
55
[TaskName(nameof(DockerPublish))]
66
[TaskDescription("Publish the docker images containing the GitVersion Tool")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
8-
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
8+
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
99
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1010
[TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
1111
[IsDependentOn(typeof(DockerPublishInternal))]

‎build/docker/Tasks/DockerTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Docker.Tasks;
55
[TaskName(nameof(DockerTest))]
66
[TaskDescription("Test the docker images containing the GitVersion Tool")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
8-
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
8+
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
99
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1010
[TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
1111
[IsDependentOn(typeof(DockerBuild))]

‎src/GitVersion.App.Tests/GitVersion.App.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net48;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net48;netcoreapp3.1;net6.0</TargetFrameworks>
44

55
<IsTestProject>true</IsTestProject>
66
</PropertyGroup>

‎src/GitVersion.App/GitVersion.App.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>Exe</OutputType>
55
<RootNamespace>GitVersion</RootNamespace>
66
<AssemblyName>gitversion</AssemblyName>
7-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
7+
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
88
<PlatformTarget>AnyCPU</PlatformTarget>
99
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1010
<DocumentationFile>bin\$(Configuration)\GitVersion.xml</DocumentationFile>

‎src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net48;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net48;netcoreapp3.1;net6.0</TargetFrameworks>
55

66
<DebugType>full</DebugType>
77
<Optimize>false</Optimize>

‎src/GitVersion.Core/Extensions/CallerArgumentExpressionAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace System.Runtime.CompilerServices;
22

3-
#if !NET5_0 && !NET6_0
3+
#if !NET6_0
44

55
/// <summary>
66
/// Allows capturing of the expressions passed to a method.

‎src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net48;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net48;netcoreapp3.1;net6.0</TargetFrameworks>
55

66
<IsTestProject>true</IsTestProject>
77
</PropertyGroup>
@@ -12,12 +12,6 @@
1212
<PackageReference Include="Microsoft.Build" Version="16.9.0" />
1313
</ItemGroup>
1414

15-
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
16-
<PackageReference Include="Buildalyzer" Version="3.2.8" />
17-
<PackageReference Include="MSBuild.ProjectCreation" Version="6.3.3" />
18-
<PackageReference Include="Microsoft.Build" Version="16.11.0" />
19-
</ItemGroup>
20-
2115
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net6.0' ">
2216
<PackageReference Include="Buildalyzer" Version="3.2.8" />
2317
<PackageReference Include="MSBuild.ProjectCreation" Version="6.3.3" />

‎src/GitVersion.MsBuild/nuget-files.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
<PropertyGroup>
44
<PublishTask_net48>../GitVersion.App/bin/$(Configuration)/net48</PublishTask_net48>
55
<PublishTask_netcore31>../GitVersion.App/bin/$(Configuration)/netcoreapp3.1/publish</PublishTask_netcore31>
6-
<PublishTask_net50>../GitVersion.App/bin/$(Configuration)/net5.0/publish</PublishTask_net50>
76
<PublishTask_net60>../GitVersion.App/bin/$(Configuration)/net6.0/publish</PublishTask_net60>
87
<Target_net48>tools/net48</Target_net48>
98
<Target_netcore31>tools/netcoreapp3.1</Target_netcore31>
10-
<Target_net50>tools/net5.0</Target_net50>
119
<Target_net60>tools/net6.0</Target_net60>
1210
</PropertyGroup>
1311
<ItemGroup Condition="$(IsPackaging) != ''">
@@ -17,12 +15,10 @@
1715

1816
<None Include="$(PublishTask_net48)/**/*" Pack="true" PackagePath="$(Target_net48)" />
1917
<None Include="$(PublishTask_netcore31)/**/*" Pack="true" PackagePath="$(Target_netcore31)" />
20-
<None Include="$(PublishTask_net50)/**/*" Pack="true" PackagePath="$(Target_net50)" />
2118
<None Include="$(PublishTask_net60)/**/*" Pack="true" PackagePath="$(Target_net60)" />
2219

2320
<None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net48)" />
2421
<None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_netcore31)" />
25-
<None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net50)" />
2622
<None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net60)" />
2723
</ItemGroup>
2824
</Project>

0 commit comments

Comments
 (0)