Skip to content

Bump the .NET SDK and dependencies #2379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2025
Merged

Bump the .NET SDK and dependencies #2379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 73 additions & 73 deletions Directory.Packages.props
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions WorkloadRollback.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"microsoft.net.sdk.android": "35.0.61/9.0.100",
"microsoft.net.sdk.ios": "18.4.9288/9.0.100",
"microsoft.net.sdk.maccatalyst": "18.4.9288/9.0.100",
"microsoft.net.sdk.macos": "15.4.9288/9.0.100",
"microsoft.net.sdk.maui": "9.0.51/9.0.100",
"microsoft.net.sdk.tvos": "18.4.9288/9.0.100",
"microsoft.net.workload.mono.toolchain.current": "9.0.6/9.0.100",
"microsoft.net.workload.emscripten.current": "9.0.6/9.0.100",
"microsoft.net.workload.emscripten.net6": "9.0.6/9.0.100",
"microsoft.net.workload.emscripten.net7": "9.0.6/9.0.100",
"microsoft.net.workload.emscripten.net8": "9.0.6/9.0.100",
"microsoft.net.workload.mono.toolchain.net6": "9.0.6/9.0.100",
"microsoft.net.workload.mono.toolchain.net7": "9.0.6/9.0.100",
"microsoft.net.workload.mono.toolchain.net8": "9.0.6/9.0.100",
"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.aspire": "8.2.2/8.0.100"
}
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "9.0.301",
"version": "9.0.305",
"allowPrerelease": true,
"rollForward": "major"
},

"tools": {
"dotnet": "9.0.301",
"dotnet": "9.0.305",

"runtimes": {
"aspnetcore": [
"8.0.17"
"8.0.20"
]
}
},
Expand Down
3 changes: 3 additions & 0 deletions src/OpenIddict.Abstractions/OpenIddictResources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1799,6 +1799,9 @@ Alternatively, any value respecting the '[region]-[subregion]-[identifier]' patt
<data name="ID0496" xml:space="preserve">
<value>The issuer cannot be retrieved from the server options or inferred from the current request or is not a valid value.</value>
</data>
<data name="ID0497" xml:space="preserve">
<value>An unknown error occurred while trying to start a custom tabs intent.</value>
</data>
<data name="ID2000" xml:space="preserve">
<value>The security token is missing.</value>
</data>
Expand Down
5 changes: 5 additions & 0 deletions ...dict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlers.Authentication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,11 @@ public async ValueTask HandleAsync(ApplyAuthorizationRequestContext context)
using var builder = new CustomTabsIntent.Builder();
using var intent = builder.Build();

if (intent is not { Intent: not null })
{
throw new InvalidOperationException(SR.GetResourceString(SR.ID0497));
}

// Note: using ActivityFlags.NewTask is required when
// creating intents without a parent activity attached.
intent.Intent.AddFlags(ActivityFlags.NewTask);
Expand Down
5 changes: 5 additions & 0 deletions src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlers.Session.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,11 @@ public async ValueTask HandleAsync(ApplyEndSessionRequestContext context)
using var builder = new CustomTabsIntent.Builder();
using var intent = builder.Build();

if (intent is not { Intent: not null })
{
throw new InvalidOperationException(SR.GetResourceString(SR.ID0497));
}

// Note: using ActivityFlags.NewTask is required when
// creating intents without a parent activity attached.
intent.Intent.AddFlags(ActivityFlags.NewTask);
Expand Down
Loading