Skip to content

Commit 6575b28

Browse files
[main] Update dependencies from dotnet/efcore dotnet/runtime (#48558)
[main] Update dependencies from dotnet/efcore dotnet/runtime - Fix Http Results test to respond to dotnet/runtime#87093 - Convert to new generic JsonStringEnumConverter<TEnum> to fix JSON source generator warning. InteractionType is used in a JsonSerializerContext. With dotnet/runtime#87224, there is now a warning to convert source generated usages of JsonStringEnumConverter to JsonStringEnumConverter<TEnum>. I went ahead and updated the other 2 usages as well, to make them consistent. - Skip AcceptAsync_NoCertificateCallback_RemovedFromPendingConnections See #48678
1 parent d868553 commit 6575b28

File tree

7 files changed

+239
-238
lines changed

7 files changed

+239
-238
lines changed

eng/Version.Details.xml

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

eng/Versions.props

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

src/Components/WebAssembly/WebAssembly.Authentication/src/Models/InteractionType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Authentication;
88
/// <summary>
99
/// The type of authentication request.
1010
/// </summary>
11-
[JsonConverter(typeof(JsonStringEnumConverter))]
11+
[JsonConverter(typeof(JsonStringEnumConverter<InteractionType>))]
1212
public enum InteractionType
1313
{
1414
/// <summary>

src/Components/WebAssembly/WebAssembly.Authentication/src/Models/RemoteAuthenticationStatus.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Authentication;
88
/// <summary>
99
/// Represents the status of an authentication operation.
1010
/// </summary>
11-
[JsonConverter(typeof(JsonStringEnumConverter))]
11+
[JsonConverter(typeof(JsonStringEnumConverter<RemoteAuthenticationStatus>))]
1212
public enum RemoteAuthenticationStatus
1313
{
1414
/// <summary>

src/Components/WebAssembly/WebAssembly.Authentication/src/Services/RemoteAuthenticationService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,4 +255,4 @@ internal class RemoteAuthenticationServiceJavaScriptLoggingOptions
255255
}
256256

257257
// Internal for testing purposes
258-
internal record struct InternalAccessTokenResult([property: JsonConverter(typeof(JsonStringEnumConverter))] AccessTokenResultStatus Status, AccessToken Token);
258+
internal record struct InternalAccessTokenResult([property: JsonConverter(typeof(JsonStringEnumConverter<AccessTokenResultStatus>))] AccessTokenResultStatus Status, AccessToken Token);

src/Http/Http.Results/test/ResultsTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,15 +1009,15 @@ public void Json_WithNullSerializerContext_ThrowsArgException()
10091009
[Fact]
10101010
public void Json_WithInvalidSerializerContext_ThrowsInvalidOperationException()
10111011
{
1012-
var ex = Assert.Throws<InvalidOperationException>(() => Results.Json(null, type: typeof(object), context: StringJsonContext.Default));
1013-
Assert.Equal(ex.Message, $"Unable to obtain the JsonTypeInfo for type 'System.Object' from the context '{typeof(StringJsonContext).FullName}'.");
1012+
var ex = Assert.Throws<InvalidOperationException>(() => Results.Json(null, type: typeof(Todo), context: StringJsonContext.Default));
1013+
Assert.Equal(ex.Message, $"Unable to obtain the JsonTypeInfo for type 'Microsoft.AspNetCore.Http.HttpResults.ResultsTests+Todo' from the context '{typeof(StringJsonContext).FullName}'.");
10141014
}
10151015

10161016
[Fact]
10171017
public void JsonOfT_WithInvalidSerializerContext_ThrowsInvalidOperationException()
10181018
{
1019-
var ex = Assert.Throws<InvalidOperationException>(() => Results.Json<object>(null, context: StringJsonContext.Default));
1020-
Assert.Equal(ex.Message, $"Unable to obtain the JsonTypeInfo for type 'System.Object' from the context '{typeof(StringJsonContext).FullName}'.");
1019+
var ex = Assert.Throws<InvalidOperationException>(() => Results.Json<Todo>(null, context: StringJsonContext.Default));
1020+
Assert.Equal(ex.Message, $"Unable to obtain the JsonTypeInfo for type 'Microsoft.AspNetCore.Http.HttpResults.ResultsTests+Todo' from the context '{typeof(StringJsonContext).FullName}'.");
10211021
}
10221022

10231023
[Fact]

src/Servers/Kestrel/Transport.Quic/test/QuicConnectionListenerTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ public async Task AcceptAsync_Success_RemovedFromPendingConnections()
355355

356356
[ConditionalFact]
357357
[MsQuicSupported]
358+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/48678")]
358359
public async Task AcceptAsync_NoCertificateCallback_RemovedFromPendingConnections()
359360
{
360361
// Arrange

0 commit comments

Comments
 (0)