Skip to content
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.

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

Rebrand and update for 5.0.1 #27406

Merged
merged 8 commits into from
Nov 10, 2020
Merged

Rebrand and update for 5.0.1 #27406

merged 8 commits into from
Nov 10, 2020

Conversation

dougbu
Copy link
Member

@dougbu dougbu commented Oct 31, 2020

  • [master] Update dependencies from dotnet/runtime dotnet/efcore ([master] Update dependencies from dotnet/runtime dotnet/efcore #26788)

  • when project template tests run test assets, need latest shared Fx bits

  • hit BadImageFormatExceptions otherwise

    • test projects build against uploaded packages
    • those packages reference the 5.0.1 shared framework
    • the ASP.NET parts of the 5.0.1 shared Fx are crossgened to target Windows
  • Use runtime and ref/ assemblies matching repo in Helix testing

    • add Directory.Build.*.in files based on project template test infrastructure
    • use files as import boundary where the project doesn't create its own Directory.Build.* files
    • ensure dotnet-watch tests also use the latest runtime and ref/ assemblies
  • Extend Helix Directory.Build.* workarounds

    • generate Directory.Build.* files when restoring any projects
    • include generated files in Helix runs needing the latest runtime
    • copy generated files when testing dotnet-watch locally
    • include generated content in Microsoft.NET.Sdk.BlazorWebAssembly.IntegrationTests test assets
      • remove duplicate settings from existing Directory.Build.* files
    • ensure shared framework and targeting packs are laid out under .dotnet/ before test assets restore
  • Disable crossgen when building for Helix runs

    • make $(CrossgenOutput) property override-able
    • use override in CI jobs that submit to other platforms
      • for now, leave the ARM64 Helix jobs alone (build on Ubuntu, run in Debian)

@dougbu dougbu added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Oct 31, 2020
@dougbu dougbu requested a review from a team October 31, 2020 05:55
@dougbu
Copy link
Member Author

dougbu commented Oct 31, 2020

We'll need this general improvement in the veracity of template tests when rebranding for 5.0.1. If others prefer, could take more of this from master e.g. turn off $(CrossgenOutput) in other pipelines or use the Directory.Build.*.in files in the Blazor SDK and dotnet-watch tests.

@dougbu dougbu added the tell-mode Indicates a PR which is being merged during tell-mode label Oct 31, 2020
@dougbu
Copy link
Member Author

dougbu commented Nov 2, 2020

This is blocked for now. Right @wtgodbe

@wtgodbe
Copy link
Member

wtgodbe commented Nov 2, 2020

That's correct, 5.0.1 servicing will open up later this month

@dougbu dougbu added * NO MERGE * Do not merge this PR as long as this label is present. blocked The work on this issue is blocked due to some dependency labels Nov 2, 2020
@dougbu dougbu added this to the 5.0.1 milestone Nov 5, 2020
dougbu and others added 6 commits November 9, 2020 16:14
- required for some tests to pass
… master

- [master] Update dependencies from dotnet/runtime dotnet/efcore (#26788)
    - 219ecd6
- when project template tests run test assets, need latest shared Fx bits
- hit `BadImageFormatException`s otherwise
    - test projects build against uploaded packages
    - those packages reference the 5.0.1 shared framework
    - the ASP.NET parts of the 5.0.1 shared Fx are `crossgen`ed to target Windows

- Use runtime and ref/ assemblies matching repo in Helix testing
    - add Directory.Build.*.in files based on project template test infrastructure
    - use files as import boundary where the project doesn't create its own Directory.Build.* files
    - ensure `dotnet-watch` tests also use the latest runtime and ref/ assemblies

- Extend Helix Directory.Build.* workarounds
    - generate Directory.Build.* files when restoring any projects
    - include generated files in Helix runs needing the latest runtime
    - copy generated files when testing `dotnet-watch` locally
    - include generated content in Microsoft.NET.Sdk.BlazorWebAssembly.IntegrationTests test assets
        - remove duplicate settings from existing Directory.Build.* files
    - ensure shared framework and targeting packs are laid out under .dotnet/ before test assets restore

- Disable `crossgen` when building for Helix runs
    - make `$(CrossgenOutput)` property override-able
    - use override in CI jobs that submit to other platforms
        - for now, leave the ARM64 Helix jobs alone (build on Ubuntu, run in Debian)
- affected projects are all test assets or provide test support
- without this, a number of the projects are incorrectly marked as shipping
- this is a complete rewrite of eng/Baseline.xml
  - based on the 5.0.0 MergedManifest.xml file
@dougbu dougbu force-pushed the dougbu/helix.template.tests branch from 9c94fd8 to ce07c34 Compare November 10, 2020 01:09
@dougbu dougbu changed the title Cherry-pick $(CrossgenOutput) and Directory.Build.*.in changes from master Rebrand and update for 5.0.1 Nov 10, 2020
@dougbu
Copy link
Member Author

dougbu commented Nov 10, 2020

This branch now includes everything that should be needed to get 5.0.1 builds going. I suspect it won't validate until the 5.0.100 SDK is usable in dotnet-install.* scripts. @dotnet/aspnet-build please review again since @wtgodbe only looked at one of the 6 commits here.

@dougbu dougbu requested review from wtgodbe and a team November 10, 2020 01:25
@dougbu dougbu added the feature-platform Deprecated: Cross-cutting issues related to ASP.NET Core as a platform label Nov 10, 2020
- need consistent versions when servicing targeting packs
@dougbu dougbu merged commit 352ad1a into release/5.0 Nov 10, 2020
@dougbu dougbu deleted the dougbu/helix.template.tests branch November 10, 2020 17:51
@dougbu dougbu removed the blocked The work on this issue is blocked due to some dependency label Oct 5, 2021
dougbu added a commit to dougbu/razor-compiler that referenced this pull request Nov 17, 2021
* Move to 5.0.1 versions

* Move to GA .NET SDK
- required for some tests to pass

* Remove feeds that won't be needed after 5.0.0 is GA

* Cherry-pick `$(CrossgenOutput)` and Directory.Build.*.in changes from master
- [master] Update dependencies from dotnet/runtime dotnet/efcore (dotnet/aspnetcore#26788)
    - 219ecd688012
- when project template tests run test assets, need latest shared Fx bits
- hit `BadImageFormatException`s otherwise
    - test projects build against uploaded packages
    - those packages reference the 5.0.1 shared framework
    - the ASP.NET parts of the 5.0.1 shared Fx are `crossgen`ed to target Windows

- Use runtime and ref/ assemblies matching repo in Helix testing
    - add Directory.Build.*.in files based on project template test infrastructure
    - use files as import boundary where the project doesn't create its own Directory.Build.* files
    - ensure `dotnet-watch` tests also use the latest runtime and ref/ assemblies

- Extend Helix Directory.Build.* workarounds
    - generate Directory.Build.* files when restoring any projects
    - include generated files in Helix runs needing the latest runtime
    - copy generated files when testing `dotnet-watch` locally
    - include generated content in Microsoft.NET.Sdk.BlazorWebAssembly.IntegrationTests test assets
        - remove duplicate settings from existing Directory.Build.* files
    - ensure shared framework and targeting packs are laid out under .dotnet/ before test assets restore

- Disable `crossgen` when building for Helix runs
    - make `$(CrossgenOutput)` property override-able
    - use override in CI jobs that submit to other platforms
        - for now, leave the ARM64 Helix jobs alone (build on Ubuntu, run in Debian)

* Correct an `$(IsTestAssetProject)` setting
- affected projects are all test assets or provide test support
- without this, a number of the projects are incorrectly marked as shipping

* Baseline released 5.0.0 packages
- this is a complete rewrite of eng/Baseline.xml
  - based on the 5.0.0 MergedManifest.xml file

* Add 5.0.0 PackageOverrides.txt and PlatformManifest.txt files
- need consistent versions when servicing targeting packs

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>

Commit migrated from dotnet/aspnetcore@352ad1a9804a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework feature-platform Deprecated: Cross-cutting issues related to ASP.NET Core as a platform * NO MERGE * Do not merge this PR as long as this label is present. tell-mode Indicates a PR which is being merged during tell-mode
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants