[manual] Merge release/6.0-staging into release/6.0 #93697
Merged
Conversation
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
…cu dotnet/emsdk dotnet/hotreload-utils dotnet/runtime-assets (#93395) * Update dependencies from https://github.com/dotnet/arcade build 20231011.8 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.23408.5 -> To Version 6.0.0-beta.23511.8 * Update dependencies from https://github.com/dotnet/icu build 20231012.2 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-rtm.23409.1 -> To Version 6.0.0-rtm.23512.2 * Update dependencies from https://github.com/dotnet/emsdk build 20231012.2 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.23 -> To Version 6.0.23 * Update dependencies from https://github.com/dotnet/hotreload-utils build 20231012.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 6.0.0-alpha.0.23411.2 -> To Version 6.0.0-alpha.0.23512.1 * Update dependencies from https://github.com/dotnet/runtime-assets build 20231012.1 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.23502.2 -> To Version 6.0.0-beta.23512.1 * Update dependencies from https://github.com/dotnet/runtime-assets build 20231012.1 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.23502.2 -> To Version 6.0.0-beta.23512.1 * Update dependencies from https://github.com/dotnet/runtime-assets build 20231012.1 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.23502.2 -> To Version 6.0.0-beta.23512.1 * Update dependencies from https://github.com/dotnet/runtime-assets build 20231012.1 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.23502.2 -> To Version 6.0.0-beta.23512.1 * Update NuGet.config * remove the prepublic feeds now * Update dependencies from https://github.com/dotnet/runtime-assets build 20231012.1 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.23502.2 -> To Version 6.0.0-beta.23512.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Carlos Sánchez López <[email protected]> Co-authored-by: Larry Ewing <[email protected]>
…o-release/6.0-staging [automated] Merge branch 'release/6.0' => 'release/6.0-staging'
…2.13_jtk; add memory protections (#93634) * Update zlib and zlib-intel to 1.2.13 * Add missing cgmanifest.json registrations * Add defensive zeroing zlib allocator * Put zlib-version files under the correct directory * Add missing INTERNAL_ZLIB_INTEL definition
|
Tagging subscribers to this area: @dotnet/area-system-io-compression Issue DetailsOne more before we merge the branding PR. This includes the zlib fix.
|
GrabYourPitchforks
approved these changes
Oct 18, 2023
Member
GrabYourPitchforks
left a comment
GrabYourPitchforks
left a comment
There was a problem hiding this comment.
zlib changes lgtm.
This was referenced Oct 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.
2 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.
One more before we merge the branding PR. This includes the zlib fix.