Update branding to 6.0.0 Alpha1 #24983

dougbu · 2020-08-17T23:30:27Z

hold the TFM back at net5.0
update site extensions to split 5.0 and 6.0
remove unnecessary @(SuppressBaselineReference) items
- either 3.1.7 baselines we're using don't include reference or still using package
- fix some comments and Condition attributes to make remainder easy to find
- I'll undo any changes that were over-zealous

eng/Versions.props

...re.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj

dougbu · 2020-08-18T02:26:54Z

/azp run

azure-pipelines · 2020-08-18T02:27:09Z

Azure Pipelines successfully started running 2 pipeline(s).

dougbu · 2020-08-18T05:21:36Z

/fyi This PR needs more work to get the tests passing ☹️

dougbu · 2020-08-19T04:16:18Z

eng/AfterSolutionBuild.targets

@@ -15,7 +15,7 @@
    <RepoTasks.RemoveSharedFrameworkDependencies Condition="@(_BuildOutput->Count()) != 0"
      Files="@(_BuildOutput)"
      FrameworkOnlyPackages="@(AspNetCoreAppReference)"
-      SharedFrameworkTargetFramework="net$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)" />
+      SharedFrameworkTargetFramework="net5.0" />


Use of $(AspNetCoreMajorVersion) or $(AspNetCoreMajorMinorVersion) was only occasionally correct. Since the concepts aren't related, we shouldn't change this back in the future

eng/targets/Helix.props

src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj

dougbu · 2020-08-19T22:27:38Z

Internal build https://dev.azure.com/dnceng/internal/_build/results?buildId=778919 should help confirm changes in site extensions build

dougbu · 2020-08-20T19:22:28Z

🆙📅 though I doubt tests will work without further changes. I'm building locally to see if I can get more information about template failures in previous builds. Suspect we have additional places where TFMs get mixed up with package versions.

Worst case, we might need a runtime update containing dotnet/runtime#40950. I triggered that (daily) subscription just in case.

dougbu · 2020-08-20T23:06:18Z

@pranavkm I seem to remember you looking at test failures like and that you resolved them.

The active test run was aborted. Reason: Test host process crashed : Unhandled exception. System.InvalidOperationException: There is no currently active test.

Any idea why I'm seeing them in the gRPC interop tests e.g. https://helixre107v0xdeko0k025g8.blob.core.windows.net/dotnet-aspnetcore-refs-pull-24983-merge-c76e36077044499e8d/InteropTests--net5.0/console.74b37675.log?sv=2019-02-02&se=2020-09-09T20%3A09%3A24Z&sr=c&sp=rl&sig=89ThpfLWPzA57TSNhBUDUXyo5Zl7VM%2FE5dV4aEzYBKI%3D❔

dougbu · 2020-08-20T23:09:21Z

@HaoK I'm seeing gRPC test failures on other platforms that seem to indicate the newly-built 6.0.0-ci copy of Microsoft.AspNetCore.App.Runtime was installed to the wrong location. What needs to change❔

For example, from https://helixre107v0xdeko0k025g8.blob.core.windows.net/dotnet-aspnetcore-refs-pull-24983-merge-e4e47cb7c8b8484ca9/InteropTests--net5.0/console.ab71631b.log?sv=2019-02-02&se=2020-09-09T20%3A08%3A14Z&sr=c&sp=rl&sig=YqU17c32Tp8rRlY3EZdxU9Vo%2BSHqmJYs5K7gpC6QeuE%3D:

Found AspNetRuntime: Microsoft.AspNetCore.App.Runtime.win-x64.6.0.0-ci.nupkg, extracting *.txt,json,dll to /datadisks/disk1/work/B8880A11/w/B18309D8/e/.dotnet28088/shared/Microsoft.AspNetCore.App/5.0.0-rc.1.20417.14

HaoK · 2020-08-20T23:14:41Z

The versions haven't been updated yet? -sdk 5.0.100-rc.1.20379.10 --runtime 5.0.0-rc.1.20417.14

https://github.com/dotnet/aspnetcore/blob/master/eng/targets/Helix.targets#L120 I think we use MicrosoftNETCoreAppRuntimeVersion

dougbu · 2020-08-20T23:22:12Z

The versions haven't been updated yet? -sdk 5.0.100-rc.1.20379.10 --runtime 5.0.0-rc.1.20417.14

We should be able to rebrand independent of the dotnet/runtime repo. Helix.targets and the scripts used on the Helix agents should not use $(MicrosoftNETCoreAppRuntimeVersion) when installing Microsoft.AspNetCore.App.Runtime. Guess I've got another thing to separate in this PR…

/fyi the same messed up install location for the new Microsoft.AspNetCore.App.Runtime bits is hurting the project template tests too e.g. https://helixre107v0xdeko0k025g8.blob.core.windows.net/dotnet-aspnetcore-refs-pull-24983-merge-56d6b0427e38425e94/ProjectTemplates.Tests--net5.0/console.2800c965.log?sv=2019-02-02&se=2020-09-09T20%3A09%3A23Z&sr=c&sp=rl&sig=fJ7Q1BIJ1qJNSQxW8J2SP801r31rmo3kHfbakOY0szw%3D

On Windows, the project template downstream errors are usually "failed to run EF migrations" due to an inability to load the Microsoft.AspNetCore.Diagnostics.Abstractions.dll assembly that Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.dll needs. The gRPC downstream errors are thrown TimeoutExceptions.

HaoK · 2020-08-20T23:40:05Z

Right both GRPC and templates depend on the aspnet runtime, that currently use that version, i think if you just replace that with whatever the aspnet specific version is, things shoudl work

dougbu · 2020-08-21T00:26:43Z

@HaoK please have a look @ the last commit

eng/targets/Helix.targets

dougbu · 2020-08-21T00:36:19Z

@HaoK please have a look @ the last commit

Now the second-to-last commit

dougbu · 2020-08-21T00:39:33Z

New test internal build is https://dev.azure.com/dnceng/internal/_build/results?buildId=781173 Previous one didn't uncover any issues in the packages but I'd like to double-check

dougbu · 2020-09-28T20:42:22Z

/fyi @mmitche this probably needs another iteration but is much closer than it was.

...nents/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj

- without this, generated assemblies are unusable in aspnetcore after that brands to 6.0.0 - in other words, this is needed for dotnet/aspnetcore#24983 to test correctly

- hold the TFM back at `net5.0` - correct `TargetFrameworkVersion` in FrameworkList.xml; don't use `$(AspNetCoreMajorMinorVersion)` - move `$(DefaultNetCoreTargetFramework)` to eng/Versions.props - avoid repeating value in AfterSolutionBuild.targets and Directory.Build.props files - add new versions to `TemplatePackageInstaller` - update project template test scripts

- basically, remove test assumptions that branding == target TFM - `TestData` will need another update once 6.0.0.0 assembly versions arrive from dotnet/runtime

- allow sharedFx assemblies in Microsoft.AspNetCore.Components.WebAssembly.DevServer package - see #26448 about reducing this baggage later in 6.0

- #26776

dougbu · 2020-10-10T20:28:43Z

/ping reviewers

This PR addresses additional version confusions that have crept into the repo, specifically mixing the default .NET TFM with the shared framework version. Switching to 6.0.0 does not mean we're targeting net6.0 (yet).

This PR also introduces follow-up items #26448 and #26776.

- without this, generated assemblies are unusable in aspnetcore after that brands to 6.0.0 - in other words, this is needed for dotnet/aspnetcore#24983 to test correctly

dougbu · 2020-10-11T00:00:24Z

PR is green.

Only aspnetcore-quarantined-pr tests failed in last validation runs. Failures in https://dev.azure.com/dnceng/public/_build/results?buildId=848137 look very similar to those in https://dev.azure.com/dnceng/public/_build/results?buildId=848129 (the last rolling build of the master branch), including the Helix Linux and Windows timeouts. IOW there's no new failures in this PR compared to the existing master branch.

* Upgrade to a 6.0 SDK - without this, generated assemblies are unusable in aspnetcore after that brands to 6.0.0 - in other words, this is needed for dotnet/aspnetcore#24983 to test correctly * Check for `IOException` instead of missing `NetworkException` - `NetworkException` unavailable in shared framework or a shipping package * Update .NET SDK version used in Helix tests - eliminate need to change the .NET SDK version in two files - `$(DotNetCliVersion)` must be set explicitly - Helix SDK does not pick up .NET SDK version from our global.json - fortunately, `$(NETCoreSdkVersion)` is available in helix.proj

JunTaoLuo · 2020-10-12T18:20:36Z

src/Framework/Directory.Build.props

    <ReferencePackSharedFxVersion Condition="'$(VersionSuffix)' != ''">$(ReferencePackSharedFxVersion)-$(VersionSuffix)</ReferencePackSharedFxVersion>
  </PropertyGroup>

  <ItemGroup>
    <FrameworkListRootAttributes Include="Name" Value="$(AspNetCoreAppFrameworkBrandName)" />
    <FrameworkListRootAttributes Include="TargetFrameworkIdentifier" Value="$(NETCoreAppFrameworkIdentifier)" />
-    <FrameworkListRootAttributes Include="TargetFrameworkVersion" Value="$(AspNetCoreMajorMinorVersion)" />
+    <FrameworkListRootAttributes Include="TargetFrameworkVersion" Value="$(DefaultNetCoreTargetFramework.Substring(3))" />


This doesn't look resilient. Granted we probably won't change the format netX.Y to something else, I guess I'm okay with it.

JunTaoLuo · 2020-10-12T18:25:33Z

...nents/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj

  </PropertyGroup>

  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />


Why did this reference change? I'm not too sure about the changes in this file but as long as @pranavkm signs off it should be fine.

Probably putting an error above that indicating that we expect "netN" so that we catch this location if something changes.

The whole project changed because we have a mess of conflicts because this project attempted to use AspNetCore bits from the SDK as well as reference projects elsewhere in the repo. @pranavkm signed off on doing this in Teams.

#26448 is about trimming the package correctly at some point in the 6.0 train but only if this project doesn't move elsewhere.

* Update branding to 6.0.0 Alpha1 - hold the TFM back at `net5.0` - correct `TargetFrameworkVersion` in FrameworkList.xml; don't use `$(AspNetCoreMajorMinorVersion)` - move `$(DefaultNetCoreTargetFramework)` to eng/Versions.props - avoid repeating value in AfterSolutionBuild.targets and Directory.Build.props files - add new versions to `TemplatePackageInstaller` - update project template test scripts * Update / add 6.0 package versions in test expectations - basically, remove test assumptions that branding == target TFM - `TestData` will need another update once 6.0.0.0 assembly versions arrive from dotnet/runtime * Update `Condition`s on `@(SuppressBaselineReference)` items to 6.0 * Undo some of dotnet/aspnetcore#24816 - allow sharedFx assemblies in Microsoft.AspNetCore.Components.WebAssembly.DevServer package - see dotnet/aspnetcore#26448 about reducing this baggage later in 6.0 * Skip IndividualAuth tests on Helix - dotnet/aspnetcore#26776 Commit migrated from dotnet/aspnetcore@da7fead48635

dougbu requested review from BrennanConroy, jkotalik and a team August 17, 2020 23:30

dougbu requested review from halter73, SteveSandersonMS and a team as code owners August 17, 2020 23:30

dougbu commented Aug 17, 2020

View reviewed changes

Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Aug 18, 2020

dougbu force-pushed the dougbu/update.branding.6.0 branch from e7bd316 to 32776fa Compare August 19, 2020 04:14

dougbu commented Aug 19, 2020

View reviewed changes

dougbu force-pushed the dougbu/update.branding.6.0 branch 2 times, most recently from b789b64 to 09a4145 Compare August 19, 2020 22:25

dougbu force-pushed the dougbu/update.branding.6.0 branch 2 times, most recently from d463b74 to 8e3917f Compare August 20, 2020 19:00

dougbu mentioned this pull request Aug 20, 2020

[master] Update dependencies from dotnet/runtime dotnet/efcore #25090

Merged

dougbu force-pushed the dougbu/update.branding.6.0 branch from 8e3917f to 869eaaa Compare August 21, 2020 00:26

dougbu commented Aug 21, 2020

View reviewed changes

eng/targets/Helix.targets Outdated Show resolved Hide resolved

dougbu mentioned this pull request Aug 29, 2020

Correct the site extensions builds #25406

Merged

dougbu force-pushed the dougbu/update.branding.6.0 branch from ddb8325 to 97c47c3 Compare August 30, 2020 20:28

dougbu requested a review from Tratcher as a code owner August 30, 2020 20:45

dougbu mentioned this pull request Sep 9, 2020

Remove 2.2 package from the site extensions bundle #25742

Merged

dougbu force-pushed the dougbu/update.branding.6.0 branch from d5c5d23 to b58af16 Compare September 9, 2020 19:24

dougbu mentioned this pull request Sep 12, 2020

Reduce references to Microsoft.AspNetCore.App.Runtime.csproj #25836

Merged

dougbu force-pushed the dougbu/update.branding.6.0 branch from b58af16 to 7b42067 Compare September 28, 2020 20:40

dougbu commented Sep 28, 2020

View reviewed changes

...nents/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj Outdated Show resolved Hide resolved

...nents/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj Outdated Show resolved Hide resolved

runfoapp bot mentioned this pull request Sep 29, 2020

Test initial triage jaredpar/runfo#50

Closed

dougbu force-pushed the dougbu/update.branding.6.0 branch from 7b42067 to 6fdf569 Compare September 29, 2020 16:50

dougbu mentioned this pull request Sep 30, 2020

Trim dotnet-watch and Microsoft.AspNetCore.Components.WebAssembly.DevServer package content #26448

Closed

dougbu force-pushed the dougbu/update.branding.6.0 branch from 6fdf569 to da9a43e Compare September 30, 2020 01:20

dougbu added a commit to dotnet/efcore that referenced this pull request Oct 7, 2020

Upgrade to a 6.0 SDK

089b75f

- without this, generated assemblies are unusable in aspnetcore after that brands to 6.0.0 - in other words, this is needed for dotnet/aspnetcore#24983 to test correctly

This was referenced Oct 7, 2020

Upgrade to a 6.0 SDK dotnet/efcore#22918

Merged

[master] Get IndividualAuth template tests working on Helix #26776

Closed

dougbu added 5 commits October 10, 2020 13:14

Update / add 6.0 package versions in test expectations

67c57b5

- basically, remove test assumptions that branding == target TFM - `TestData` will need another update once 6.0.0.0 assembly versions arrive from dotnet/runtime

Update Conditions on @(SuppressBaselineReference) items to 6.0

6cb5dec

Undo some of #24816

22206a4

- allow sharedFx assemblies in Microsoft.AspNetCore.Components.WebAssembly.DevServer package - see #26448 about reducing this baggage later in 6.0

Skip IndividualAuth tests on Helix

d357dfa

- #26776

dougbu force-pushed the dougbu/update.branding.6.0 branch from da9a43e to d357dfa Compare October 10, 2020 20:15

dougbu added a commit to dotnet/efcore that referenced this pull request Oct 10, 2020

Upgrade to a 6.0 SDK

2d98217

- without this, generated assemblies are unusable in aspnetcore after that brands to 6.0.0 - in other words, this is needed for dotnet/aspnetcore#24983 to test correctly

JunTaoLuo approved these changes Oct 12, 2020

View reviewed changes

dougbu merged commit da7fead into master Oct 12, 2020

dougbu deleted the dougbu/update.branding.6.0 branch October 12, 2020 19:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update branding to 6.0.0 Alpha1 #24983

Update branding to 6.0.0 Alpha1 #24983

dougbu commented Aug 17, 2020

dougbu commented Aug 18, 2020

azure-pipelines bot commented Aug 18, 2020

dougbu commented Aug 18, 2020

dougbu Aug 19, 2020

dougbu commented Aug 19, 2020

dougbu commented Aug 20, 2020

dougbu commented Aug 20, 2020

dougbu commented Aug 20, 2020

HaoK commented Aug 20, 2020

dougbu commented Aug 20, 2020

HaoK commented Aug 20, 2020

dougbu commented Aug 21, 2020

dougbu commented Aug 21, 2020

dougbu commented Aug 21, 2020

dougbu commented Sep 28, 2020

dougbu commented Oct 10, 2020

dougbu commented Oct 11, 2020

JunTaoLuo Oct 12, 2020

JunTaoLuo Oct 12, 2020

mmitche Oct 12, 2020

dougbu Oct 12, 2020

Update branding to 6.0.0 Alpha1 #24983

Update branding to 6.0.0 Alpha1 #24983

Conversation

dougbu commented Aug 17, 2020

dougbu commented Aug 18, 2020

azure-pipelines bot commented Aug 18, 2020

dougbu commented Aug 18, 2020

dougbu Aug 19, 2020

Choose a reason for hiding this comment

dougbu commented Aug 19, 2020

dougbu commented Aug 20, 2020

dougbu commented Aug 20, 2020

dougbu commented Aug 20, 2020

HaoK commented Aug 20, 2020

dougbu commented Aug 20, 2020

HaoK commented Aug 20, 2020

dougbu commented Aug 21, 2020

dougbu commented Aug 21, 2020

dougbu commented Aug 21, 2020

dougbu commented Sep 28, 2020

dougbu commented Oct 10, 2020

dougbu commented Oct 11, 2020

JunTaoLuo Oct 12, 2020

Choose a reason for hiding this comment

JunTaoLuo Oct 12, 2020

Choose a reason for hiding this comment

mmitche Oct 12, 2020

Choose a reason for hiding this comment

dougbu Oct 12, 2020

Choose a reason for hiding this comment