Skip to content

Revert SDK update #32785

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.

Sign up for GitHub

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 4 commits into from
May 19, 2021
Merged

Revert SDK update #32785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac2c055
Revert SDK update
wtgodbe May 17, 2021
00ef33d
Disable build of failing proj
wtgodbe May 17, 2021
241d17f
Quarantine 2 tests
wtgodbe May 17, 2021
bee1bfc
Fixup
pranavkm May 19, 2021
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
7 changes: 5 additions & 2 deletions eng/Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Authorization/src/CascadingAuthenticationState.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions src/Components/test/E2ETest/Tests/PerformanceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down