Skip to content

[automated] Merge branch 'release/8.0-preview4' => 'main'#2853

Merged
joperezr merged 8 commits intomicrosoft:mainfrom
dotnet-maestro-bot:merge/release/8.0-preview4-to-main
Mar 13, 2024
Merged

[automated] Merge branch 'release/8.0-preview4' => 'main'#2853
joperezr merged 8 commits intomicrosoft:mainfrom
dotnet-maestro-bot:merge/release/8.0-preview4-to-main

Conversation

@dotnet-maestro-bot
Copy link
Copy Markdown

@dotnet-maestro-bot dotnet-maestro-bot commented Mar 13, 2024

I detected changes in the release/8.0-preview4 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-preview4 by the following committers:

  • davidfowl
  • github-actions[bot]
  • adamint
  • joperezr

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-preview4
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/8.0-preview4

# 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/aspire HEAD:merge/release/8.0-preview4-to-main
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/aspire HEAD:merge/release/8.0-preview4-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-preview4-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-preview4-to-main main
git pull https://github.com/dotnet-maestro-bot/aspire merge/release/8.0-preview4-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/aspire HEAD:merge/release/8.0-preview4-to-main
or if you are using SSH
git checkout -b merge/release/8.0-preview4-to-main main
git pull git@github.com:dotnet-maestro-bot/aspire merge/release/8.0-preview4-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/aspire HEAD:merge/release/8.0-preview4-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.

Microsoft Reviewers: Open in CodeFlow

joperezr and others added 7 commits February 27, 2024 19:40
Co-authored-by: Brennan <brecon@microsoft.com>
* Fix shortcuts changing multiple browser windows (microsoft#2470)

* Fix shortcuts changing multiple browser windows

* Clean up

(cherry picked from commit fcadd63)

* Fix keyboard shortcuts, url casing and JSDisconnectedException (microsoft#2466)

* Fix keyboard shortcuts and url casing

* Suppress JSDisconnectedException

* Check MetaKey and refactor modifier key checks

---------

Co-authored-by: Adam Ratzman <adam@adamratzman.com>
(cherry picked from commit 197c21e)

* Untrack DialogReference when dialog is closed (microsoft#2465)

* Untrack DialogReference when dialog is closed

* Fix keyboard shortcuts and url casing

* Suppress JSDisconnectedException

* Check MetaKey and refactor modifier key checks

* removed redundant extra OnDialogCloseRequested call

---------

Co-authored-by: Adam Ratzman <adam@adamratzman.com>
Co-authored-by: Ratzman, Adam Mortimer <aratzman@iu.edu>
(cherry picked from commit 0a7b6c7)

* Use OnDialogClosing instead of OnDialogResult to remove dialog reference in MainLayout (microsoft#2476)

* Use OnDialogClosing instead of OnDialogResult

* Remove redundant event listener

---------

Co-authored-by: Adam Ratzman <adamratzman@microsoft.com>
(cherry picked from commit 1434b99)

---------

Co-authored-by: James Newton-King <james@newtonking.com>
Co-authored-by: Tim Mulholland <tlmii@users.noreply.github.com>
* Use https

* Remove default properties

* update otel package version

---------

Co-authored-by: Varorbc <varorbc@gmail.com>
Co-authored-by: Ratzman, Adam Mortimer <aratzman@iu.edu>
* Isolate the use of docker.host.internal
- For podman support we need to use another host name (host.containers.internal). That's configurable using a setting AppHost:ContainerHostName. Remove the hardcoded use of docker.host.internal and instead read from configuration everywhere.

* Fixed nit
@ghost ghost added the area-codeflow for labeling automated codeflow. intentionally a different color! label Mar 13, 2024
@joperezr joperezr self-assigned this Mar 13, 2024
@joperezr joperezr enabled auto-merge March 13, 2024 18:48
@joperezr joperezr merged commit 858d875 into microsoft:main Mar 13, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Apr 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-codeflow for labeling automated codeflow. intentionally a different color!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants