Skip to content

Commit 88a959b

Browse files
committed
Revert "Revert SDK update (#32785)"
- take us back to the 6.0.100-preview.5.21264.3 SDK This reverts commit 57b9c13.
1 parent 9e2144d commit 88a959b

File tree

5 files changed

+6
-12
lines changed

5 files changed

+6
-12
lines changed

eng/Build.props

+2-5
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,8 @@
5151
$(RepoRoot)src\Components\WebView\Samples\BlazorWinFormsApp\**\*.csproj;
5252
$(RepoRoot)src\Components\WebView\Samples\BlazorWpfApp\**\*.csproj;
5353
" />
54-
55-
<!-- Projects won't build consistently. An SDK newer than 6.0.100-preview.5.21230.2 should fix the first.
56-
See https://github.com/dotnet/aspnetcore/pull/32428 and https://github.com/dotnet/aspnetcore/issues/32788. -->
57-
<ProjectToExclude Include="
58-
$(RepoRoot)src\Components\benchmarkapps\Wasm.Performance\TestApp\Wasm.Performance.TestApp.csproj" />
54+
55+
<!-- Skipping due to build race conditions for now -->
5956
<ProjectToExclude Include="
6057
$(RepoRoot)src/Components/test/E2ETestMigration/Microsoft.AspNetCore.Components.Migration.E2ETests.csproj" />
6158
</ItemGroup>

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.100-preview.5.21230.2"
3+
"version": "6.0.100-preview.5.21264.3"
44
},
55
"tools": {
6-
"dotnet": "6.0.100-preview.5.21230.2",
6+
"dotnet": "6.0.100-preview.5.21264.3",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.27",

src/Components/Authorization/src/CascadingAuthenticationState.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@implements IDisposable
22
@inject AuthenticationStateProvider AuthenticationStateProvider
33

4-
<CascadingValue TValue="Task<AuthenticationState>" Value="@_currentAuthenticationStateTask" ChildContent="@((RenderFragment)ChildContent!)" />
4+
<CascadingValue TValue="Task<AuthenticationState>" Value="@_currentAuthenticationStateTask" ChildContent="@ChildContent" />
55

66
@code {
77
private Task<AuthenticationState>? _currentAuthenticationStateTask;

src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,10 @@
4747
<ProjectReference Include="..\testassets\TestServer\Components.TestServer.csproj" />
4848
<ProjectReference Include="..\..\WebAssembly\testassets\Wasm.Authentication.Server\Wasm.Authentication.Server.csproj" />
4949

50-
<!-- 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
5150
<ProjectReference Include="..\..\benchmarkapps\Wasm.Performance\TestApp\Wasm.Performance.TestApp.csproj"
5251
Targets="Publish"
5352
Properties="TestTrimmedApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed\Wasm.Performance.TestApp\"
54-
Condition="'$(TestTrimmedApps)' == 'true'" /> -->
53+
Condition="'$(TestTrimmedApps)' == 'true'" />
5554

5655
<ProjectReference
5756
Include="..\testassets\BasicTestApp\BasicTestApp.csproj"

src/Components/test/E2ETest/Tests/PerformanceTest.cs

-2
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,12 @@ protected override void InitializeAsyncCore()
3333
public override Task InitializeAsync() => base.InitializeAsync(Guid.NewGuid().ToString());
3434

3535
[Fact]
36-
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/32788")]
3736
public void HasTitle()
3837
{
3938
Assert.Equal("E2EPerformance", Browser.Title);
4039
}
4140

4241
[Fact]
43-
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/32788")]
4442
public void BenchmarksRunWithoutError()
4543
{
4644
// In CI, we only verify that the benchmarks run without throwing any

0 commit comments

Comments
 (0)