[automated] Merge branch 'release/6.0' => 'release/6.0-staging' #84610
Conversation
…ic and mono .NET 6.0 version of .NET 7.0 change to: - Fix loading of msquic in System.Net.Quic.. - Fix handling of DllImportSearchPath values in DllImport and NativeLibrary. Differences: - No NativeAOT - Tests use explicit Main (before test consolidation)
[manual] Merge branch 'release/6.0-staging' => 'release/6.0'
|
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries Issue DetailsI detected changes in the release/6.0 branch which have not been merged yet to release/6.0-staging. I'm a robot and am configured to help you automatically keep release/6.0-staging up to date, so I've opened this PR. This PR merges commits made on release/6.0 by the following committers:
Instructions for merging from UIThis 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 lineRun these commands to merge this pull request from the command line. git fetch
git checkout release/6.0
git pull --ff-only
git checkout release/6.0-staging
git pull --ff-only
git merge --no-ff release/6.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/runtime HEAD:merge/release/6.0-to-release/6.0-stagingor if you are using SSHAfter PR checks are complete push the branch Instructions for resolving conflictsInstructions for updating this pull requestContributors to this repo have permission update this pull request by pushing to the branch 'merge/release/6.0-to-release/6.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 SSHContact .NET Core Engineering if you have questions or issues.
|
…-merge-6.0-2023-04-11-1027
….0-2023-04-11-1027 Merging internal commits for release/6.0
…tnet#84703) * Update dependencies from https://github.com/dotnet/arcade build 20230411.7 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.23167.1 -> To Version 6.0.0-beta.23211.7 * Update dependencies from https://github.com/dotnet/emsdk build 20230412.1 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.17 -> To Version 6.0.17 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…g in wasm (dotnet#84740) * [6.0-staging] Bump branding to 6.0.18 (dotnet#84596) * Fix null being passed to g_path_get_dirname when probing in wasm * Update src/mono/mono/metadata/native-library.c Co-authored-by: Aleksey Kliger (λgeek) <akliger@gmail.com> * Revert versioning changes brought from staging. --------- Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com> Co-authored-by: Katelyn Gadd <kg@luminance.org> Co-authored-by: Aleksey Kliger (λgeek) <akliger@gmail.com>
dotnet-maestro-bot
requested review from
vargaz,
lambdageek and
thaystg
as code owners
…#84939) Backport of dotnet#81917 This isn't in use, so there's no need to build and ship it. Instead, this is being moved to the mono windows x64 public leg. Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
ghost
locked as resolved and limited conversation to collaborators
I detected changes in the release/6.0 branch which have not been merged yet to release/6.0-staging. I'm a robot and am configured to help you automatically keep release/6.0-staging up to date, so I've opened this PR.
This PR merges commits made on release/6.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/6.0-to-release/6.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.