Skip to content
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.

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

[main] Update dependencies from dotnet/efcore dotnet/runtime #48558

Merged
merged 16 commits into from
Jun 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
58be3a4
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jun 1, 2023
aa05cb4
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Jun 1, 2023
7305e29
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Jun 1, 2023
095918e
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Jun 1, 2023
ce2a451
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jun 2, 2023
be70f74
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jun 3, 2023
128c21c
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jun 4, 2023
9087a2f
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jun 5, 2023
5b229e4
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jun 6, 2023
d57e858
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Jun 7, 2023
2b83f1b
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jun 7, 2023
ba05754
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Jun 7, 2023
ce55119
Fix Http Results test to respond to https://github.com/dotnet/runtime…
eerhardt Jun 7, 2023
f9e0324
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jun 8, 2023
4355284
Convert to new generic JsonStringEnumConverter<TEnum> to fix JSON sou…
eerhardt Jun 8, 2023
d783681
Skip AcceptAsync_NoCertificateCallback_RemovedFromPendingConnections
amcasey Jun 8, 2023
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
308 changes: 154 additions & 154 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

154 changes: 77 additions & 77 deletions eng/Versions.props

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Authentication;
/// <summary>
/// The type of authentication request.
/// </summary>
[JsonConverter(typeof(JsonStringEnumConverter))]
[JsonConverter(typeof(JsonStringEnumConverter<InteractionType>))]
public enum InteractionType
{
/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Authentication;
/// <summary>
/// Represents the status of an authentication operation.
/// </summary>
[JsonConverter(typeof(JsonStringEnumConverter))]
[JsonConverter(typeof(JsonStringEnumConverter<RemoteAuthenticationStatus>))]
public enum RemoteAuthenticationStatus
{
/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,4 +255,4 @@ internal class RemoteAuthenticationServiceJavaScriptLoggingOptions
}

// Internal for testing purposes
internal record struct InternalAccessTokenResult([property: JsonConverter(typeof(JsonStringEnumConverter))] AccessTokenResultStatus Status, AccessToken Token);
internal record struct InternalAccessTokenResult([property: JsonConverter(typeof(JsonStringEnumConverter<AccessTokenResultStatus>))] AccessTokenResultStatus Status, AccessToken Token);
8 changes: 4 additions & 4 deletions src/Http/Http.Results/test/ResultsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1009,15 +1009,15 @@ public void Json_WithNullSerializerContext_ThrowsArgException()
[Fact]
public void Json_WithInvalidSerializerContext_ThrowsInvalidOperationException()
{
var ex = Assert.Throws<InvalidOperationException>(() => Results.Json(null, type: typeof(object), context: StringJsonContext.Default));
Assert.Equal(ex.Message, $"Unable to obtain the JsonTypeInfo for type 'System.Object' from the context '{typeof(StringJsonContext).FullName}'.");
var ex = Assert.Throws<InvalidOperationException>(() => Results.Json(null, type: typeof(Todo), context: StringJsonContext.Default));
Assert.Equal(ex.Message, $"Unable to obtain the JsonTypeInfo for type 'Microsoft.AspNetCore.Http.HttpResults.ResultsTests+Todo' from the context '{typeof(StringJsonContext).FullName}'.");
}

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

[Fact]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ public async Task AcceptAsync_Success_RemovedFromPendingConnections()

[ConditionalFact]
[MsQuicSupported]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/48678")]
public async Task AcceptAsync_NoCertificateCallback_RemovedFromPendingConnections()
{
// Arrange
Expand Down