Skip to content

[automated] Merge branch 'release/7.0-rc1' => 'release/7.0' #74539

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

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

This PR merges commits made on release/7.0-rc1 by the following committers:

  • dotnet-maestro[bot]
  • lambdageek
  • EgorBo
  • github-actions[bot]
  • lewing

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

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

github-actions bot and others added 13 commits August 22, 2022 13:25
…service provider (dotnet#74362)

* Fix leaks caused by not disposing the parent scoped ServiceProvider

* Address the feedback

Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
)

* Add DAC signature infrastructure
* Use a .NET 6 SDK to enable signing
* Add signature verification

Co-authored-by: Juan Sebastian Hoyos Ayala <juan.hoyos@microsoft.com>
…dotnet#74357)

* Only enable Arm intrinsics for full aot
* Make sure AOT doesn't fall back to interpreter

Co-authored-by: Fan Yang <yangfan@microsoft.com>
* Roll forward to the latest 6.0.x builds
* Remove workaround for version emsdk import
* Fix incorrect pack names
* Fix unaliased packs
* Alias the experimental packs in WorkloadManifest.targets too
* Fix quoting
* Download manifests for workloads leg

Co-authored-by: Juan Sebastian Hoyos Ayala <juan.hoyos@microsoft.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
…net#74368)

* Fix mono package versions during stabilization

The issues that are being fixed via this PR happened and were fixed during the 7.0 stabilization release exercise.

* Update Directory.Build.targets

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
…es (dotnet#74367)

* fold reference to SslContextHandle to prevent crashes

* Update src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSsl.cs

Co-authored-by: Stephen Toub <stoub@microsoft.com>

Co-authored-by: wfurt <tweinfurt@yahoo.com>
Co-authored-by: Dan Moseley <danmose@microsoft.com>
Co-authored-by: Stephen Toub <stoub@microsoft.com>
…sasmSummary (dotnet#74392)

* [release/7.0-rc1] Improve DOTNET_JitDisasm and introduce DOTNET_JitDisasmSummary

* Update jitconfig.cpp
…23.3 (dotnet#74456)

Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.0-rc.1.22418.9 -> To Version 7.0.0-rc.1.22423.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…case (dotnet#74453)

* [mini] double quote linker path in defined(LD_NAME) case

In
dotnet@e71a958
we started setting a default `LD_NAME` for x86 non-mach targets

Fixes Android x86 builds that specify a `tool_prefix` with spaces in it

* also add an "llvm_only" branch to the defined(LD_NAME) case
…24.1 (dotnet#74510)

Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.0-rc.1.22423.3 -> To Version 7.0.0-rc.1.22424.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@ghost
Copy link

ghost commented Aug 24, 2022

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@carlossanlop
Copy link
Contributor

Let's merge this PR first: #74521

Then wait for the bot to include those changes in this PR, and then merge this PR.

cc @hoyosjs

@danmoseley danmoseley added the area-codeflow for labeling automated codeflow label Aug 25, 2022
…ds to be updated in release branch of Arcade once generated) (dotnet#74521)
@carlossanlop
Copy link
Contributor

carlossanlop commented Aug 25, 2022

I merged #74521

Now waiting for the bot to add it here...

Edit: Ah nice, it got added shortly before I posted this message. Now waiting for the CI to finish...

@carlossanlop carlossanlop merged commit dc242e9 into dotnet:release/7.0 Aug 25, 2022
@ghost ghost locked as resolved and limited conversation to collaborators Sep 25, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-codeflow for labeling automated codeflow
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants