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

Bump the .NET SDK/dependencies and remove the .NET 8.0 Android/iOS/Mac Catalyst/macOS target framework monikers

pull/2390/head
Kévin Chalet 2 months ago
parent
672ab0ea98
commit
77cc46ae1b
8 changed files with 107 additions and 80 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. 4
      .github/workflows/build.yml
  2. 6
      Directory.Build.props
  3. 101
      Directory.Packages.props
  4. 26
      WorkloadRollback.json
  5. 33
      gen/OpenIddict.Client.WebIntegration.Generators/OpenIddictClientWebIntegrationGenerator.cs
  6. 6
      global.json
  7. 6
      sandbox/OpenIddict.Sandbox.AspNetCore.Client/OpenIddict.Sandbox.AspNetCore.Client.csproj
  8. 5
      sandbox/OpenIddict.Sandbox.AspNetCore.Server/OpenIddict.Sandbox.AspNetCore.Server.csproj

4
.github/workflows/build.yml
View File

@ -34,9 +34,9 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ macos-15, ubuntu-24.04, windows-2022 ]
os: [ macos-26, ubuntu-24.04, windows-2022 ]
include:
- os: macos-15
- os: macos-26
os_name: macos
- os: ubuntu-24.04
os_name: linux

6
Directory.Build.props
View File

@ -9,7 +9,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);CS1591;NU5128</NoWarn>
<WarningsNotAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
<NuGetAuditMode>direct</NuGetAuditMode>
<NuGetAuditMode>all</NuGetAuditMode>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<DebugSymbols>true</DebugSymbols>
@ -110,25 +110,21 @@
<NetCoreAndroidTargetFrameworks
Condition=" '$(NetCoreAndroidTargetFrameworks)' == '' And '$(SupportsAndroidTargeting)' == 'true' ">
net8.0-android34.0;
net9.0-android35.0
</NetCoreAndroidTargetFrameworks>
<NetCoreIOSTargetFrameworks
Condition=" '$(NetCoreIOSTargetFrameworks)' == '' And '$(SupportsIOSTargeting)' == 'true' ">
net8.0-ios18.0;
net9.0-ios18.0
</NetCoreIOSTargetFrameworks>
<NetCoreMacCatalystTargetFrameworks
Condition=" '$(NetCoreMacCatalystTargetFrameworks)' == '' And '$(SupportsMacCatalystTargeting)' == 'true' ">
net8.0-maccatalyst18.0;
net9.0-maccatalyst18.0
</NetCoreMacCatalystTargetFrameworks>
<NetCoreMacOSTargetFrameworks
Condition=" '$(NetCoreMacOSTargetFrameworks)' == '' And '$(SupportsMacOSTargeting)' == 'true' ">
net8.0-macos15.0;
net9.0-macos15.0
</NetCoreMacOSTargetFrameworks>

101
Directory.Packages.props
View File

@ -30,20 +30,20 @@
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.20" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.21" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="8.0.20" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="8.0.21" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="8.14.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="2.3.4" />
<PackageVersion Include="Microsoft.Owin.Security" Version="4.2.3" />
<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" />
<PackageVersion Include="MongoDB.Bson" Version="3.4.3" />
<PackageVersion Include="MongoDB.Driver" Version="3.4.3" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.15.0" />
<PackageVersion Include="MongoDB.Bson" Version="3.5.0" />
<PackageVersion Include="MongoDB.Driver" Version="3.5.0" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.15.1" />
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
<PackageVersion Include="System.Interactive.Async" Version="3.2.0" />
<PackageVersion Include="System.Net.Http.Json" Version="8.0.1" />
@ -53,6 +53,7 @@
-->
<PackageVersion Include="AngleSharp" Version="1.3.0" />
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.6.0" />
<PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.3.6" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.3.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageVersion Include="Microsoft.Owin.Testing" Version="4.2.3" />
@ -89,9 +90,9 @@
<PackageVersion Include="Microsoft.Owin.Security.Cookies" Version="4.2.3" />
<PackageVersion Include="Microsoft.Owin.Security.OAuth" Version="4.2.3" />
<PackageVersion Include="Microsoft.Web.Infrastructure" Version="2.0.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.15.0" />
<PackageVersion Include="Spectre.Console" Version="0.51.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.15.1" />
<PackageVersion Include="Spectre.Console" Version="0.53.0" />
<PackageVersion Include="WebGrease" Version="1.6.0" />
<!--
@ -112,23 +113,23 @@
<ItemGroup Label="Package versions for .NET 8.0"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '8.0')) ">
<PackageVersion Include="EntityFramework" Version="6.5.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.20" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.21" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.20" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.21" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.10.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="8.0.20" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="8.0.21" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="8.14.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="8.0.20" />
<PackageVersion Include="MongoDB.Bson" Version="3.4.3" />
<PackageVersion Include="MongoDB.Driver" Version="3.4.3" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.15.0" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="8.0.21" />
<PackageVersion Include="MongoDB.Bson" Version="3.5.0" />
<PackageVersion Include="MongoDB.Driver" Version="3.5.0" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.15.1" />
<PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.9.0" />
<!--
@ -136,7 +137,7 @@
-->
<PackageVersion Include="AngleSharp" Version="1.3.0" />
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.6.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.20" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.21" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="System.Linq.Async" Version="6.0.3" />
@ -159,22 +160,22 @@
<ItemGroup Label="Package versions for .NET 9.0"
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) ">
<PackageVersion Include="EntityFramework" Version="6.5.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.9" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.9" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.9" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="9.0.9" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.9.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.10" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="9.0.10" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.10.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="8.14.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.9" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.9" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="9.0.9" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="9.0.9" />
<PackageVersion Include="MongoDB.Bson" Version="3.4.3" />
<PackageVersion Include="MongoDB.Driver" Version="3.4.3" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.15.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.10" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.10" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="9.0.10" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="9.0.10" />
<PackageVersion Include="MongoDB.Bson" Version="3.5.0" />
<PackageVersion Include="MongoDB.Driver" Version="3.5.0" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.15.1" />
<PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.9.0" />
<!--
@ -182,8 +183,8 @@
-->
<PackageVersion Include="AngleSharp" Version="1.3.0" />
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.6.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.9" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.10" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
<PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="System.Linq.Async" Version="6.0.3" />
@ -193,13 +194,13 @@
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.AppServices" Version="1.0.14" />
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.WinForms" Version="1.0.14" />
<PackageVersion Include="Dapplo.Microsoft.Extensions.Hosting.Wpf" Version="1.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.9" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.110" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.110" />
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.15.0" />
<PackageVersion Include="Spectre.Console" Version="0.51.1" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.10" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.10" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.120" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.120" />
<PackageVersion Include="Quartz.Extensions.Hosting" Version="3.15.1" />
<PackageVersion Include="Spectre.Console" Version="0.53.0" />
<!--
Note: OpenIddict uses PolySharp to dynamically generate polyfills for types that are not available on
@ -226,19 +227,19 @@
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.20" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.21" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="8.0.20" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="8.0.21" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="8.14.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="2.3.4" />
<PackageVersion Include="MongoDB.Bson" Version="3.4.3" />
<PackageVersion Include="MongoDB.Driver" Version="3.4.3" />
<PackageVersion Include="MongoDB.Bson" Version="3.5.0" />
<PackageVersion Include="MongoDB.Driver" Version="3.5.0" />
<PackageVersion Include="NamedPipeServerStream.NetFrameworkVersion" Version="1.1.13" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.15.0" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.15.1" />
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageVersion Include="System.Interactive.Async" Version="3.2.0" />
@ -249,7 +250,7 @@
-->
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
<PackageVersion Include="Scriban" Version="6.2.1" />
<PackageVersion Include="Scriban" Version="6.5.0" />
<PackageVersion Include="System.Interactive" Version="6.0.3" />
<!--
@ -275,19 +276,19 @@
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.20" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.21" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="8.0.20" />
<PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="8.0.21" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="8.14.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="2.3.4" />
<PackageVersion Include="MongoDB.Bson" Version="3.4.3" />
<PackageVersion Include="MongoDB.Driver" Version="3.4.3" />
<PackageVersion Include="MongoDB.Bson" Version="3.5.0" />
<PackageVersion Include="MongoDB.Driver" Version="3.5.0" />
<PackageVersion Include="NamedPipeServerStream.NetFrameworkVersion" Version="1.1.13" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.15.0" />
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.15.1" />
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageVersion Include="System.Interactive.Async" Version="3.2.0" />
@ -312,7 +313,7 @@
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCore' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '5.0')) And
'$(TargetPlatformIdentifier)' == 'UAP' And $([MSBuild]::VersionEquals($(TargetPlatformVersion), '10.0.17763')) ">
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="2.3.0" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="2.3.4" />
<PackageVersion Include="NamedPipeServerStream.NetFrameworkVersion" Version="1.1.7" />
<!--

26
WorkloadRollback.json
View File

@ -1,17 +1,17 @@
{
"microsoft.net.sdk.android": "35.0.78/9.0.100",
"microsoft.net.sdk.ios": "18.5.9214/9.0.100",
"microsoft.net.sdk.maccatalyst": "18.5.9214/9.0.100",
"microsoft.net.sdk.macos": "15.5.9214/9.0.100",
"microsoft.net.sdk.maui": "9.0.82/9.0.100",
"microsoft.net.sdk.tvos": "18.5.9214/9.0.100",
"microsoft.net.workload.mono.toolchain.current": "9.0.9/9.0.100",
"microsoft.net.workload.emscripten.current": "9.0.9/9.0.100",
"microsoft.net.workload.emscripten.net6": "9.0.9/9.0.100",
"microsoft.net.workload.emscripten.net7": "9.0.9/9.0.100",
"microsoft.net.workload.emscripten.net8": "9.0.9/9.0.100",
"microsoft.net.workload.mono.toolchain.net6": "9.0.9/9.0.100",
"microsoft.net.workload.mono.toolchain.net7": "9.0.9/9.0.100",
"microsoft.net.workload.mono.toolchain.net8": "9.0.9/9.0.100",
"microsoft.net.sdk.ios": "26.0.9752/9.0.100",
"microsoft.net.sdk.maccatalyst": "26.0.9752/9.0.100",
"microsoft.net.sdk.macos": "26.0.9752/9.0.100",
"microsoft.net.sdk.maui": "9.0.111/9.0.100",
"microsoft.net.sdk.tvos": "26.0.9752/9.0.100",
"microsoft.net.workload.mono.toolchain.current": "9.0.10/9.0.100",
"microsoft.net.workload.emscripten.current": "9.0.10/9.0.100",
"microsoft.net.workload.emscripten.net6": "9.0.10/9.0.100",
"microsoft.net.workload.emscripten.net7": "9.0.10/9.0.100",
"microsoft.net.workload.emscripten.net8": "9.0.10/9.0.100",
"microsoft.net.workload.mono.toolchain.net6": "9.0.10/9.0.100",
"microsoft.net.workload.mono.toolchain.net7": "9.0.10/9.0.100",
"microsoft.net.workload.mono.toolchain.net8": "9.0.10/9.0.100",
"microsoft.net.sdk.aspire": "8.2.2/8.0.100"
}

33
gen/OpenIddict.Client.WebIntegration.Generators/OpenIddictClientWebIntegrationGenerator.cs
View File

@ -4,6 +4,7 @@ using System.Xml.Linq;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Text;
using Scriban;
using Scriban.Runtime;
namespace OpenIddict.Client.WebIntegration.Generators;
@ -802,7 +803,7 @@ public sealed partial class OpenIddictClientWebIntegrationBuilder
{{~ end ~}}
}
");
return template.Render(new
var context = CreateTemplateContext(new
{
Providers = document.Root.Elements("Provider")
.Select(static provider => new
@ -860,6 +861,8 @@ public sealed partial class OpenIddictClientWebIntegrationBuilder
})
.ToList()
});
return template.Render(context);
}
static string GenerateConstants(XDocument document)
@ -913,7 +916,7 @@ public static partial class OpenIddictClientWebIntegrationConstants
}
}
");
return template.Render(new
var context = CreateTemplateContext(new
{
Providers = document.Root.Elements("Provider")
.Select(static provider => new
@ -946,6 +949,8 @@ public static partial class OpenIddictClientWebIntegrationConstants
})
.ToList()
});
return template.Render(context);
}
static string GenerateConfigurationClasses(XDocument document)
@ -1305,7 +1310,7 @@ public sealed partial class OpenIddictClientWebIntegrationConfiguration
}
}
");
return template.Render(new
var context = CreateTemplateContext(new
{
Providers = document.Root.Elements("Provider")
.Select(static provider => new
@ -1443,6 +1448,8 @@ public sealed partial class OpenIddictClientWebIntegrationConfiguration
})
.ToList()
});
return template.Render(context);
}
static string GenerateHelpers(XDocument document)
@ -1472,7 +1479,7 @@ public static partial class OpenIddictClientWebIntegrationHelpers
{{~ end ~}}
}
");
return template.Render(new
var context = CreateTemplateContext(new
{
Providers = document.Root.Elements("Provider")
.Select(static provider => new
@ -1482,6 +1489,8 @@ public static partial class OpenIddictClientWebIntegrationHelpers
})
.ToList()
});
return template.Render(context);
}
static string GenerateSettings(XDocument document)
@ -1524,7 +1533,7 @@ public sealed partial class OpenIddictClientWebIntegrationSettings
{{~ end ~}}
}
");
return template.Render(new
var context = CreateTemplateContext(new
{
Providers = document.Root.Elements("Provider")
.Select(static provider => new
@ -1572,6 +1581,20 @@ public sealed partial class OpenIddictClientWebIntegrationSettings
})
.ToList()
});
return template.Render(context);
}
static TemplateContext CreateTemplateContext(object model)
{
var context = new TemplateContext
{
LoopLimit = 100_000
};
context.PushGlobal(ScriptObject.From(model));
return context;
}
}
}

6
global.json
View File

@ -1,16 +1,16 @@
{
"sdk": {
"version": "9.0.305",
"version": "9.0.306",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "9.0.305",
"dotnet": "9.0.306",
"runtimes": {
"aspnetcore": [
"8.0.20"
"8.0.21"
]
}
},

6
sandbox/OpenIddict.Sandbox.AspNetCore.Client/OpenIddict.Sandbox.AspNetCore.Client.csproj
View File

@ -16,9 +16,15 @@
</ItemGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
<!--
Note: Microsoft.AspNetCore.Server.Kestrel.Core is explicitly referenced to
override the vulnerable version referenced by other packages or metapackages.
-->
<PackageReference Include="Microsoft.AspNetCore" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" />
</ItemGroup>

5
sandbox/OpenIddict.Sandbox.AspNetCore.Server/OpenIddict.Sandbox.AspNetCore.Server.csproj
View File

@ -20,13 +20,14 @@
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
<!--
Note: Microsoft.AspNetCore.Identity is explicitly referenced to override the vulnerable
2.3.0 version referenced by the Microsoft.AspNetCore.Identity.EntityFrameworkCore package.
Note: Microsoft.AspNetCore.Identity and Microsoft.AspNetCore.Server.Kestrel.Core are explicitly
referenced to override vulnerable versions referenced by other packages or metapackages.
-->
<PackageReference Include="Microsoft.AspNetCore" />
<PackageReference Include="Microsoft.AspNetCore.Identity" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" />
</ItemGroup>

Write Preview
Loading…
Cancel
Save