Skip to content

Commit b17b3fe

Browse files
kevinchaletkevinchalet
committed
Update the .NET Framework and .NET Standard TFMs to target ASP.NET Core/Entity Framework Core 2.3 and .NET Extensions 8.0
1 parent 2edcabb commit b17b3fe

File tree

83 files changed

+636
-1297
lines changed

Some content is hidden

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

83 files changed

+636
-1297
lines changed

‎Directory.Build.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
</NetFrameworkTargetFrameworks>
107107

108108
<NetCoreTargetFrameworks Condition=" '$(NetCoreTargetFrameworks)' == '' ">
109-
net6.0;
110109
net8.0;
111110
net9.0
112111
</NetCoreTargetFrameworks>
@@ -137,8 +136,6 @@
137136

138137
<NetCoreWindowsTargetFrameworks
139138
Condition=" '$(NetCoreWindowsTargetFrameworks)' == '' And '$(SupportsWindowsTargeting)' == 'true' ">
140-
net6.0-windows7.0;
141-
net6.0-windows10.0.17763;
142139
net8.0-windows7.0;
143140
net8.0-windows10.0.17763;
144141
net9.0-windows7.0;

‎Directory.Build.targets‎

Lines changed: 61 additions & 151 deletions
Large diffs are not rendered by default.

‎Directory.Packages.props‎

Lines changed: 153 additions & 320 deletions
Large diffs are not rendered by default.

‎eng/AfterTargetFrameworkInference.targets‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
-->
77

88
<PropertyGroup
9-
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCore' And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '5.0')) And
10-
'$(TargetPlatformIdentifier)' == 'UAP' And '$(TargetPlatformVersion)' != '' And
11-
$([MSBuild]::VersionGreaterThanOrEquals($(TargetPlatformVersion), '10.0')) ">
9+
Condition=" '$(TargetFrameworkIdentifier)' == '.NETCore' And '$(TargetPlatformIdentifier)' == 'UAP' ">
1210
<LanguageTargets>$(MSBuildThisFileDirectory)msbuild\uwp\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
1311
</PropertyGroup>
1412

‎gen/OpenIddict.Client.WebIntegration.Generators/OpenIddictClientWebIntegrationGenerator.cs‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,40 +8,37 @@
88
namespace OpenIddict.Client.WebIntegration.Generators;
99

1010
[Generator]
11-
public sealed class OpenIddictClientWebIntegrationGenerator : ISourceGenerator
11+
public sealed class OpenIddictClientWebIntegrationGenerator : IIncrementalGenerator
1212
{
13-
public void Execute(GeneratorExecutionContext context)
13+
public void Initialize(IncrementalGeneratorInitializationContext context)
1414
{
15-
var file = context.AdditionalFiles.Select(file => file.Path)
16-
.Where(path => string.Equals(Path.GetFileName(path), "OpenIddictClientWebIntegrationProviders.xml"))
17-
.SingleOrDefault();
15+
var files = context.AdditionalTextsProvider.Where(static file =>
16+
string.Equals(Path.GetFileName(file.Path), "OpenIddictClientWebIntegrationProviders.xml"));
1817

19-
if (string.IsNullOrEmpty(file))
18+
context.RegisterSourceOutput(files, static (context, file) =>
2019
{
21-
return;
22-
}
23-
24-
var document = XDocument.Load(file, LoadOptions.None);
20+
var document = XDocument.Load(file.Path, LoadOptions.None);
2521

26-
context.AddSource(
27-
"OpenIddictClientWebIntegrationBuilder.generated.cs",
28-
SourceText.From(GenerateBuilderMethods(document), Encoding.UTF8));
22+
context.AddSource(
23+
"OpenIddictClientWebIntegrationBuilder.generated.cs",
24+
SourceText.From(GenerateBuilderMethods(document), Encoding.UTF8));
2925

30-
context.AddSource(
31-
"OpenIddictClientWebIntegrationConfiguration.generated.cs",
32-
SourceText.From(GenerateConfigurationClasses(document), Encoding.UTF8));
26+
context.AddSource(
27+
"OpenIddictClientWebIntegrationConfiguration.generated.cs",
28+
SourceText.From(GenerateConfigurationClasses(document), Encoding.UTF8));
3329

34-
context.AddSource(
35-
"OpenIddictClientWebIntegrationConstants.generated.cs",
36-
SourceText.From(GenerateConstants(document), Encoding.UTF8));
30+
context.AddSource(
31+
"OpenIddictClientWebIntegrationConstants.generated.cs",
32+
SourceText.From(GenerateConstants(document), Encoding.UTF8));
3733

38-
context.AddSource(
39-
"OpenIddictClientWebIntegrationHelpers.generated.cs",
40-
SourceText.From(GenerateHelpers(document), Encoding.UTF8));
34+
context.AddSource(
35+
"OpenIddictClientWebIntegrationHelpers.generated.cs",
36+
SourceText.From(GenerateHelpers(document), Encoding.UTF8));
4137

42-
context.AddSource(
43-
"OpenIddictClientWebIntegrationSettings.generated.cs",
44-
SourceText.From(GenerateSettings(document), Encoding.UTF8));
38+
context.AddSource(
39+
"OpenIddictClientWebIntegrationSettings.generated.cs",
40+
SourceText.From(GenerateSettings(document), Encoding.UTF8));
41+
});
4542

4643
static string GenerateBuilderMethods(XDocument document)
4744
{

‎global.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
{
22
"sdk": {
3-
"version": "9.0.200",
3+
"version": "9.0.201",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77

88
"tools": {
9-
"dotnet": "9.0.200",
9+
"dotnet": "9.0.201",
1010

1111
"runtimes": {
1212
"aspnetcore": [
13-
"6.0.36",
14-
"8.0.13"
13+
"8.0.14"
1514
]
1615
}
1716
},

‎sandbox/OpenIddict.Sandbox.AspNet.Client/Web.config‎

Lines changed: 58 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
</assemblyBinding>
4343
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
4444
<dependentAssembly>
45-
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
46-
<bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
45+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" culture="neutral" publicKeyToken="adb9793829ddae60" />
46+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
4747
</dependentAssembly>
4848
</assemblyBinding>
4949
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -66,8 +66,8 @@
6666
</assemblyBinding>
6767
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
6868
<dependentAssembly>
69-
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
70-
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
69+
<assemblyIdentity name="System.Buffers" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
70+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
7171
</dependentAssembly>
7272
</assemblyBinding>
7373
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -78,8 +78,8 @@
7878
</assemblyBinding>
7979
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8080
<dependentAssembly>
81-
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
82-
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
81+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
82+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
8383
</dependentAssembly>
8484
</assemblyBinding>
8585
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -90,8 +90,8 @@
9090
</assemblyBinding>
9191
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
9292
<dependentAssembly>
93-
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
94-
<bindingRedirect oldVersion="0.0.0.0-4.0.5.1" newVersion="4.0.5.1" />
93+
<assemblyIdentity name="System.Text.Encodings.Web" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
94+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
9595
</dependentAssembly>
9696
</assemblyBinding>
9797
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -132,8 +132,8 @@
132132
</assemblyBinding>
133133
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
134134
<dependentAssembly>
135-
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
136-
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
135+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
136+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
137137
</dependentAssembly>
138138
</assemblyBinding>
139139
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -190,6 +190,54 @@
190190
<bindingRedirect oldVersion="0.0.0.0-3.13.0.0" newVersion="3.13.0.0" />
191191
</dependentAssembly>
192192
</assemblyBinding>
193+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
194+
<dependentAssembly>
195+
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
196+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
197+
</dependentAssembly>
198+
</assemblyBinding>
199+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
200+
<dependentAssembly>
201+
<assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
202+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
203+
</dependentAssembly>
204+
</assemblyBinding>
205+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
206+
<dependentAssembly>
207+
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" culture="neutral" publicKeyToken="adb9793829ddae60" />
208+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
209+
</dependentAssembly>
210+
</assemblyBinding>
211+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
212+
<dependentAssembly>
213+
<assemblyIdentity name="Microsoft.Extensions.Options" culture="neutral" publicKeyToken="adb9793829ddae60" />
214+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
215+
</dependentAssembly>
216+
</assemblyBinding>
217+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
218+
<dependentAssembly>
219+
<assemblyIdentity name="System.Text.Json" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
220+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
221+
</dependentAssembly>
222+
</assemblyBinding>
223+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
224+
<dependentAssembly>
225+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
226+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
227+
</dependentAssembly>
228+
</assemblyBinding>
229+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
230+
<dependentAssembly>
231+
<assemblyIdentity name="Microsoft.Extensions.Http" publicKeyToken="adb9793829ddae60" culture="neutral" />
232+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
233+
</dependentAssembly>
234+
</assemblyBinding>
235+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
236+
<dependentAssembly>
237+
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
238+
<bindingRedirect oldVersion="0.0.0.0-8.1.0.0" newVersion="8.1.0.0" />
239+
</dependentAssembly>
240+
</assemblyBinding>
193241
</runtime>
194242
<system.codedom>
195243
<compilers>

‎sandbox/OpenIddict.Sandbox.AspNet.Server/Controllers/AuthorizationController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public async Task<ActionResult> Authorize()
6262
// If the user principal can't be extracted or the cookie is too old, redirect the user to the login page.
6363
var result = await context.Authentication.AuthenticateAsync(DefaultAuthenticationTypes.ApplicationCookie);
6464
if (result?.Identity == null || (request.MaxAge != null && result.Properties?.IssuedUtc != null &&
65-
DateTimeOffset.UtcNow - result.Properties.IssuedUtc > TimeSpan.FromSeconds(request.MaxAge.Value)))
65+
TimeProvider.System.GetUtcNow() - result.Properties.IssuedUtc > TimeSpan.FromSeconds(request.MaxAge.Value)))
6666
{
6767
// For applications that want to allow the client to select the external authentication provider
6868
// that will be used to authenticate the user, the identity_provider parameter can be used for that.

‎sandbox/OpenIddict.Sandbox.AspNet.Server/Web.config‎

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
</assemblyBinding>
4949
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5050
<dependentAssembly>
51-
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
52-
<bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
51+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" culture="neutral" publicKeyToken="adb9793829ddae60" />
52+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
5353
</dependentAssembly>
5454
</assemblyBinding>
5555
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -90,8 +90,8 @@
9090
</assemblyBinding>
9191
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
9292
<dependentAssembly>
93-
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
94-
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
93+
<assemblyIdentity name="System.Buffers" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
94+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
9595
</dependentAssembly>
9696
</assemblyBinding>
9797
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -102,8 +102,8 @@
102102
</assemblyBinding>
103103
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
104104
<dependentAssembly>
105-
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
106-
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
105+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
106+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
107107
</dependentAssembly>
108108
</assemblyBinding>
109109
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -114,8 +114,8 @@
114114
</assemblyBinding>
115115
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
116116
<dependentAssembly>
117-
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
118-
<bindingRedirect oldVersion="0.0.0.0-4.0.5.1" newVersion="4.0.5.1" />
117+
<assemblyIdentity name="System.Text.Encodings.Web" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
118+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
119119
</dependentAssembly>
120120
</assemblyBinding>
121121
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -202,6 +202,48 @@
202202
<bindingRedirect oldVersion="0.0.0.0-7.4.0.0" newVersion="7.4.0.0" />
203203
</dependentAssembly>
204204
</assemblyBinding>
205+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
206+
<dependentAssembly>
207+
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
208+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
209+
</dependentAssembly>
210+
</assemblyBinding>
211+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
212+
<dependentAssembly>
213+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
214+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
215+
</dependentAssembly>
216+
</assemblyBinding>
217+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
218+
<dependentAssembly>
219+
<assemblyIdentity name="System.Text.Json" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
220+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
221+
</dependentAssembly>
222+
</assemblyBinding>
223+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
224+
<dependentAssembly>
225+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
226+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
227+
</dependentAssembly>
228+
</assemblyBinding>
229+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
230+
<dependentAssembly>
231+
<assemblyIdentity name="Microsoft.Extensions.Http" publicKeyToken="adb9793829ddae60" culture="neutral" />
232+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
233+
</dependentAssembly>
234+
</assemblyBinding>
235+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
236+
<dependentAssembly>
237+
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
238+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
239+
</dependentAssembly>
240+
</assemblyBinding>
241+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
242+
<dependentAssembly>
243+
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
244+
<bindingRedirect oldVersion="0.0.0.0-8.1.0.0" newVersion="8.1.0.0" />
245+
</dependentAssembly>
246+
</assemblyBinding>
205247
</runtime>
206248
<entityFramework>
207249
<providers>

‎sandbox/OpenIddict.Sandbox.AspNetCore.Client/OpenIddict.Sandbox.AspNetCore.Client.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616
<PackageReference Include="Quartz.Extensions.Hosting" />
1717
</ItemGroup>
1818

19-
<ItemGroup
20-
Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0'))) Or
21-
('$(TargetFrameworkIdentifier)' == '.NETFramework') Or
22-
('$(TargetFrameworkIdentifier)' == '.NETStandard') ">
19+
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
2320
<PackageReference Include="Microsoft.AspNetCore" />
2421
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" />
2522
<PackageReference Include="Microsoft.AspNetCore.Mvc" />

0 commit comments

Comments
 (0)