Skip to content

Conversation

@dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/8.0 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/8.0 by the following committers:

  • dotnet-maestro[bot]
  • Tratcher
  • SteveSandersonMS
  • javiercn
  • mthalman

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/8.0
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/8.0

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/8.0-to-main
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/8.0-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/8.0-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/8.0-to-main main
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/8.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/8.0-to-main
or if you are using SSH
git checkout -b merge/release/8.0-to-main main
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/8.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/8.0-to-main

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

mthalman and others added 9 commits September 19, 2023 18:12
…ed navigating away (dotnet#50814)

* Reproduce dotnet#50733 as a failing E2E test

* Don't process original request blazor-ssr content if the user has already navigated away

* Quarantine (actually comment out) one of the CanRenderComponentWithPersistedState cases

See dotnet#50810

* Update EventTest.cs

* Disable another flaky test
# Fix streaming into nonstreaming outlet

Makes an edge case with streaming SSR and SectionOutlet work correctly

## Description

A bug was discovered when combining streaming SSR and `<SectionOutlet>` in a particular way (i.e., streaming *directly* into the `<SectionContent>`, not via any child component, when connected to a `<SectionOutlet>` that itself is nonstreaming). In this case the streamed content would not appear in the UI.

This PR makes this situation behave the same as other uses of streaming/sections, including the existing case of streaming via a child component to a nonstreaming outlet which is what our E2E tests already covered and already worked correctly.

Fixes dotnet#50804

## Customer Impact

Without this fix, developers wanting to use sections with streaming SSR would find in some cases that it doesn't work. A workaround exists (move the streaming content to a child component) but with this fix, it simply works as intended in the first place.

## Regression?

- [ ] Yes
- [x] No

[If yes, specify the version the behavior has regressed from]

## Risk

- [ ] High
- [ ] Medium
- [x] Low

It's only a change to how we decide which streamed components to emit content for, so it can only affect this one functional area. The code change is just to account for a case we hadn't considered before.

## Verification

- [x] Manual (required)
- [x] Automated

## Packaging changes reviewed?

- [ ] Yes
- [ ] No
- [x] N/A
…Applications (dotnet#50550)

## Description

Adds support for Error pages to Blazor Web application.
* Includes a small change to the ExceptionHandler middleware to support Blazor Web scenarios.
* Includes a change in Blazor Web to account for error handling scenarios and disable streaming rendering and interactivity.
* Includes changes to the Blazor Web template to add an Error page similar to the one in MVC and Razor pages templates.

Fixes dotnet#49853, dotnet#49854

## Customer Impact

* Customers won't be able to see errors in Blazor Web Applications without having to rely on MVC or Razor Pages for it,
  which adds significant complexity to their setup.

## Regression?

- [ ] Yes
- [X] No

## Risk

- [ ] High
- [X] Medium
- [ ] Low

* If customers hit any issues, we will be able to tell them to simply remove the ErrorPage.razor page from their projects. Luckily, we will have a little bit of time to address any critical feedback in case such comes up. As of right now, this change has been validated and it works.

## Verification

- [X] Manual (required)
- [X] Automated

## Packaging changes reviewed?

- [ ] Yes
- [ ] No
- [X] N/A
…nals build 20230925.1 (dotnet#50914)

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.23471.2 -> To Version 8.0.0-alpha.1.23475.1
…30922.9 (dotnet#50911)

[release/8.0] Update dependencies from dotnet/winforms


 - Merge branch 'release/8.0' into darc-release/8.0-7bdcc7fb-fa67-4c03-a0f0-21cc4a1f3b6a
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Sep 26, 2023
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approving branch merge.

@ghost
Copy link

ghost commented Sep 26, 2023

Hey @dotnet/aspnet-build, looks like this PR is something you want to take a look at.

@wtgodbe wtgodbe enabled auto-merge (squash) September 27, 2023 14:54
@wtgodbe wtgodbe disabled auto-merge September 27, 2023 14:54
@wtgodbe wtgodbe enabled auto-merge September 27, 2023 14:54
@wtgodbe wtgodbe merged commit 86770ce into dotnet:main Sep 27, 2023
@ghost ghost added this to the 9.0-preview1 milestone Sep 27, 2023
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 Type: Merge Forward ⏩

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants