-
Notifications
You must be signed in to change notification settings - Fork 4.6k
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/7.0' => 'release/7.0-staging' #99586
Merged
ericstj
merged 15 commits into
dotnet:release/7.0-staging
from
dotnet-maestro-bot:merge/release/7.0-to-release/7.0-staging
Apr 12, 2024
Merged
[automated] Merge branch 'release/7.0' => 'release/7.0-staging' #99586
ericstj
merged 15 commits into
dotnet:release/7.0-staging
from
dotnet-maestro-bot:merge/release/7.0-to-release/7.0-staging
Apr 12, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[manual] Merge release/7.0-staging into release/7.0
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries |
Tagging subscribers to 'linkable-framework': @eerhardt, @vitek-karas, @LakshanF, @sbomer, @joperezr, @marek-safar |
…-merge-7.0-2024-03-12-1055
….0-2024-03-12-1055 Merging internal commits for release/7.0
This was referenced Mar 13, 2024
…le exists failure on reattempts (dotnet#99711) * Append job attempt number to log artifact name to get rid of file exists failure on reattempts. * Revert unrelated change
Apple changed the error code we get back from a failed data-key export. This caused us to not attempt to export the key using the legacy APIs and assume the key export failed. This change adds the additional error code returned from macOS 14.4. Co-authored-by: Kevin Jones <[email protected]>
carlossanlop
approved these changes
Mar 25, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I detected changes in the release/7.0 branch which have not been merged yet to release/7.0-staging. I'm a robot and am configured to help you automatically keep release/7.0-staging up to date, so I've opened this PR.
This PR merges commits made on release/7.0 by the following committers:
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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/7.0-to-release/7.0-staging'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
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.