Skip to content

Commit eb4e641

Browse files
dotnet-maestro[bot]dougbu
dotnet-maestro[bot]
authored and
dougbu
committed
[master] Update dependencies from 2 repositories (#11771)
* Update usage of `@ref` - thanx @rynowak❕ * Use suppressField x2 - thanx @rynowak❕ * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190703.8 - Microsoft.NET.Sdk.Razor - 3.0.0-preview8.19353.8 - Microsoft.CodeAnalysis.Razor - 3.0.0-preview8.19353.8 - Microsoft.AspNetCore.Razor.Language - 3.0.0-preview8.19353.8 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview8.19353.8 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190703.14 - Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview8.19353.14 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview8.19353.14 - dotnet-ef - 3.0.0-preview8.19353.14 - Microsoft.EntityFrameworkCore - 3.0.0-preview8.19353.14 - Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview8.19353.14 - Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview8.19353.14 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview8.19353.14 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Internal.Extensions.Refs - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Bcl.AsyncInterfaces - 1.0.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.CSharp - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Win32.Registry - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.ComponentModel.Annotations - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.Diagnostics.EventLog - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.IO.Pipelines - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.Net.Http.WinHttpHandler - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.Net.WebSockets.WebSocketProtocol - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.Reflection.Metadata - 1.7.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.Runtime.CompilerServices.Unsafe - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.Security.Cryptography.Cng - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.Security.Cryptography.Pkcs - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.Security.Cryptography.Xml - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.Security.Permissions - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.Security.Principal.Windows - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.ServiceProcess.ServiceController - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.Text.Encodings.Web - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.Text.Json - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - System.Threading.Channels - 4.6.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyModel - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Ref - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - NETStandard.Library.Ref - 2.1.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.Platforms - 3.0.0-preview8.19353.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview8-27903-07 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Internal.AspNetCore.Analyzers - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.0.0-preview8.19353.10 (parent: Microsoft.EntityFrameworkCore) * React to JSInterop changes - thanx @pranavkm❕ * Apply fix for analyzer problem - copy fix done in 006b002 (which should be merged from release/3.0-preview7 soon) * Skip tests per #11813 - cherry-picked from 006b002
1 parent d8b1af3 commit eb4e641

File tree

11 files changed

+308
-300
lines changed

11 files changed

+308
-300
lines changed

‎eng/Version.Details.xml

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

‎eng/Versions.props

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

‎src/Components/Blazor/Build/test/GenericComponentRazorIntegrationTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void Render_GenericComponent_WithRef()
121121
AdditionalSyntaxTrees.Add(GenericContextComponent);
122122

123123
var component = CompileToComponent(@"
124-
<GenericContext TItem=int Items=""@(new List<int>() { 1, 2, })"" @ref=""_my"" />
124+
<GenericContext TItem=int Items=""@(new List<int>() { 1, 2, })"" @ref=""_my"" @ref:suppressField />
125125
126126
@code {
127127
GenericContext<int> _my;
@@ -188,7 +188,7 @@ public void Render_GenericComponent_TypeInference_WithRef()
188188
AdditionalSyntaxTrees.Add(GenericContextComponent);
189189

190190
var component = CompileToComponent(@"
191-
<GenericContext Items=""@(new List<int>() { 1, 2, })"" @ref=""_my"" />
191+
<GenericContext Items=""@(new List<int>() { 1, 2, })"" @ref=""_my"" @ref:suppressField />
192192
193193
@code {
194194
GenericContext<int> _my;
@@ -221,7 +221,7 @@ public void Render_GenericComponent_TypeInference_WithRef_Recursive()
221221

222222
var assembly = CompileToAssembly("Test.cshtml", @"
223223
@typeparam TItem
224-
<GenericContext Items=""@MyItems"" @ref=""_my"" />
224+
<GenericContext Items=""@MyItems"" @ref=""_my"" @ref:suppressField />
225225
226226
@code {
227227
[Parameter] List<TItem> MyItems { get; set; }

‎src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@using Microsoft.JSInterop
22
@inject IJSRuntime JSRuntime
33

4-
<input @ref="myInput" value="Value set during render" />
4+
<input @ref="myInput" @ref:suppressField value="Value set during render" />
55

66
@code {
77
ElementRef myInput;

‎src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@if (_toggleCapturedComponentPresence)
1212
{
1313
<div id="child-component">
14-
<CounterComponent @ref="_myChildCounter" />
14+
<CounterComponent @ref="_myChildCounter" @ref:suppressField />
1515
</div>
1616
}
1717

‎src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
@if (_toggleCapturedElementPresence)
1919
{
20-
<input id="capturedElement" @ref="_myInput" />
20+
<input id="capturedElement" @ref="_myInput" @ref:suppressField />
2121
}
2222
<button @onclick="MakeInteropCall">Click me</button>
2323
<label>

‎src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<p>
2121
Value set via JS interop call:
22-
<input id="val-set-by-interop" @ref="@myElem" />
22+
<input id="val-set-by-interop" @ref="@myElem" @ref:suppressField />
2323
</p>
2424

2525
@code {

‎src/Identity/test/Identity.FunctionalTests/Pages/Account/ExternalLogin.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public async Task<RegisterConfirmation> SendEmailWithConfirmationAsync(string em
4949
["Input_Email"] = email
5050
});
5151
var redirect = ResponseAssert.IsRedirect(response);
52-
Assert.True(String.Equals(RegisterConfirmation.Path + "?email=" + email, redirect.ToString(), StringComparison.OrdinalIgnoreCase));
52+
Assert.Equal(RegisterConfirmation.Path + "?email=" + email, redirect.ToString(), StringComparer.OrdinalIgnoreCase);
53+
5354
var registerResponse = await Client.GetAsync(redirect);
5455
var register = await ResponseAssert.IsHtmlDocumentAsync(registerResponse);
5556

‎src/Mvc/Mvc.ViewFeatures/src/RazorComponents/UnsupportedJavaScriptRuntime.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5+
using System.Collections.Generic;
6+
using System.Threading;
57
using System.Threading.Tasks;
68
using Microsoft.JSInterop;
79

@@ -13,5 +15,10 @@ public Task<T> InvokeAsync<T>(string identifier, params object[] args)
1315
{
1416
throw new InvalidOperationException("JavaScript interop calls cannot be issued during server-side prerendering, because the page has not yet loaded in the browser. Prerendered components must wrap any JavaScript interop calls in conditional logic to ensure those interop calls are not attempted during prerendering.");
1517
}
18+
19+
public Task<TValue> InvokeAsync<TValue>(string identifier, IEnumerable<object> args, CancellationToken cancellationToken = default)
20+
{
21+
throw new InvalidOperationException("JavaScript interop calls cannot be issued during server-side prerendering, because the page has not yet loaded in the browser. Prerendered components must wrap any JavaScript interop calls in conditional logic to ensure those interop calls are not attempted during prerendering.");
22+
}
1623
}
1724
}

‎src/Mvc/test/Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1830,7 +1830,7 @@ public async Task MutableObjectModelBinder_BindsKeyValuePairProperty_EmptyPrefix
18301830
Assert.Equal("10", entry.RawValue);
18311831
}
18321832

1833-
[Fact]
1833+
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11813")]
18341834
public async Task MutableObjectModelBinder_BindsKeyValuePairProperty_NoCollectionData()
18351835
{
18361836
// Arrange
@@ -1879,7 +1879,7 @@ public async Task MutableObjectModelBinder_BindsKeyValuePairProperty_NoCollectio
18791879
Assert.Single(entry.Errors);
18801880
}
18811881

1882-
[Fact]
1882+
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11813")]
18831883
public async Task MutableObjectModelBinder_BindsKeyValuePairProperty_NoData()
18841884
{
18851885
// Arrange

‎src/Mvc/test/Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ public async Task KeyValuePairModelBinder_BindsKeyValuePairOfSimpleType_EmptyPre
311311
Assert.Equal("10", entry.RawValue);
312312
}
313313

314-
[Fact]
314+
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11813")]
315315
public async Task KeyValuePairModelBinder_BindsKeyValuePairOfSimpleType_NoData()
316316
{
317317
// Arrange
@@ -476,7 +476,7 @@ public async Task KeyValuePairModelBinder_BindsKeyValuePairOfComplexType_EmptyPr
476476
Assert.Equal("10", entry.RawValue);
477477
}
478478

479-
[Fact]
479+
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11813")]
480480
public async Task KeyValuePairModelBinder_BindsKeyValuePairOfComplexType_NoData()
481481
{
482482
// Arrange

0 commit comments

Comments
 (0)