[Feature] - Updated to net5.0 (sound-it-out#172)

* Updated to net5.0 * Fixed build. * Updated github actions. * fixed build. * Updated lgtm config.
sucrose0413 · Nov 14, 2020 · dd3822a · dd3822a
1 parent 9bb9729
commit dd3822a
Show file tree

Hide file tree

Showing 14 changed files with 73 additions and 70 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,11 +11,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    # Install .NET Core
-    - name: Setup .NET Core
+    # Install .NET
+    - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.101
+        dotnet-version: 5.0.100
 
     # Restore projects
     - name: Restore projects
@@ -25,15 +25,6 @@ jobs:
     - name: Build projects
       run: dotnet build --configuration Release --no-restore
 
-    # Test SIO.Domain.Tests
-    - name: Test SIO.Domain.Tests
-      run: dotnet test tests/SIO.Domain.Tests/SIO.Domain.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
-    # Test SIO.Identity.Tests
-    - name: Test SIO.Identity.Tests
-      run: dotnet test tests/SIO.Identity.Tests/SIO.Identity.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
-    # Test SIO.Infrastructure.Tests
-    - name: Test SIO.Infrastructure.Tests
-      run: dotnet test tests/SIO.Infrastructure.Tests/SIO.Infrastructure.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
-    # Test SIO.Migrations.Tests
-    - name: Test SIO.Migrations.Tests
-      run: dotnet test tests/SIO.Migrations.Tests/SIO.Migrations.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
+     # Test projects
+    - name: Test projects
+      run: dotnet test SIO-Identity.sln --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,11 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    # Install .NET Core
-    - name: Setup .NET Core
+    # Install .NET
+    - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.101
+        dotnet-version: 5.0.100
 
     # Restore projects
     - name: Restore projects
@@ -22,15 +22,6 @@ jobs:
     - name: Build projects
       run: dotnet build --configuration Release --no-restore
 
-    # Test SIO.Domain.Tests
-    - name: Test SIO.Domain.Tests
-      run: dotnet test tests/SIO.Domain.Tests/SIO.Domain.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
-    # Test SIO.Identity.Tests
-    - name: Test SIO.Identity.Tests
-      run: dotnet test tests/SIO.Identity.Tests/SIO.Identity.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
-    # Test SIO.Infrastructure.Tests
-    - name: Test SIO.Infrastructure.Tests
-      run: dotnet test tests/SIO.Infrastructure.Tests/SIO.Infrastructure.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
-    # Test SIO.Migrations.Tests
-    - name: Test SIO.Migrations.Tests
-      run: dotnet test tests/SIO.Migrations.Tests/SIO.Migrations.Tests.csproj --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
+     # Test projects
+    - name: Test projects
+      run: dotnet test SIO-Identity.sln --configuration Release --no-restore --no-build --verbosity normal -- xunit.parallelizeAssembly=true
diff --git a/lgtm.yml b/lgtm.yml
@@ -2,4 +2,4 @@ extraction:
   csharp:
     index:
       dotnet:
-        version: 3.1.301
+        version: 5.0.100
diff --git a/src/SIO.Domain/SIO.Domain.csproj b/src/SIO.Domain/SIO.Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/SIO.Identity/Login/LoginController.cs b/src/SIO.Identity/Login/LoginController.cs
@@ -146,9 +146,9 @@ private async Task<LoginResponse> BuildResponseAsync(string returnUrl)
             var providers = schemes.Where(scheme => !string.IsNullOrWhiteSpace(scheme.DisplayName))
                                    .Select(scheme => new ExternalProvider(scheme.DisplayName, scheme.Name));
 
-            if (context?.ClientId != null)
+            if (context?.Client?.ClientId != null)
             {
-                var client = await _clientStore.FindEnabledClientByIdAsync(context.ClientId);
+                var client = await _clientStore.FindEnabledClientByIdAsync(context.Client.ClientId);
 
                 if (client != null)
                 {

diff --git a/src/SIO.Identity/SIO.Identity.csproj b/src/SIO.Identity/SIO.Identity.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <UserSecretsId>869b8ac0-3c1c-45a1-b4a6-3fd4c386514e</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IdentityServer4" Version="3.0.0" />
+    <PackageReference Include="IdentityServer4" Version="4.1.1" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="IdentityServer4.AspNetIdentity" Version="3.0.0" />
-    <PackageReference Include="IdentityServer4.EntityFramework" Version="3.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.1" />
+    <PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.1" />
+    <PackageReference Include="IdentityServer4.EntityFramework" Version="4.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.0" />
     <PackageReference Include="OpenEventSourcing" Version="0.4.0" />
     <PackageReference Include="OpenEventSourcing.Azure.ServiceBus" Version="0.4.0" />
     <PackageReference Include="OpenEventSourcing.EntityFrameworkCore.SqlServer" Version="0.4.0" />

diff --git a/src/SIO.Identity/ServiceCollectionExtensions.cs b/src/SIO.Identity/ServiceCollectionExtensions.cs
@@ -58,7 +58,6 @@ public static IServiceCollection AddSIOIdentity(this IServiceCollection services
                 options.UserInteraction.ErrorUrl = "/error";
                 options.UserInteraction.ConsentUrl = "/consent";
                 options.Cors.CorsPaths.Add("/v1/client");
-                options.PublicOrigin = configuration.GetValue<string>("Identity:Authority");
             })
             .AddConfigurationStore(options =>
             {

diff --git a/src/SIO.Infrastructure/SIO.Infrastructure.csproj b/src/SIO.Infrastructure/SIO.Infrastructure.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/SIO.Migrations/SIO.Migrations.csproj b/src/SIO.Migrations/SIO.Migrations.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IdentityServer4.EntityFramework" Version="3.0.0" />
+    <PackageReference Include="IdentityServer4.EntityFramework" Version="4.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
     <PackageReference Include="OpenEventSourcing" Version="0.4.0" />
     <PackageReference Include="OpenEventSourcing.EntityFrameworkCore.SqlServer" Version="0.4.0" />

diff --git a/tests/SIO.Domain.Tests/SIO.Domain.Tests.csproj b/tests/SIO.Domain.Tests/SIO.Domain.Tests.csproj
@@ -1,19 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+    <PackageReference Include="coverlet.collector" Version="1.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/SIO.Identity.Tests/MockIdentityServerInteraction.cs b/tests/SIO.Identity.Tests/MockIdentityServerInteraction.cs
@@ -17,11 +17,21 @@ public Task<string> CreateLogoutContextAsync()
             return Task.FromResult("MockLogoutId");
         }
 
+        public Task DenyAuthorizationAsync(AuthorizationRequest request, AuthorizationError error, string errorDescription = null)
+        {
+            throw new NotImplementedException();
+        }
+
         public Task<IEnumerable<Consent>> GetAllUserConsentsAsync()
         {
             throw new NotImplementedException();
         }
 
+        public Task<IEnumerable<Grant>> GetAllUserGrantsAsync()
+        {
+            throw new NotImplementedException();
+        }
+
         public Task<AuthorizationRequest> GetAuthorizationContextAsync(string returnUrl)
         {
             if (HasAuthorizationContext)

diff --git a/tests/SIO.Identity.Tests/SIO.Identity.Tests.csproj b/tests/SIO.Identity.Tests/SIO.Identity.Tests.csproj
@@ -1,20 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="Moq" Version="4.14.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Moq" Version="4.15.1" />
     <PackageReference Include="OpenEventSourcing" Version="0.4.0" />
     <PackageReference Include="OpenEventSourcing.EntityFrameworkCore.InMemory" Version="0.4.0" />
     <PackageReference Include="OpenEventSourcing.Serialization.Json" Version="0.4.0" />
@@ -24,11 +24,14 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.0.1" />
-    <PackageReference Include="IdentityServer4" Version="3.0.0" />
+    <PackageReference Include="coverlet.collector" Version="1.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="IdentityServer4" Version="4.1.1" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="IdentityServer4.AspNetIdentity" Version="3.0.0" />
-    <PackageReference Include="IdentityServer4.EntityFramework" Version="3.0.0" />
+    <PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.1" />
+    <PackageReference Include="IdentityServer4.EntityFramework" Version="4.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/SIO.Infrastructure.Tests/SIO.Infrastructure.Tests.csproj b/tests/SIO.Infrastructure.Tests/SIO.Infrastructure.Tests.csproj
@@ -1,19 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+    <PackageReference Include="coverlet.collector" Version="1.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/SIO.Migrations.Tests/SIO.Migrations.Tests.csproj b/tests/SIO.Migrations.Tests/SIO.Migrations.Tests.csproj
@@ -1,19 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+    <PackageReference Include="coverlet.collector" Version="1.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ extraction: @@
       csharp:
         index:
           dotnet:
-            version: 3.1.301
+            version: 5.0.100