10000 Update to .NET 9 (#5) · cnblogs/IdentityServer4@7ce15af · GitHub
[go: up one dir, main page]
Skip to content

Commit 7ce15af

Browse files
cnblogs-duducnblogs-dudu
authored
Update to .NET 9 (#5)
1 parent fe637e8 commit 7ce15af

File tree

311 files changed

+1203
-1293
lines changed
  • MvcHybrid
  • MvcImplicitJwtRequest
  • MvcImplicit
  • MvcManual
  • src
  • KeyManagement
  • Quickstarts
  • Client
  • IdentityServer
  • MvcClient
  • 6_AspNetIdentity/src
  • Directory.Build.targets
  • src

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    311 files changed

    +1203
    -1293
    lines changed

    ‎.github/workflows/ci.yml

    Lines changed: 2 additions & 2 deletions
    Original file line numberDif 10000 f line numberDiff line change
    @@ -24,9 +24,9 @@ jobs:
    2424
    steps:
    2525
    - uses: actions/checkout@v3
    2626
    - name: Setup .NET
    27-
    uses: actions/setup-dotnet@v2
    27+
    uses: actions/setup-dotnet@v4
    2828
    with:
    29-
    dotnet-version: 7.0.x
    29+
    dotnet-version: '9'
    3030
    - if: contains(matrix.runs-on, 'macOS') || contains(matrix.runs-on, 'ubuntu')
    3131
    env:
    3232
    MINVERVERSIONOVERRIDE: ${{ secrets.MINVER_VERSION }}

    ‎global.json

    Lines changed: 2 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,6 @@
    11
    {
    22
    "sdk": {
    3-
    "version": "7.0.100"
    3+
    "version": "9.0.203",
    4+
    "rollForward": "latestFeature"
    45
    }
    56
    }

    ‎samples/Clients/Directory.Build.targets

    Lines changed: 13 additions & 13 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,17 +1,17 @@
    11
    <Project>
    22

    3-
    <PropertyGroup>
    4-
    <AspNetVersion>3.1.0</AspNetVersion>
    5-
    </PropertyGroup>
    3+
    <PropertyGroup>
    4+
    <AspNetVersion>9.0.4</AspNetVersion>
    5+
    </PropertyGroup>
    66

    7-
    <ItemGroup>
    8-
    <PackageReference Update="IdentityModel" Version="4.3.0" />
    9-
    10-
    <PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(AspNetVersion)" />
    11-
    <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(AspNetVersion)" />
    12-
    <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNetVersion)" />
    13-
    <PackageReference Update="Microsoft.AspNetCore.Authentication.Certificate" Version="$(AspNetVersion)"/>
    14-
    15-
    <PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
    16-
    </ItemGroup>
    7+
    <ItemGroup>
    8+
    <PackageReference Update="Duende.IdentityModel" Version="7.0.0" />
    9+
    10+
    <PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(AspNetVersion)" />
    11+
    <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(AspNetVersion)" />
    12+
    <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNetVersion)" />
    13+
    <PackageReference Update="Microsoft.AspNetCore.Authentication.Certificate" Version="$(AspNetVersion)" />
    14+
    15+
    <PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
    16+
    </ItemGroup>
    1717
    </Project>

    ‎samples/Clients/old/MvcHybrid/MvcHybrid.csproj

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,12 +1,12 @@
    11
    <Project Sdk="Microsoft.NET.Sdk.Web">
    22

    33
    <PropertyGroup>
    4-
    <TargetFramework>net7.0</TargetFramework>
    4+
    <TargetFramework>net9.0</TargetFramework>
    55
    </PropertyGroup>
    66

    77
    <ItemGroup>
    88
    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
    9-
    9+
    1010
    <ProjectReference Include="..\Constants\Constants.csproj" />
    1111
    </ItemGroup>
    1212
    </Project>

    ‎samples/Clients/old/MvcHybrid/Startup.cs

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -2,7 +2,7 @@
    22
    using Microsoft.AspNetCore.Builder;
    33
    using Microsoft.Extensions.DependencyInjection;
    44
    using System.IdentityModel.Tokens.Jwt;
    5-
    using IdentityModel;
    5+
    using Duende.IdentityModel;
    66
    using Clients;
    77
    using Microsoft.IdentityModel.Tokens;
    88
    using Microsoft.AspNetCore.Authentication.Cookies;

    ‎samples/Clients/old/MvcHybridAutomaticRefresh/MvcHybridAutomaticRefresh.csproj

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,7 +1,7 @@
    11
    <Project Sdk="Microsoft.NET.Sdk.Web">
    22

    33
    <PropertyGroup>
    4-
    <TargetFramework>net7.0</TargetFramework>
    4+
    <TargetFramework>net9.0</TargetFramework>
    55
    </PropertyGroup>
    66

    77
    <ItemGroup>

    ‎samples/Clients/old/MvcHybridAutomaticRefresh/Startup.cs

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -2,7 +2,7 @@
    22
    using Microsoft.AspNetCore.Builder;
    33
    using Microsoft.Extensions.DependencyInjection;
    44
    using System.IdentityModel.Tokens.Jwt;
    5-
    using IdentityModel;
    5+
    using Duende.IdentityModel;
    66
    using Clients;
    77
    using Microsoft.IdentityModel.Tokens;
    88
    using Microsoft.AspNetCore.Authentication.Cookies;
    @@ -50,7 +50,7 @@ public void ConfigureServices(IServiceCollection services)
    5050
    options.Scope.Add("email");
    5151
    options.Scope.Add("api1");
    5252
    options.Scope.Add("offline_access");
    53-
    53+
    5454
    options.ClaimActions.MapAllExcept("iss", "nbf", "exp", "aud", "nonce", "iat", "c_hash");
    5555

    5656
    options.GetClaimsFromUserInfoEndpoint = true;

    ‎samples/Clients/old/MvcImplicit/MvcImplicit.csproj

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,7 +1,7 @@
    11
    <Project Sdk="Microsoft.NET.Sdk.Web">
    22

    33
    <PropertyGroup>
    4-
    <TargetFramework>net7.0</TargetFramework>
    4+
    <TargetFramework>net9.0</TargetFramework>
    55
    </PropertyGroup>
    66

    77
    <ItemGroup>

    ‎samples/Clients/old/MvcImplicit/Startup.cs

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,5 +1,5 @@
    11
    using Clients;
    2-
    using IdentityModel;
    2+
    using Duende.IdentityModel;
    33
    using Microsoft.AspNetCore.Authentication.Cookies;
    44
    using Microsoft.AspNetCore.Builder;
    55
    using Microsoft.Extensions.DependencyInjection;

    ‎samples/Clients/old/MvcImplicitJwtRequest/MvcImplicitJwtRequest.csproj

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,12 +1,12 @@
    11
    <Project Sdk="Microsoft.NET.Sdk.Web">
    22

    33
    <PropertyGroup>
    4-
    <TargetFramework>net7.0</TargetFramework>
    4+
    <TargetFramework>net9.0</TargetFramework>
    55
    </PropertyGroup>
    66

    77
    <ItemGroup>
    88
    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
    9-
    9+
    1010
    <ProjectReference Include="..\Constants\Constants.csproj" />
    1111
    </ItemGroup>
    1212

    0 commit comments

    Comments
     (0)
    0