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

[automated] Merge branch 'release/8.0-preview5' => 'release/8.0' #3282

Conversation

dotnet-maestro-bot
Copy link

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

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

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

  • davidfowl
  • joperezr
  • invalid-email-address
  • github-actions[bot]

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

# 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-preview5-to-release/8.0
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/aspire HEAD:merge/release/8.0-preview5-to-release/8.0

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

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

github-actions bot and others added 5 commits March 28, 2024 12:47
…resource type is used. (dotnet#3258)

* Automatically AddAzureProviisioning when Azure resource type is used.

* Friendlier errors in dashboard.

* Better error message.

* Revert a change to postgres.

* Add BicepTemplate/BicepTemplateString/AzureConstruct to the test case.

* PR feedback.

* Update terminal state.

---------

Co-authored-by: Mitch Denny <[email protected]>
…e/8.0-preview5

[release/8.0-preview5] Show https endpoints more consistently
* - In order for tools to better describe multiple endpoints int the manifest, we must include port information. At runtime most of the port information is dynamically generated and thus not described (for anything but containers), that doesn't work well when trying to deploy to various environments. We allocate ports in situations where there are none to match the runtime behavior. (dotnet#3274)

- Change also renames ContainerPort to TargetPort everywhere.
- Added `WithExternalHttpEndpoints` to mark all http and https endpoints as external.

* Apply suggestions from code review

Co-authored-by: Eric Erhardt <[email protected]>

---------

Co-authored-by: Eric Erhardt <[email protected]>
@dotnet-issue-labeler dotnet-issue-labeler bot added the area-codeflow for labeling automated codeflow. intentionally a different color! label Mar 29, 2024
@joperezr joperezr merged commit 69684fa into dotnet:release/8.0 Mar 29, 2024
8 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Apr 29, 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