Skip to content

Commit 2c8fdd8

Browse files
dougbudougbu
authored
Merge pull request #33018 from dotnet/dougbu/revert.revert.sdk
Bump the SDK back up again - publish in a separate step - Publishing.props executes the `_GetPackageVersionInfo` target in Microsoft.AspNetCore.App.Runtime.csproj - that target currently fails when using a new SDK and desktop `msbuild` - revert "Revert SDK update (#32785)" - take us back to the 6.0.100-preview.5.21264.3 SDK - this reverts commit 57b9c13. - reword a comment - add Components.Migration.E2ETests to solution
2 parents 387e499 + 9dd393b commit 2c8fdd8

File tree

7 files changed

+39
-18
lines changed

7 files changed

+39
-18
lines changed

‎.azure/pipelines/ci.yml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,14 +213,26 @@ stages:
213213
-buildInstallers
214214
-noBuildNative
215215
/p:DotNetSignType=$(_SignType)
216-
/p:AssetManifestFileName=aspnetcore-win-x64-x86.xml
217216
$(_BuildArgs)
218-
$(_PublishArgs)
219217
$(_InternalRuntimeDownloadArgs)
220-
/p:PublishInstallerBaseVersion=true
221218
$(WindowsInstallersLogArgs)
222219
displayName: Build Installers
223220

221+
- script: ./eng/build.cmd
222+
-ci
223+
-noBuildRepoTasks
224+
-noBuildNative
225+
-noBuild
226+
-noRestore
227+
-projects eng/empty.proj
228+
$(_BuildArgs)
229+
$(_InternalRuntimeDownloadArgs)
230+
$(_PublishArgs)
231+
/p:AssetManifestFileName=aspnetcore-win-x64-x86.xml
232+
/p:PublishInstallerBaseVersion=true
233+
/bl:artifacts/log/Release/Build.Publish.binlog
234+
displayName: Publish
235+
224236
# A few files must also go to the VS package feed.
225237
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['PostBuildSign'], 'true')) }}:
226238
- task: NuGetCommand@2

‎AspNetCore.sln‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30204.135
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31324.12
55
MinimumVisualStudioVersion = 15.0.26124.0
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{C28A32F6-8314-412E-9F3B-CBD31C23E878}"
77
EndProject
@@ -1606,7 +1606,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets",
16061606
EndProject
16071607
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTestApp", "src\Components\WebView\Platforms\Wpf\testassets\WpfTestApp\WpfTestApp.csproj", "{036C6BDA-7B69-4E8C-A921-822DA5972A56}"
16081608
EndProject
1609-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebviewAppShared", "src\Components\WebView\Samples\WebviewAppShared\WebviewAppShared.csproj", "{64C3BAC8-C4F8-466A-9E84-0400EE54B25A}"
1609+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebviewAppShared", "src\Components\WebView\Samples\WebviewAppShared\WebviewAppShared.csproj", "{64C3BAC8-C4F8-466A-9E84-0400EE54B25A}"
16101610
EndProject
16111611
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestStartupAssembly1", "src\Hosting\test\testassets\TestStartupAssembly1\TestStartupAssembly1.csproj", "{262FF30C-34B4-462D-B5E2-0DABB9196E40}"
16121612
EndProject
@@ -1642,6 +1642,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Featur
16421642
EndProject
16431643
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Features.Tests", "src\Http\Features\test\Microsoft.Extensions.Features.Tests.csproj", "{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}"
16441644
EndProject
1645+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Migration.E2ETests", "src\Components\test\E2ETestMigration\Microsoft.AspNetCore.Components.Migration.E2ETests.csproj", "{A1D02CE6-1077-410A-81CB-D4BD500FD765}"
1646+
EndProject
16451647
Global
16461648
GlobalSection(SolutionConfigurationPlatforms) = preSolution
16471649
Debug|Any CPU = Debug|Any CPU
@@ -7797,6 +7799,18 @@ Global
77977799
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|x64.Build.0 = Release|Any CPU
77987800
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|x86.ActiveCfg = Release|Any CPU
77997801
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|x86.Build.0 = Release|Any CPU
7802+
{A1D02CE6-1077-410A-81CB-D4BD500FD765}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7803+
{A1D02CE6-1077-410A-81CB-D4BD500FD765}.Debug|Any CPU.Build.0 = Debug|Any CPU
7804+
{A1D02CE6-1077-410A-81CB-D4BD500FD765}.Debug|x64.ActiveCfg = Debug|Any CPU
7805+
{A1D02CE6-1077-410A-81CB-D4BD500FD765}.Debug|x64.Build.0 = Debug|Any CPU
7806+
{A1D02CE6-1077-410A-81CB-D4BD500FD765}.Debug|x86.ActiveCfg = Debug|Any CPU
7807+
{A1D02CE6-1077-410A-81CB-D4BD500FD765}.Debug|x86.Build.0 = Debug|Any CPU
7808+
{A1D02CE6-1077-410A-81CB-D4BD500FD765}.Release|Any CPU.ActiveCfg = Release|Any CPU
7809+
{A1D02CE6-1077-410A-81CB-D4BD500FD765}.Release|Any CPU.Build.0 = Release|Any CPU
7810+
{A1D02CE6-1077-410A-81CB-D4BD500FD765}.Release|x64.ActiveCfg = Release|Any CPU
7811+
{A1D02CE6-1077-410A-81CB-D4BD500FD765}.Release|x64.Build.0 = Release|Any CPU
7812+
{A1D02CE6-1077-410A-81CB-D4BD500FD765}.Release|x86.ActiveCfg = Release|Any CPU
7813+
{A1D02CE6-1077-410A-81CB-D4BD500FD765}.Release|x86.Build.0 = Release|Any CPU
78007814
EndGlobalSection
78017815
GlobalSection(SolutionProperties) = preSolution
78027816
HideSolutionNode = FALSE
@@ -8610,6 +8624,7 @@ Global
86108624
{17F28812-983E-4415-A55D-842DD7EC6887} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
86118625
{A07D3B13-388B-444F-9E37-DDC0787C4690} = {17F28812-983E-4415-A55D-842DD7EC6887}
86128626
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD} = {17F28812-983E-4415-A55D-842DD7EC6887}
8627+
{A1D02CE6-1077-410A-81CB-D4BD500FD765} = {0508E463-0269-40C9-B5C2-3B600FB2A28B}
86138628
EndGlobalSection
86148629
GlobalSection(ExtensibilityGlobals) = postSolution
86158630
SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

‎eng/Build.props‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,9 @@
5252
$(RepoRoot)src\Components\WebView\Samples\BlazorWpfApp\**\*.csproj;
5353
" />
5454

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. -->
55+
<!-- Skipping due to build unreliability with current SDK et cetera. -->
5756
<ProjectToExclude Include="
58-
$(RepoRoot)src\Components\benchmarkapps\Wasm.Performance\TestApp\Wasm.Performance.TestApp.csproj" />
59-
<ProjectToExclude Include="
60-
$(RepoRoot)src/Components/test/E2ETestMigration/Microsoft.AspNetCore.Components.Migration.E2ETests.csproj" />
57+
$(RepoRoot)src/Components/test/E2ETestMigration/Microsoft.AspNetCore.Components.Migration.E2ETests.csproj" />
6158
</ItemGroup>
6259

6360
<Choose>

‎global.json‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 2 deletions
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‎

Lines changed: 0 additions & 2 deletions
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)