Skip to content

Commit 1b50085

Browse files
authored
Chain coherent dependencies up through Extensions to EF Core packages (#8877)
* Chain coherent dependencies up through Extensions to EF Core packages - should reduce incoherent PRs we get from `darc` - react to AspNetCore-Tooling breaking changes - use C# Preview version in Blazor integration tests - update `EnsureOptions_ConfiguresDefaultParseOptions` test to match new C# version default - react to new newline encoding behavior; thanx @ajaybhargavb! - update product code and tests to use new GetItem API; thanx @NTaylorMullen! - RazorProjectFileSystem breaking change - update ref assemblies - react to EF Core breaking changes - react to EF Core method rename - react to dotnet/efcore@ccfc5edbc7c8 - react to dotnet/efcore@6cb41531df6d breaking change - disable new analyzer in `ScratchDatabaseFixture` - skip `MvcTemplate_NoAuthImplAsync(...)` test for F# - #8996 - exclude some runtime assemblies from crossgen; thanx @BrennanConroy! - add direct references to Mvc in AzureAD samples - unclear why the reference is no longer pulled in transitively * Run `darc` to grab the latest - CoreFx packages with version 4.6.0-preview4.19204.1 to ensure coherency - core-setup packages with version 3.0.0-preview4-27604-05 to ensure coherency - Extensions packages with verisn 3.0.0-preview4.19204.2 to ensure coherency - EntityFrameworkCore packages with version 3.0.0-preview4.19204.7 from build 20190404.7 - AspNetCore-Tooling packages with version 3.0.0-preview4.19204.2 from build 20190404.2
1 parent eaf63a6 commit 1b50085

28 files changed

+384
-331
lines changed

eng/Version.Details.xml

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

eng/Versions.props

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

src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<ItemGroup>
99
<Reference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" />
1010
<Reference Include="Microsoft.AspNetCore.HttpsPolicy" />
11+
<Reference Include="Microsoft.AspNetCore.Mvc" />
1112
<Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
1213
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
1314
<Reference Include="Microsoft.AspNetCore.StaticFiles" />

src/Azure/AzureAD/samples/AzureADSample/AzureADSample.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<ItemGroup>
1313
<Reference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" />
1414
<Reference Include="Microsoft.AspNetCore.HttpsPolicy" />
15+
<Reference Include="Microsoft.AspNetCore.Mvc" />
1516
<Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
1617
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
1718
<Reference Include="Microsoft.AspNetCore.StaticFiles" />

src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,10 +490,10 @@ public void Render_BindToElementFallback_SpecifiesValueAndChangeEvent_BodyConten
490490
frame => AssertFrame.Element(frame, "div", 7, 0),
491491
frame => AssertFrame.Attribute(frame, "value", "42", 1),
492492
frame => AssertFrame.Attribute(frame, "onchange", typeof(EventCallback), 2),
493-
frame => AssertFrame.Whitespace(frame, 3),
493+
frame => AssertFrame.MarkupWhitespace(frame, 3),
494494
frame => AssertFrame.Element(frame, "span", 2, 4),
495495
frame => AssertFrame.Text(frame, "42", 5),
496-
frame => AssertFrame.Whitespace(frame, 6));
496+
frame => AssertFrame.MarkupWhitespace(frame, 6));
497497
}
498498

499499
[Fact]

src/Components/Blazor/Build/test/ChildContentRazorIntegrationTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ public void Render_BodyChildContent_Generic()
132132
frame => AssertFrame.Component(frame, "Test.RenderChildContentString", 3, 0),
133133
frame => AssertFrame.Attribute(frame, "Value", "HI", 1),
134134
frame => AssertFrame.Attribute(frame, RenderTreeBuilder.ChildContent, 2),
135-
frame => AssertFrame.Whitespace(frame, 3),
135+
frame => AssertFrame.MarkupWhitespace(frame, 3),
136136
frame => AssertFrame.Element(frame, "div", 2, 4),
137137
frame => AssertFrame.Text(frame, "hi", 5),
138-
frame => AssertFrame.Whitespace(frame, 6));
138+
frame => AssertFrame.MarkupWhitespace(frame, 6));
139139
}
140140

141141
[Fact]
@@ -184,10 +184,10 @@ public void Render_BodyChildContent_Recursive()
184184
frames,
185185
frame => AssertFrame.Component(frame, "Test.RenderChildContent", 2, 0),
186186
frame => AssertFrame.Attribute(frame, RenderTreeBuilder.ChildContent, 1),
187-
frame => AssertFrame.Whitespace(frame, 2),
187+
frame => AssertFrame.MarkupWhitespace(frame, 2),
188188
frame => AssertFrame.Component(frame, "Test.RenderChildContent", 2, 3),
189189
frame => AssertFrame.Attribute(frame, RenderTreeBuilder.ChildContent, 4),
190-
frame => AssertFrame.Whitespace(frame, 6),
190+
frame => AssertFrame.MarkupWhitespace(frame, 6),
191191
frame => AssertFrame.Markup(frame, "\n <div></div>\n ", 5));
192192
}
193193

src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -535,24 +535,24 @@ public class MyComponent : ComponentBase
535535
Assert.Collection(
536536
frames,
537537
frame => AssertFrame.Element(frame, "html", 9, 0),
538-
frame => AssertFrame.Whitespace(frame, 1),
538+
frame => AssertFrame.MarkupWhitespace(frame, 1),
539539
frame => AssertFrame.Markup(frame, "<head><meta><meta></head>\n ", 2),
540540
frame => AssertFrame.Element(frame, "body", 5, 3),
541-
frame => AssertFrame.Whitespace(frame, 4),
541+
frame => AssertFrame.MarkupWhitespace(frame, 4),
542542
frame => AssertFrame.Component(frame, "Test.MyComponent", 2, 5),
543543
frame => AssertFrame.Attribute(frame, RenderTreeBuilder.ChildContent, 6),
544-
frame => AssertFrame.Whitespace(frame, 16),
545-
frame => AssertFrame.Whitespace(frame, 17));
544+
frame => AssertFrame.MarkupWhitespace(frame, 16),
545+
frame => AssertFrame.MarkupWhitespace(frame, 17));
546546

547547
// Assert: Captured ChildContent frames are correct
548548
var childFrames = GetFrames((RenderFragment)frames[6].AttributeValue);
549549
Assert.Collection(
550550
childFrames,
551-
frame => AssertFrame.Whitespace(frame, 7),
551+
frame => AssertFrame.MarkupWhitespace(frame, 7),
552552
frame => AssertFrame.Markup(frame, "<div><span></span><span></span></div>\n ", 8),
553553
frame => AssertFrame.Element(frame, "div", 2, 9),
554554
frame => AssertFrame.Text(frame, "hi", 10),
555-
frame => AssertFrame.Whitespace(frame, 11),
555+
frame => AssertFrame.MarkupWhitespace(frame, 11),
556556
frame => AssertFrame.Markup(frame, "<div><span></span><span></span></div>\n <div></div>\n ", 12),
557557
frame => AssertFrame.Element(frame, "div", 2, 13),
558558
frame => AssertFrame.Text(frame, "hi", 14),

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,14 @@ public void Render_GenericComponent_WithChildContent()
171171
frame => AssertFrame.Component(frame, genericComponentType.FullName, 3, 0),
172172
frame => AssertFrame.Attribute(frame, "Items", typeof(List<int>), 1),
173173
frame => AssertFrame.Attribute(frame, RenderTreeBuilder.ChildContent, 2),
174-
frame => AssertFrame.Whitespace(frame, 3),
174+
frame => AssertFrame.MarkupWhitespace(frame, 3),
175175
frame => AssertFrame.Element(frame, "div", 2, 4),
176176
frame => AssertFrame.Text(frame, "0", 5),
177-
frame => AssertFrame.Whitespace(frame, 6),
178-
frame => AssertFrame.Whitespace(frame, 3),
177+
frame => AssertFrame.MarkupWhitespace(frame, 6),
178+
frame => AssertFrame.MarkupWhitespace(frame, 3),
179179
frame => AssertFrame.Element(frame, "div", 2, 4),
180180
frame => AssertFrame.Text(frame, "2", 5),
181-
frame => AssertFrame.Whitespace(frame, 6));
181+
frame => AssertFrame.MarkupWhitespace(frame, 6));
182182
}
183183

184184
[Fact]

src/Components/Blazor/Build/test/Razor/VirtualProjectFileSystem.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
@@ -19,8 +19,17 @@ public override IEnumerable<RazorProjectItem> EnumerateItems(string basePath)
1919
return directory?.EnumerateItems() ?? Enumerable.Empty<RazorProjectItem>();
2020
}
2121

22+
[Obsolete("Use GetItem(string path, string fileKind)] instead")]
2223
public override RazorProjectItem GetItem(string path)
2324
{
25+
return GetItem(path, fileKind: null);
26+
}
27+
28+
public override RazorProjectItem GetItem(string path, string fileKind)
29+
{
30+
// We ignore fileKind here because the _root is pre-filled with project items that already have fileKinds defined. This is
31+
// a unique circumstance where the RazorProjectFileSystem is actually pre-filled with all of its project items on construction.
32+
2433
path = NormalizeAndEnsureValidPath(path);
2534
return _root.GetItem(path) ?? new NotFoundProjectItem(string.Empty, path);
2635
}
@@ -212,4 +221,4 @@ public FileNode(string path, RazorProjectItem projectItem)
212221
public RazorProjectItem ProjectItem { get; }
213222
}
214223
}
215-
}
224+
}

src/Components/Blazor/Build/test/RazorIntegrationTestBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static RazorIntegrationTestBase()
6060
referenceAssemblies,
6161
new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
6262

63-
CSharpParseOptions = new CSharpParseOptions(LanguageVersion.CSharp7_3);
63+
CSharpParseOptions = new CSharpParseOptions(LanguageVersion.Preview);
6464
}
6565

6666
public RazorIntegrationTestBase(ITestOutputHelper output)

0 commit comments

Comments
 (0)