[automated] Merge branch 'release/7.0' => 'release/7.0-staging' #84611
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
…ic and search paths for nativeaot and mono Fix loading of msquic in System.Net.Quic.. Fix handling of `DllImportSearchPath` values in `DllImport` and `NativeLibrary`. This affects mono and nativeaot.
…84123) * Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.6 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.23151.1 -> To Version 7.0.0-beta.23179.6 * Update NuGet.config * bring them back --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
[manual] Merge branch 'release/7.0-staging' => 'release/7.0'
|
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries Issue DetailsI 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 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/7.0
git pull --ff-only
git checkout release/7.0-staging
git pull --ff-only
git merge --no-ff release/7.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/7.0-to-release/7.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/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 SSHContact .NET Core Engineering if you have questions or issues.
|
…-merge-7.0-2023-04-11-1033
….0-2023-04-11-1033 Merging internal commits for release/7.0
dotnet-maestro-bot
requested review from
thaystg and
MichalStrehovsky
as code owners
…411.2 (dotnet#84646) 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 , 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 7.0.0-beta.23164.3 -> To Version 7.0.0-beta.23211.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
….1 (dotnet#84658) Microsoft.NETCore.Runtime.ICU.Transport From Version 7.0.0-rtm.23115.1 -> To Version 7.0.0-rtm.23211.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…11.1 (dotnet#84657) Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.6 -> To Version 7.0.6 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This was referenced Apr 12, 2023
…o.mscordbi subset off the offical build (dotnet#84938) 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>
carlossanlop
approved these changes
Apr 19, 2023
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.