From ac2c0555c4117e9eb9da2f17aabe9e41930c6a8f Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Mon, 17 May 2021 13:00:45 -0700
Subject: [PATCH 1/4] Revert SDK update

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 5a2b8a613d2e..25277842f16f 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "6.0.100-preview.5.21264.3"
+    "version": "6.0.100-preview.5.21230.2"
   },
   "tools": {
-    "dotnet": "6.0.100-preview.5.21264.3",
+    "dotnet": "6.0.100-preview.5.21230.2",
     "runtimes": {
       "dotnet/x64": [
         "2.1.27",

From 00ef33d9f9787b3634307581ecbffefd570ad883 Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Mon, 17 May 2021 13:27:02 -0700
Subject: [PATCH 2/4] Disable build of failing proj

---
 eng/Build.props                                            | 7 +++++--
 .../Microsoft.AspNetCore.Components.E2ETests.csproj        | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/eng/Build.props b/eng/Build.props
index 474b789deb76..787137eee642 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -51,8 +51,11 @@
                       $(RepoRoot)src\Components\WebView\Samples\BlazorWinFormsApp\**\*.csproj;
                       $(RepoRoot)src\Components\WebView\Samples\BlazorWpfApp\**\*.csproj;
                       " />
-    
-    <!-- Skipping due to build race conditions for now -->
+
+    <!-- Projects won't build consistently. An SDK newer than 6.0.100-preview.5.21230.2 should fix the first.
+         See https://github.com/dotnet/aspnetcore/pull/32428 and https://github.com/dotnet/aspnetcore/issues/32788. -->
+    <ProjectToExclude Include="
+                      $(RepoRoot)src\Components\benchmarkapps\Wasm.Performance\TestApp\Wasm.Performance.TestApp.csproj" />
     <ProjectToExclude Include="
                       $(RepoRoot)src/Components/test/E2ETestMigration/Microsoft.AspNetCore.Components.Migration.E2ETests.csproj" />    
   </ItemGroup>
diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
index 52d5166441b5..4a4816673891 100644
--- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
+++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
@@ -47,10 +47,11 @@
     <ProjectReference Include="..\testassets\TestServer\Components.TestServer.csproj" />
     <ProjectReference Include="..\..\WebAssembly\testassets\Wasm.Authentication.Server\Wasm.Authentication.Server.csproj" />
 
+    <!-- TODO - turn this back on once the SDK is higher than 6.0.100-preview.5.21230.2: https://github.com/dotnet/aspnetcore/issues/32788
     <ProjectReference Include="..\..\benchmarkapps\Wasm.Performance\TestApp\Wasm.Performance.TestApp.csproj"
       Targets="Publish"
       Properties="TestTrimmedApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed\Wasm.Performance.TestApp\"
-      Condition="'$(TestTrimmedApps)' == 'true'" />
+      Condition="'$(TestTrimmedApps)' == 'true'" /> -->
 
     <ProjectReference
       Include="..\testassets\BasicTestApp\BasicTestApp.csproj"

From 241d17f2f017e9f90ea4148d4ac27004effa108d Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Mon, 17 May 2021 14:39:16 -0700
Subject: [PATCH 3/4] Quarantine 2 tests

---
 src/Components/test/E2ETest/Tests/PerformanceTest.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Components/test/E2ETest/Tests/PerformanceTest.cs b/src/Components/test/E2ETest/Tests/PerformanceTest.cs
index 82495418a01e..2d3ba7b8a407 100644
--- a/src/Components/test/E2ETest/Tests/PerformanceTest.cs
+++ b/src/Components/test/E2ETest/Tests/PerformanceTest.cs
@@ -33,12 +33,14 @@ protected override void InitializeAsyncCore()
         public override Task InitializeAsync() => base.InitializeAsync(Guid.NewGuid().ToString());
 
         [Fact]
+        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/32788")]
         public void HasTitle()
         {
             Assert.Equal("E2EPerformance", Browser.Title);
         }
 
         [Fact]
+        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/32788")]
         public void BenchmarksRunWithoutError()
         {
             // In CI, we only verify that the benchmarks run without throwing any

From bee1bfc3538690ed835c37570eaa129de0373b33 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 19 May 2021 14:02:47 -0700
Subject: [PATCH 4/4] Fixup

---
 .../Authorization/src/CascadingAuthenticationState.razor        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Authorization/src/CascadingAuthenticationState.razor b/src/Components/Authorization/src/CascadingAuthenticationState.razor
index 6eff3b3e1e27..2b1dd5f36102 100644
--- a/src/Components/Authorization/src/CascadingAuthenticationState.razor
+++ b/src/Components/Authorization/src/CascadingAuthenticationState.razor
@@ -1,7 +1,7 @@
 @implements IDisposable
 @inject AuthenticationStateProvider AuthenticationStateProvider
 
-<CascadingValue TValue="Task<AuthenticationState>" Value="@_currentAuthenticationStateTask" ChildContent="@ChildContent" />
+<CascadingValue TValue="Task<AuthenticationState>" Value="@_currentAuthenticationStateTask" ChildContent="@((RenderFragment)ChildContent!)" />
 
 @code {
     private Task<AuthenticationState>? _currentAuthenticationStateTask;