[manual] Merge release/6.0-staging into release/6.0#88645
Merged
ViktorHofer merged 10 commits intodotnet:release/6.0from Jul 11, 2023
carlossanlop:release/6.0-staging
Merged
[manual] Merge release/6.0-staging into release/6.0#88645ViktorHofer merged 10 commits intodotnet:release/6.0from carlossanlop:release/6.0-staging
ViktorHofer merged 10 commits intodotnet:release/6.0from
carlossanlop:release/6.0-staging
Conversation
…o-release/6.0-staging [automated] Merge branch 'release/6.0' => 'release/6.0-staging'
…o-release/6.0-staging [automated] Merge branch 'release/6.0' => 'release/6.0-staging'
…30609.2 (#87653) Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 6.0.0-prerelease.23253.6 -> To Version 6.0.0-prerelease.23309.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…o-release/6.0-staging [automated] Merge branch 'release/6.0' => 'release/6.0-staging'
…cu dotnet/hotreload-utils dotnet/emsdk dotnet/runtime-assets (#87652) * Update dependencies from https://github.com/dotnet/arcade build 20230613.5 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.23221.7 -> To Version 6.0.0-beta.23313.5 * Update dependencies from https://github.com/dotnet/icu build 20230615.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-rtm.23218.5 -> To Version 6.0.0-rtm.23315.1 * Update dependencies from https://github.com/dotnet/hotreload-utils build 20230616.3 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 6.0.0-alpha.0.23226.4 -> To Version 6.0.0-alpha.0.23316.3 * Update dependencies from https://github.com/dotnet/emsdk build 20230616.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.19 -> To Version 6.0.19 * Update dependencies from https://github.com/dotnet/runtime-assets build 20230616.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.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.Windows.Extensions.TestData From Version 6.0.0-beta.23212.1 -> To Version 6.0.0-beta.23316.2 * Update dependencies from https://github.com/dotnet/emsdk build 20230620.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.19 -> To Version 6.0.20 * Update dependencies from https://github.com/dotnet/runtime-assets build 20230616.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.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.Windows.Extensions.TestData From Version 6.0.0-beta.23212.1 -> To Version 6.0.0-beta.23316.2 * Update dependencies from https://github.com/dotnet/runtime-assets build 20230616.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.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.Windows.Extensions.TestData From Version 6.0.0-beta.23212.1 -> To Version 6.0.0-beta.23316.2 * Update dependencies from https://github.com/dotnet/runtime-assets build 20230616.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.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.Windows.Extensions.TestData From Version 6.0.0-beta.23212.1 -> To Version 6.0.0-beta.23316.2 * Update dependencies from https://github.com/dotnet/emsdk build 20230707.3 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.20 -> To Version 6.0.21 --------- 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> Co-authored-by: Ankit Jain <radical@gmail.com>
This was referenced Jul 11, 2023
ViktorHofer
approved these changes
Jul 11, 2023
ghost
locked as resolved and limited conversation to collaborators
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
Merge commit.