Revert "Revert SDK update (#32785)"

- take us back to the 6.0.100-preview.5.21264.3 SDK This reverts commit 57b9c13.
dotnet · May 25, 2021 · 88a959b · 88a959b
1 parent 9e2144d
commit 88a959b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/eng/Build.props b/eng/Build.props
@@ -51,11 +51,8 @@
                       $(RepoRoot)src\Components\WebView\Samples\BlazorWinFormsApp\**\*.csproj;
                       $(RepoRoot)src\Components\WebView\Samples\BlazorWpfApp\**\*.csproj;
                       " />
-
-    <!-- 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" />
+
+    <!-- Skipping due to build race conditions for now -->
     <ProjectToExclude Include="
                       $(RepoRoot)src/Components/test/E2ETestMigration/Microsoft.AspNetCore.Components.Migration.E2ETests.csproj" />    
   </ItemGroup>

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

diff --git 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="@((RenderFragment)ChildContent!)" />
+<CascadingValue TValue="Task<AuthenticationState>" Value="@_currentAuthenticationStateTask" ChildContent="@ChildContent" />
 
 @code {
     private Task<AuthenticationState>? _currentAuthenticationStateTask;

diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
@@ -47,11 +47,10 @@
     <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"

diff --git a/src/Components/test/E2ETest/Tests/PerformanceTest.cs b/src/Components/test/E2ETest/Tests/PerformanceTest.cs
@@ -33,14 +33,12 @@ 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