Skip to content

[master] Update dependencies from 2 repositories #11771

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

Merged
merged 45 commits into from
Jul 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
aa71418
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 1, 2019
8d0f3f6
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 1, 2019
051a468
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 1, 2019
6b486fb
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 1, 2019
d616299
Update usage of `@ref`
rynowak Jul 1, 2019
6a8f77b
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 2, 2019
3518933
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 2, 2019
988426d
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 2, 2019
f171b89
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 2, 2019
9eef83f
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 2, 2019
a5cecae
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 2, 2019
22cf9e3
Use suppressField
Jul 2, 2019
ea7dc17
Use suppressField
Jul 2, 2019
a627091
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 2, 2019
d184cf0
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 2, 2019
751bcbe
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 2, 2019
601c165
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 2, 2019
fbc2694
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 2, 2019
7c319cc
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 2, 2019
71bc00a
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 2, 2019
36a39a0
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 2, 2019
1f13a30
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 2, 2019
b781b38
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 2, 2019
97a47a0
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 3, 2019
aaa9a5a
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 3, 2019
b5f2fb2
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 3, 2019
b30c6e9
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 3, 2019
2abc94d
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 3, 2019
7dd72dc
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 3, 2019
e182f59
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 3, 2019
c3bd883
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 3, 2019
53a0c93
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 3, 2019
b426e06
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 3, 2019
31d629b
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 3, 2019
2a717a2
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 3, 2019
1d55fe3
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 3, 2019
67aa049
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 3, 2019
fc5a99a
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 3, 2019
8d527d9
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
Jul 3, 2019
c9ab895
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 3, 2019
2feea5f
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 3, 2019
addc1db
Update dependencies from https://github.com/aspnet/EntityFrameworkCor…
Jul 3, 2019
68bda7c
React to JSInterop changes
pranavkm Jul 3, 2019
40f2d5e
Apply fix for analyzer problem
dougbu Jul 4, 2019
8a2dfb7
Skip tests per #11813
dotnet-maestro[bot] Jul 2, 2019
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
384 changes: 192 additions & 192 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

192 changes: 96 additions & 96 deletions eng/Versions.props

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public void Render_GenericComponent_WithRef()
AdditionalSyntaxTrees.Add(GenericContextComponent);

var component = CompileToComponent(@"
<GenericContext TItem=int Items=""@(new List<int>() { 1, 2, })"" @ref=""_my"" />
<GenericContext TItem=int Items=""@(new List<int>() { 1, 2, })"" @ref=""_my"" @ref:suppressField />

@code {
GenericContext<int> _my;
Expand Down Expand Up @@ -188,7 +188,7 @@ public void Render_GenericComponent_TypeInference_WithRef()
AdditionalSyntaxTrees.Add(GenericContextComponent);

var component = CompileToComponent(@"
<GenericContext Items=""@(new List<int>() { 1, 2, })"" @ref=""_my"" />
<GenericContext Items=""@(new List<int>() { 1, 2, })"" @ref=""_my"" @ref:suppressField />

@code {
GenericContext<int> _my;
Expand Down Expand Up @@ -221,7 +221,7 @@ public void Render_GenericComponent_TypeInference_WithRef_Recursive()

var assembly = CompileToAssembly("Test.cshtml", @"
@typeparam TItem
<GenericContext Items=""@MyItems"" @ref=""_my"" />
<GenericContext Items=""@MyItems"" @ref=""_my"" @ref:suppressField />

@code {
[Parameter] List<TItem> MyItems { get; set; }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@using Microsoft.JSInterop
@inject IJSRuntime JSRuntime

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

@code {
ElementRef myInput;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
@if (_toggleCapturedComponentPresence)
{
<div id="child-component">
<CounterComponent @ref="_myChildCounter" />
<CounterComponent @ref="_myChildCounter" @ref:suppressField />
</div>
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

@if (_toggleCapturedElementPresence)
{
<input id="capturedElement" @ref="_myInput" />
<input id="capturedElement" @ref="_myInput" @ref:suppressField />
}
<button @onclick="MakeInteropCall">Click me</button>
<label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<p>
Value set via JS interop call:
<input id="val-set-by-interop" @ref="@myElem" />
<input id="val-set-by-interop" @ref="@myElem" @ref:suppressField />
</p>

@code {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ public async Task<RegisterConfirmation> SendEmailWithConfirmationAsync(string em
["Input_Email"] = email
});
var redirect = ResponseAssert.IsRedirect(response);
Assert.True(String.Equals(RegisterConfirmation.Path + "?email=" + email, redirect.ToString(), StringComparison.OrdinalIgnoreCase));
Assert.Equal(RegisterConfirmation.Path + "?email=" + email, redirect.ToString(), StringComparer.OrdinalIgnoreCase);

var registerResponse = await Client.GetAsync(redirect);
var register = await ResponseAssert.IsHtmlDocumentAsync(registerResponse);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.JSInterop;

Expand All @@ -13,5 +15,10 @@ public Task<T> InvokeAsync<T>(string identifier, params object[] args)
{
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.");
}

public Task<TValue> InvokeAsync<TValue>(string identifier, IEnumerable<object> args, CancellationToken cancellationToken = default)
{
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.");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1830,7 +1830,7 @@ public async Task MutableObjectModelBinder_BindsKeyValuePairProperty_EmptyPrefix
Assert.Equal("10", entry.RawValue);
}

[Fact]
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11813")]
public async Task MutableObjectModelBinder_BindsKeyValuePairProperty_NoCollectionData()
{
// Arrange
Expand Down Expand Up @@ -1879,7 +1879,7 @@ public async Task MutableObjectModelBinder_BindsKeyValuePairProperty_NoCollectio
Assert.Single(entry.Errors);
}

[Fact]
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11813")]
public async Task MutableObjectModelBinder_BindsKeyValuePairProperty_NoData()
{
// Arrange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ public async Task KeyValuePairModelBinder_BindsKeyValuePairOfSimpleType_EmptyPre
Assert.Equal("10", entry.RawValue);
}

[Fact]
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11813")]
public async Task KeyValuePairModelBinder_BindsKeyValuePairOfSimpleType_NoData()
{
// Arrange
Expand Down Expand Up @@ -476,7 +476,7 @@ public async Task KeyValuePairModelBinder_BindsKeyValuePairOfComplexType_EmptyPr
Assert.Equal("10", entry.RawValue);
}

[Fact]
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11813")]
public async Task KeyValuePairModelBinder_BindsKeyValuePairOfComplexType_NoData()
{
// Arrange
Expand Down