Bump the .NET SDK/runtime and the ASP.NET Core/.NET Platform Extensions packages

6 years ago · 535dde2e21
10 changed files with 74 additions and 84 deletions
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -15,56 +15,48 @@
    <PublicSign>false</PublicSign>
  </PropertyGroup>

-  <PropertyGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' Or
-                            ('$(TargetFrameworkIdentifier)' == '.NETFramework' And
-                              $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '4.7'))) Or
-                            ('$(TargetFrameworkIdentifier)' == '.NETStandard' And
-                              $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '1.6'))) ">
+  <PropertyGroup
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp') Or
+                ('$(TargetFrameworkIdentifier)' == '.NETFramework' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '4.7'))) Or
+                ('$(TargetFrameworkIdentifier)' == '.NETStandard ' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '1.6'))) ">
    <DefineConstants>$(DefineConstants);SUPPORTS_ECDSA</DefineConstants>
  </PropertyGroup>

-  <PropertyGroup Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
-                               $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.0'))) Or
-                             ('$(TargetFrameworkIdentifier)' == '.NETFramework' And
-                               $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '4.7.2'))) Or
-                             ('$(TargetFrameworkIdentifier)' == '.NETStandard' And
-                               $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) ">
+  <PropertyGroup
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp'   And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.0')))   Or
+                ('$(TargetFrameworkIdentifier)' == '.NETFramework' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '4.7.2'))) Or
+                ('$(TargetFrameworkIdentifier)' == '.NETStandard'  And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) ">
    <DefineConstants>$(DefineConstants);SUPPORTS_CERTIFICATE_GENERATION</DefineConstants>
    <DefineConstants>$(DefineConstants);SUPPORTS_DIRECT_KEY_CREATION_WITH_SPECIFIED_SIZE</DefineConstants>
    <DefineConstants>$(DefineConstants);SUPPORTS_EPHEMERAL_KEY_SETS</DefineConstants>
    <DefineConstants>$(DefineConstants);SUPPORTS_KEY_DERIVATION_WITH_SPECIFIED_HASH_ALGORITHM</DefineConstants>
  </PropertyGroup>

-  <PropertyGroup Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
-                               $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) Or
-                             ('$(TargetFrameworkIdentifier)' == '.NETFramework' And
-                               $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '4.8'))) Or
-                             ('$(TargetFrameworkIdentifier)' == '.NETStandard' And
-                               $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) ">
+  <PropertyGroup
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp'   And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) Or
+                ('$(TargetFrameworkIdentifier)' == '.NETFramework' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '4.8'))) Or
+                ('$(TargetFrameworkIdentifier)' == '.NETStandard'  And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) ">
    <DefineConstants>$(DefineConstants);SUPPORTS_CERTIFICATE_HASHING_WITH_SPECIFIED_ALGORITHM</DefineConstants>
  </PropertyGroup>

-  <PropertyGroup Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
-                               $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) Or
-                             ('$(TargetFrameworkIdentifier)' == '.NETStandard' And
-                               $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) ">
+  <PropertyGroup
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp'  And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) Or
+                ('$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) ">
    <DefineConstants>$(DefineConstants);SUPPORTS_BASE64_SPAN_CONVERSION</DefineConstants>
    <DefineConstants>$(DefineConstants);SUPPORTS_STATIC_RANDOM_NUMBER_GENERATOR_METHODS</DefineConstants>
    <DefineConstants>$(DefineConstants);SUPPORTS_TIME_CONSTANT_COMPARISONS</DefineConstants>
  </PropertyGroup>

-  <PropertyGroup Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
-                               $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.2'))) Or
-                             ('$(TargetFrameworkIdentifier)' == '.NETStandard' And
-                               $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) ">
+  <PropertyGroup
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp'  And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.2'))) Or
+                ('$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) ">
    <DefineConstants>$(DefineConstants);SUPPORTS_GENERIC_HOST</DefineConstants>
    <DefineConstants>$(DefineConstants);SUPPORTS_SERVICE_PROVIDER_IN_HTTP_MESSAGE_HANDLER_BUILDER</DefineConstants>
  </PropertyGroup>

-  <PropertyGroup Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
-                               $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.0'))) Or
-                             ('$(TargetFrameworkIdentifier)' == '.NETStandard' And
-                               $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) ">
+  <PropertyGroup
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp'  And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.0'))) Or
+                ('$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) ">
    <DefineConstants>$(DefineConstants);SUPPORTS_BCL_ASYNC_ENUMERABLE</DefineConstants>
  </PropertyGroup>

--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@ -23,13 +23,12 @@
    <PackageVersion Include="System.Text.Json" Version="4.7.2" />
  </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' Or
-                        ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
-                          $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.0')) And
-                          $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0'))) Or
-                        ('$(TargetFrameworkIdentifier)' == '.NETStandard' And
-                          $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.0')) And
-                          $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '2.1'))) ">
+  <ItemGroup
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
+                ('$(TargetFrameworkIdentifier)' == '.NETCoreApp'  And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.0')) And
+                                                                      $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0'))) Or
+                ('$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.0')) And
+                                                                      $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '2.1'))) ">
    <PackageVersion Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.1.2" />
    <PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="2.1.1" />
@ -49,26 +48,25 @@
    <PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" />
  </ItemGroup>

-  <ItemGroup Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
-                           $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.0')) And
-                           $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '5.0'))) Or
-                         ('$(TargetFrameworkIdentifier)' == '.NETStandard' And
-                           $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) ">
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.5" />
-    <PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="3.1.5" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.5" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="3.1.5" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.5" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.5" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.5" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.5" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="3.1.5" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="3.1.5" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="3.1.5" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="3.1.5" />
-    <PackageVersion Include="Microsoft.Extensions.Primitives" Version="3.1.5" />
-    <PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="3.1.5" />
+  <ItemGroup
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp'  And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.0')) And
+                                                                      $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '5.0'))) Or
+                ('$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))) ">
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.6" />
+    <PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="3.1.6" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.6" />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="3.1.6" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.6" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.6" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.6" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.6" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.6" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="3.1.6" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="3.1.6" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="3.1.6" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="3.1.6" />
+    <PackageVersion Include="Microsoft.Extensions.Primitives" Version="3.1.6" />
+    <PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="3.1.6" />
  </ItemGroup>

 </Project>
--- a/global.json
+++ b/global.json
@ -1,10 +1,10 @@
 {
  "tools": {
-    "dotnet": "3.1.301",
+    "dotnet": "3.1.302",
    "runtimes": {
      "aspnetcore": [
-        "2.1.19",
-        "3.1.5"
+        "2.1.20",
+        "3.1.6"
      ]
    }
  },
--- a/src/OpenIddict.Abstractions/OpenIddict.Abstractions.csproj
+++ b/src/OpenIddict.Abstractions/OpenIddict.Abstractions.csproj
@ -15,9 +15,9 @@
    <PackageReference Include="System.Text.Json" />
  </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' Or
-                        ('$(TargetFrameworkIdentifier)' == '.NETStandard' And
-                          $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '2.1'))) ">
+  <ItemGroup
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
+                ('$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '2.1'))) ">
    <PackageReference Include="Microsoft.Bcl.HashCode" />
  </ItemGroup>

--- a/src/OpenIddict.Core/OpenIddict.Core.csproj
+++ b/src/OpenIddict.Core/OpenIddict.Core.csproj
@ -23,9 +23,9 @@
    <Reference Include="System.ComponentModel.DataAnnotations" />
  </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' Or
-                        ('$(TargetFrameworkIdentifier)' == '.NETStandard' And
-                          $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '2.1'))) ">
+  <ItemGroup
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
+                ('$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '2.1'))) ">
    <PackageReference Include="Portable.BouncyCastle" />
  </ItemGroup>

--- a/src/OpenIddict.Server.AspNetCore/OpenIddict.Server.AspNetCore.csproj
+++ b/src/OpenIddict.Server.AspNetCore/OpenIddict.Server.AspNetCore.csproj
@ -13,13 +13,13 @@
    <ProjectReference Include="..\OpenIddict.Server\OpenIddict.Server.csproj" />
  </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
-                          $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.1')) ">
+  <ItemGroup
+    Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.1')) ">
    <FrameworkReference Include="Microsoft.AspNetCore.App" />
  </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' != '.NETCoreApp' Or
-                          $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.1')) ">
+  <ItemGroup
+    Condition=" '$(TargetFrameworkIdentifier)' != '.NETCoreApp' Or $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.1')) ">
    <PackageReference Include="Microsoft.AspNetCore.Authentication" />
    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" />
    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
--- a/src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj
+++ b/src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj
@ -13,13 +13,13 @@
    <ProjectReference Include="..\OpenIddict.Server\OpenIddict.Server.csproj" />
  </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
-                          $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.1')) ">
+  <ItemGroup
+    Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.1')) ">
    <FrameworkReference Include="Microsoft.AspNetCore.App" />
  </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' != '.NETCoreApp' Or
-                          $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.1')) ">
+  <ItemGroup
+    Condition=" '$(TargetFrameworkIdentifier)' != '.NETCoreApp' Or $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.1')) ">
    <PackageReference Include="Microsoft.AspNetCore.DataProtection" />
  </ItemGroup>

--- a/src/OpenIddict.Server/OpenIddict.Server.csproj
+++ b/src/OpenIddict.Server/OpenIddict.Server.csproj
@ -21,9 +21,9 @@ To use the server feature on ASP.NET Core or OWIN/Katana, reference the OpenIddi
    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
  </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' Or
-                        ('$(TargetFrameworkIdentifier)' == '.NETStandard' And
-                          $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '2.1'))) ">
+  <ItemGroup
+    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
+                ('$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '2.1'))) ">
    <PackageReference Include="Portable.BouncyCastle" />
  </ItemGroup>

--- a/src/OpenIddict.Validation.AspNetCore/OpenIddict.Validation.AspNetCore.csproj
+++ b/src/OpenIddict.Validation.AspNetCore/OpenIddict.Validation.AspNetCore.csproj
@ -13,13 +13,13 @@
    <ProjectReference Include="..\OpenIddict.Validation\OpenIddict.Validation.csproj" />
  </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
-                          $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.1')) ">
+  <ItemGroup
+    Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.1')) ">
    <FrameworkReference Include="Microsoft.AspNetCore.App" />
  </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' != '.NETCoreApp' Or
-                          $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.1')) ">
+  <ItemGroup
+    Condition=" '$(TargetFrameworkIdentifier)' != '.NETCoreApp' Or $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.1')) ">
    <PackageReference Include="Microsoft.AspNetCore.Authentication" />
  </ItemGroup>

--- a/src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj
+++ b/src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj
@ -13,13 +13,13 @@
    <ProjectReference Include="..\OpenIddict.Validation\OpenIddict.Validation.csproj" />
  </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
-                          $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.1')) ">
+  <ItemGroup
+    Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.1')) ">
    <FrameworkReference Include="Microsoft.AspNetCore.App" />
  </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' != '.NETCoreApp' Or
-                          $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.1')) ">
+  <ItemGroup
+    Condition=" '$(TargetFrameworkIdentifier)' != '.NETCoreApp' Or $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.1')) ">
    <PackageReference Include="Microsoft.AspNetCore.DataProtection" />
  </ItemGroup>