Skip to content
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

[manual] Merge release/6.0-staging into release/6.0 #93697

Merged
merged 3 commits into from
Oct 19, 2023

Conversation

carlossanlop
Copy link
Member

One more before we merge the branding PR. This includes the zlib fix.

dotnet-maestro bot and others added 3 commits October 17, 2023 10:49
…cu dotnet/emsdk dotnet/hotreload-utils dotnet/runtime-assets (dotnet#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 <1175054+carlossanlop@users.noreply.github.com>
Co-authored-by: Larry Ewing <lewing@microsoft.com>
…/6.0-to-release/6.0-staging

[automated] Merge branch 'release/6.0' => 'release/6.0-staging'
…2.13_jtk; add memory protections (dotnet#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
@ghost
Copy link

ghost commented Oct 18, 2023

Tagging subscribers to this area: @dotnet/area-system-io-compression
See info in area-owners.md if you want to be subscribed.

Issue Details

One more before we merge the branding PR. This includes the zlib fix.

Author: carlossanlop
Assignees: -
Labels:

area-System.IO.Compression

Milestone: -

Copy link
Member

@GrabYourPitchforks GrabYourPitchforks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

zlib changes lgtm.

@carlossanlop carlossanlop added the Servicing-approved Approved for servicing release label Oct 18, 2023
@carlossanlop carlossanlop merged commit dfda651 into dotnet:release/6.0 Oct 19, 2023
272 of 283 checks passed
@carlossanlop carlossanlop deleted the release/6.0-staging branch October 19, 2023 00:04
@ghost ghost locked as resolved and limited conversation to collaborators Nov 18, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants