Skip to content
This repository was archived by the owner on Jan 17, 2022. It is now read-only.

Commit c6ba391

Browse files
Removed net5.0 targets (#655)
1 parent 5da2b04 commit c6ba391

8 files changed

Lines changed: 13 additions & 29 deletions

File tree

.build/Build.CI.cs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
using Newtonsoft.Json;
21
using Nuke.Common.CI.GitHubActions;
32
using Nuke.Common.CI.GitHubActions.Configuration;
43
using Rocket.Surgery.Nuke.ContinuousIntegration;
54
using Rocket.Surgery.Nuke.DotNetCore;
65
using Rocket.Surgery.Nuke.GithubActions;
7-
using YamlDotNet.Core;
86

97
#pragma warning disable CA1050
108

11-
class LocalConstants
9+
internal class LocalConstants
1210
{
1311
public static string[] PathsIgnore =
1412
{
@@ -64,7 +62,8 @@ class LocalConstants
6462
)]
6563
[PrintBuildVersion]
6664
[PrintCIEnvironment]
67-
[UploadLogs, TitleEvents]
65+
[UploadLogs]
66+
[TitleEvents]
6867
public partial class Solution
6968
{
7069
public static RocketSurgeonGitHubActionsConfiguration CiIgnoreMiddleware(
@@ -77,7 +76,7 @@ RocketSurgeonGitHubActionsConfiguration configuration
7776
}
7877

7978
configuration.Jobs.RemoveAt(1);
80-
( (RocketSurgeonsGithubActionsJob)configuration.Jobs[0] ).Steps = new List<GitHubActionsStep>()
79+
( (RocketSurgeonsGithubActionsJob)configuration.Jobs[0] ).Steps = new List<GitHubActionsStep>
8180
{
8281
new RunStep("N/A")
8382
{
@@ -118,10 +117,6 @@ RocketSurgeonGitHubActionsConfiguration configuration
118117
{
119118
DotNetVersion = "3.1.x"
120119
},
121-
new SetupDotNetStep("Use .NET Core 5.0 SDK")
122-
{
123-
DotNetVersion = "5.0.x"
124-
},
125120
new SetupDotNetStep("Use .NET Core 6.0 SDK")
126121
{
127122
DotNetVersion = "6.0.x"

.config/dotnet-tools.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@
77
"commands": ["dotnet-outdated"]
88
},
99
"gitversion.tool": {
10-
"version": "5.6.8",
10+
"version": "5.8.1",
1111
"commands": ["dotnet-gitversion"]
1212
},
1313
"dotnet-reportgenerator-globaltool": {
14-
"version": "4.8.7",
14+
"version": "5.0.2",
1515
"commands": ["reportgenerator"]
1616
},
1717
"nuke.globaltool": {
18-
"version": "5.2.1",
18+
"version": "6.0.1",
1919
"commands": ["nuke"]
2020
},
2121
"codecov.tool": {
2222
"version": "1.13.0",
2323
"commands": ["codecov"]
2424
},
2525
"jetbrains.resharper.globaltools": {
26-
"version": "2021.3.0-eap02",
26+
"version": "2021.3.2",
2727
"commands": ["jb"]
2828
},
2929
"dotnet-format": {
30-
"version": "5.1.225507",
30+
"version": "5.1.250801",
3131
"commands": ["dotnet-format"]
3232
},
3333
"nukeeper": {

.github/workflows/ci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,6 @@ jobs:
8484
uses: actions/setup-dotnet@v1.9.0
8585
with:
8686
dotnet-version: '3.1.x'
87-
- name: 🔨 Use .NET Core 5.0 SDK
88-
uses: actions/setup-dotnet@v1.9.0
89-
with:
90-
dotnet-version: '5.0.x'
9187
- name: 🔨 Use .NET Core 6.0 SDK
9288
uses: actions/setup-dotnet@v1.9.0
9389
with:

Packages.support.props

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,4 @@
99
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="3.1.*" />
1010
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="4.7.*" />
1111
</ItemGroup>
12-
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
13-
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.*" />
14-
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.*" />
15-
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.*" />
16-
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="5.0.*" />
17-
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="5.0.*" />
18-
</ItemGroup>
1912
</Project>

src/Conventions.Autofac/Rocket.Surgery.Conventions.Autofac.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>netstandard2.1;netstandard2.0;net5.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.1;netstandard2.0;net6.0</TargetFrameworks>
44
<PackageDescription>Provides Autofac support for a Rocket Surgery Application</PackageDescription>
55
<PackageTags>$(PackageTags);autofac</PackageTags>
66
</PropertyGroup>

src/Hosting.Autofac/Rocket.Surgery.Hosting.Autofac.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>netstandard2.1;netstandard2.0;net5.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.1;netstandard2.0;net6.0</TargetFrameworks>
44
<PackageDescription
55
>Provides Autofac support for a Rocket Surgery Application, converts the default service provider into an autofac based one</PackageDescription>
66
<PackageTags>$(PackageTags);autofac</PackageTags>

src/WebAssembly.Hosting.Autofac/Rocket.Surgery.WebAssembly.Hosting.Autofac.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>net5.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net6.0</TargetFrameworks>
44
<PackageDescription
55
>Provides Autofac support for a Rocket Surgery Application, converts the default service provider into an autofac based one</PackageDescription>
66
<PackageTags>$(PackageTags);autofac</PackageTags>

test/Autofac.Tests/Rocket.Surgery.Extensions.Autofac.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>net5.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net6.0</TargetFrameworks>
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageReference Include="Rocket.Surgery.Conventions" />

0 commit comments

Comments
 (0)