Skip to content

Commit dd3822a

Browse files
AtLeastITryAtLeastITry
authored
[Feature] - Updated to net5.0 (#172)
* Updated to net5.0 * Fixed build. * Updated github actions. * fixed build. * Updated lgtm config.
1 parent 9bb9729 commit dd3822a

File tree

14 files changed

+73
-70
lines changed

14 files changed

+73
-70
lines changed

‎.github/workflows/build.yml

+6-15
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v2
1313

14-
# Install .NET Core
15-
- name: Setup .NET Core
14+
# Install .NET
15+
- name: Setup .NET
1616
uses: actions/setup-dotnet@v1
1717
with:
18-
dotnet-version: 3.1.101
18+
dotnet-version: 5.0.100
1919

2020
# Restore projects
2121
- name: Restore projects
@@ -25,15 +25,6 @@ jobs:
2525
- name: Build projects
2626
run: dotnet build --configuration Release --no-restore
2727

28-
# Test SIO.Domain.Tests
29-
- name: Test SIO.Domain.Tests
30-
run: dotnet test tests/SIO.Domain.Tests/SIO.Domain.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
31-
# Test SIO.Identity.Tests
32-
- name: Test SIO.Identity.Tests
33-
run: dotnet test tests/SIO.Identity.Tests/SIO.Identity.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
34-
# Test SIO.Infrastructure.Tests
35-
- name: Test SIO.Infrastructure.Tests
36-
run: dotnet test tests/SIO.Infrastructure.Tests/SIO.Infrastructure.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
37-
# Test SIO.Migrations.Tests
38-
- name: Test SIO.Migrations.Tests
39-
run: dotnet test tests/SIO.Migrations.Tests/SIO.Migrations.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
28+
# Test projects
29+
- name: Test projects
30+
run: dotnet test SIO-Identity.sln --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true

‎.github/workflows/release.yml

+6-15
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v2
11-
# Install .NET Core
12-
- name: Setup .NET Core
11+
# Install .NET
12+
- name: Setup .NET
1313
uses: actions/setup-dotnet@v1
1414
with:
15-
dotnet-version: 3.1.101
15+
dotnet-version: 5.0.100
1616

1717
# Restore projects
1818
- name: Restore projects
@@ -22,15 +22,6 @@ jobs:
2222
- name: Build projects
2323
run: dotnet build --configuration Release --no-restore
2424

25-
# Test SIO.Domain.Tests
26-
- name: Test SIO.Domain.Tests
27-
run: dotnet test tests/SIO.Domain.Tests/SIO.Domain.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
28-
# Test SIO.Identity.Tests
29-
- name: Test SIO.Identity.Tests
30-
run: dotnet test tests/SIO.Identity.Tests/SIO.Identity.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
31-
# Test SIO.Infrastructure.Tests
32-
- name: Test SIO.Infrastructure.Tests
33-
run: dotnet test tests/SIO.Infrastructure.Tests/SIO.Infrastructure.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
34-
# Test SIO.Migrations.Tests
35-
- name: Test SIO.Migrations.Tests
36-
run: dotnet test tests/SIO.Migrations.Tests/SIO.Migrations.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
25+
# Test projects
26+
- name: Test projects
27+
run: dotnet test SIO-Identity.sln --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true

‎lgtm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ extraction:
22
csharp:
33
index:
44
dotnet:
5-
version: 3.1.301
5+
version: 5.0.100

‎src/SIO.Domain/SIO.Domain.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/SIO.Identity/Login/LoginController.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ private async Task<LoginResponse> BuildResponseAsync(string returnUrl)
146146
var providers = schemes.Where(scheme => !string.IsNullOrWhiteSpace(scheme.DisplayName))
147147
.Select(scheme => new ExternalProvider(scheme.DisplayName, scheme.Name));
148148

149-
if (context?.ClientId != null)
149+
if (context?.Client?.ClientId != null)
150150
{
151-
var client = await _clientStore.FindEnabledClientByIdAsync(context.ClientId);
151+
var client = await _clientStore.FindEnabledClientByIdAsync(context.Client.ClientId);
152152

153153
if (client != null)
154154
{

‎src/SIO.Identity/SIO.Identity.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
66
<UserSecretsId>869b8ac0-3c1c-45a1-b4a6-3fd4c386514e</UserSecretsId>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="IdentityServer4" Version="3.0.0" />
10+
<PackageReference Include="IdentityServer4" Version="4.1.1" />
1111
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
12-
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="3.0.0" />
13-
<PackageReference Include="IdentityServer4.EntityFramework" Version="3.0.0" />
14-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.1" />
12+
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.1" />
13+
<PackageReference Include="IdentityServer4.EntityFramework" Version="4.1.1" />
14+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.0" />
1515
<PackageReference Include="OpenEventSourcing" Version="0.4.0" />
1616
<PackageReference Include="OpenEventSourcing.Azure.ServiceBus" Version="0.4.0" />
1717
<PackageReference Include="OpenEventSourcing.EntityFrameworkCore.SqlServer" Version="0.4.0" />

‎src/SIO.Identity/ServiceCollectionExtensions.cs

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public static IServiceCollection AddSIOIdentity(this IServiceCollection services
5858
options.UserInteraction.ErrorUrl = "/error";
5959
options.UserInteraction.ConsentUrl = "/consent";
6060
options.Cors.CorsPaths.Add("/v1/client");
61-
options.PublicOrigin = configuration.GetValue<string>("Identity:Authority");
6261
})
6362
.AddConfigurationStore(options =>
6463
{

‎src/SIO.Infrastructure/SIO.Infrastructure.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/SIO.Migrations/SIO.Migrations.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="IdentityServer4.EntityFramework" Version="3.0.0" />
8+
<PackageReference Include="IdentityServer4.EntityFramework" Version="4.1.1" />
99
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
10-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
10+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.0" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
1212
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
1313
<PackageReference Include="OpenEventSourcing" Version="0.4.0" />
1414
<PackageReference Include="OpenEventSourcing.EntityFrameworkCore.SqlServer" Version="0.4.0" />

‎tests/SIO.Domain.Tests/SIO.Domain.Tests.csproj

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
1111
<PackageReference Include="xunit" Version="2.4.1" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="coverlet.collector" Version="1.2.0" />
16+
<PackageReference Include="coverlet.collector" Version="1.3.0">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
</PackageReference>
1720
</ItemGroup>
1821

1922
<ItemGroup>

‎tests/SIO.Identity.Tests/MockIdentityServerInteraction.cs

+10
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,21 @@ public Task<string> CreateLogoutContextAsync()
1717
return Task.FromResult("MockLogoutId");
1818
}
1919

20+
public Task DenyAuthorizationAsync(AuthorizationRequest request, AuthorizationError error, string errorDescription = null)
21+
{
22+
throw new NotImplementedException();
23+
}
24+
2025
public Task<IEnumerable<Consent>> GetAllUserConsentsAsync()
2126
{
2227
throw new NotImplementedException();
2328
}
2429

30+
public Task<IEnumerable<Grant>> GetAllUserGrantsAsync()
31+
{
32+
throw new NotImplementedException();
33+
}
34+
2535
public Task<AuthorizationRequest> GetAuthorizationContextAsync(string returnUrl)
2636
{
2737
if (HasAuthorizationContext)

‎tests/SIO.Identity.Tests/SIO.Identity.Tests.csproj

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
1010
<PackageReference Include="FluentAssertions" Version="5.10.3" />
1111
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
12-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
17-
<PackageReference Include="Moq" Version="4.14.5" />
12+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.0" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
17+
<PackageReference Include="Moq" Version="4.15.1" />
1818
<PackageReference Include="OpenEventSourcing" Version="0.4.0" />
1919
<PackageReference Include="OpenEventSourcing.EntityFrameworkCore.InMemory" Version="0.4.0" />
2020
<PackageReference Include="OpenEventSourcing.Serialization.Json" Version="0.4.0" />
@@ -24,11 +24,14 @@
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
</PackageReference>
27-
<PackageReference Include="coverlet.collector" Version="1.0.1" />
28-
<PackageReference Include="IdentityServer4" Version="3.0.0" />
27+
<PackageReference Include="coverlet.collector" Version="1.3.0">
28+
<PrivateAssets>all</PrivateAssets>
29+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
30+
</PackageReference>
31+
<PackageReference Include="IdentityServer4" Version="4.1.1" />
2932
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
30-
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="3.0.0" />
31-
<PackageReference Include="IdentityServer4.EntityFramework" Version="3.0.0" />
33+
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.1" />
34+
<PackageReference Include="IdentityServer4.EntityFramework" Version="4.1.1" />
3235
</ItemGroup>
3336

3437
<ItemGroup>

‎tests/SIO.Infrastructure.Tests/SIO.Infrastructure.Tests.csproj

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
1111
<PackageReference Include="xunit" Version="2.4.1" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="coverlet.collector" Version="1.2.0" />
16+
<PackageReference Include="coverlet.collector" Version="1.3.0">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
</PackageReference>
1720
</ItemGroup>
1821

1922
<ItemGroup>

‎tests/SIO.Migrations.Tests/SIO.Migrations.Tests.csproj

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
1111
<PackageReference Include="xunit" Version="2.4.1" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="coverlet.collector" Version="1.2.0" />
16+
<PackageReference Include="coverlet.collector" Version="1.3.0">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
</PackageReference>
1720
</ItemGroup>
1821

1922
<ItemGroup>

0 commit comments

Comments
 (0)