tsai
/
openiddict-core
mirror of https://github.com/openiddict/openiddict-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add .NET 6.0 TFMs and bump the .NET SDK/packages to 6.0

pull/1348/head
Kévin Chalet 5 years ago
parent
2ae17e12e6
commit
23fd89e9eb
26 changed files with 53 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      Packages.props
  2. 2
      global.json
  3. 2
      samples/Mvc.Client/Mvc.Client.csproj
  4. 2
      samples/Mvc.Server/Mvc.Server.csproj
  5. 3
      src/OpenIddict.AspNetCore/OpenIddict.AspNetCore.csproj
  6. 2
      src/OpenIddict.Core/OpenIddict.Core.csproj
  7. 2
      src/OpenIddict.EntityFramework/OpenIddict.EntityFramework.csproj
  8. 2
      src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj
  9. 2
      src/OpenIddict.MongoDb/OpenIddict.MongoDb.csproj
  10. 2
      src/OpenIddict.Quartz/OpenIddict.Quartz.csproj
  11. 2
      src/OpenIddict.Server.AspNetCore/OpenIddict.Server.AspNetCore.csproj
  12. 2
      src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj
  13. 2
      src/OpenIddict.Server/OpenIddict.Server.csproj
  14. 2
      src/OpenIddict.Validation.AspNetCore/OpenIddict.Validation.AspNetCore.csproj
  15. 2
      src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj
  16. 2
      src/OpenIddict.Validation/OpenIddict.Validation.csproj
  17. 3
      src/OpenIddict/OpenIddict.csproj
  18. 2
      test/OpenIddict.Abstractions.Tests/OpenIddict.Abstractions.Tests.csproj
  19. 2
      test/OpenIddict.Core.Tests/OpenIddict.Core.Tests.csproj
  20. 2
      test/OpenIddict.EntityFramework.Tests/OpenIddict.EntityFramework.Tests.csproj
  21. 2
      test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.csproj
  22. 2
      test/OpenIddict.MongoDb.Tests/OpenIddict.MongoDb.Tests.csproj
  23. 4
      test/OpenIddict.Quartz.Tests/OpenIddict.Quartz.Tests.csproj
  24. 2
      test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddict.Server.AspNetCore.IntegrationTests.csproj
  25. 2
      test/OpenIddict.Server.IntegrationTests/OpenIddict.Server.IntegrationTests.csproj
  26. 2
      test/OpenIddict.Server.Tests/OpenIddict.Server.Tests.csproj

25
Packages.props
View File

@ -98,4 +98,29 @@
<PackageReference Update="System.Text.Json" Version="5.0.1" />
</ItemGroup>
<ItemGroup
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0'))) ">
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="6.0.0" />
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.0" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="6.0.0" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Primitives" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.WebEncoders" Version="6.0.0" />
<PackageReference Update="System.Collections.Immutable" Version="6.0.0" />
<PackageReference Update="System.ComponentModel.Annotations" Version="6.0.0" />
<PackageReference Update="System.Linq.Async" Version="5.0.0" />
<PackageReference Update="System.Net.Http.Json" Version="6.0.0" />
<PackageReference Update="System.Text.Encodings.Web" Version="6.0.0" />
<PackageReference Update="System.Text.Json" Version="6.0.0" />
</ItemGroup>
</Project>

2
global.json
View File

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "6.0.100-rc.2.21505.57",
"dotnet": "6.0.100",
"runtimes": {
"aspnetcore": [

2
samples/Mvc.Client/Mvc.Client.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsShipping>false</IsShipping>
<Nullable>disable</Nullable>
</PropertyGroup>

2
samples/Mvc.Server/Mvc.Server.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsShipping>false</IsShipping>
<SignAssembly>false</SignAssembly>
<TypeScriptEnabled>false</TypeScriptEnabled>

3
src/OpenIddict.AspNetCore/OpenIddict.AspNetCore.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSymbols>false</IncludeSymbols>
</PropertyGroup>
@ -24,6 +24,7 @@
<None Include="_._" Pack="true" PackagePath="lib\netcoreapp2.1\_._" />
<None Include="_._" Pack="true" PackagePath="lib\netcoreapp3.1\_._" />
<None Include="_._" Pack="true" PackagePath="lib\net5.0\_._" />
<None Include="_._" Pack="true" PackagePath="lib\net6.0\_._" />
</ItemGroup>
</Project>

2
src/OpenIddict.Core/OpenIddict.Core.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;net472;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net461;net472;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>

2
src/OpenIddict.EntityFramework/OpenIddict.EntityFramework.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;net5.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net461;net5.0;net6.0;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>

2
src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>

2
src/OpenIddict.MongoDb/OpenIddict.MongoDb.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<SignAssembly>false</SignAssembly>
<PublicSign>false</PublicSign>
</PropertyGroup>

2
src/OpenIddict.Quartz/OpenIddict.Quartz.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>

2
src/OpenIddict.Server.AspNetCore/OpenIddict.Server.AspNetCore.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>

2
src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>

2
src/OpenIddict.Server/OpenIddict.Server.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>

2
src/OpenIddict.Validation.AspNetCore/OpenIddict.Validation.AspNetCore.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>

2
src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>

2
src/OpenIddict.Validation/OpenIddict.Validation.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;net472;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net461;net472;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>

3
src/OpenIddict/OpenIddict.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSymbols>false</IncludeSymbols>
</PropertyGroup>
@ -27,6 +27,7 @@ To use these features on ASP.NET Core or OWIN/Katana/ASP.NET 4.x, reference the
<None Include="_._" Pack="true" PackagePath="lib\netcoreapp2.1\_._" />
<None Include="_._" Pack="true" PackagePath="lib\netcoreapp3.1\_._" />
<None Include="_._" Pack="true" PackagePath="lib\net5.0\_._" />
<None Include="_._" Pack="true" PackagePath="lib\net6.0\_._" />
<None Include="_._" Pack="true" PackagePath="lib\netstandard2.0\_._" />
<None Include="_._" Pack="true" PackagePath="lib\netstandard2.1\_._" />
</ItemGroup>

2
test/OpenIddict.Abstractions.Tests/OpenIddict.Abstractions.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

2
test/OpenIddict.Core.Tests/OpenIddict.Core.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

2
test/OpenIddict.EntityFramework.Tests/OpenIddict.EntityFramework.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

2
test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

2
test/OpenIddict.MongoDb.Tests/OpenIddict.MongoDb.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<SignAssembly>false</SignAssembly>
<PublicSign>false</PublicSign>
</PropertyGroup>

4
test/OpenIddict.Quartz.Tests/OpenIddict.Quartz.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

2
test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddict.Server.AspNetCore.IntegrationTests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

2
test/OpenIddict.Server.IntegrationTests/OpenIddict.Server.IntegrationTests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

2
test/OpenIddict.Server.Tests/OpenIddict.Server.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;net472;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>net461;net472;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

Write Preview
Loading…
Cancel
Save