Skip to content

[manual] Merge release/9.0-staging into release/9.0 #115497

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

Merged
merged 25 commits into from
May 15, 2025

Conversation

jozkee
Copy link
Member

@jozkee jozkee commented May 12, 2025

MERGE COMMIT!!!!!

maraf and others added 25 commits April 19, 2025 09:49
…synchronized (dotnet#114917)

Co-authored-by: Tom McDonald <tommcdon@microsoft.com>
After the recent VS upgrade from 17.12.5 to 17.13.2 we started seeing access violations in the mono-aot-cross.exe when targetting wasm.

We tracked it down to sgen_clz being miscompiled, we can workaround the compiler bug by switching from ternary condition to if/else.

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
…dotnet#114905)

Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
…r OpenSSL HKDF.

Do not set the salt or info if they are NULL for OpenSSL HKDF

Co-authored-by: Kevin Jones <kevin@vcsjones.com>
…dotnet#115011)

I noticed we were sending 30k workitems each day to various Helix queues, this is due to the outerloop pipeline having a schedule triggere which matches old preview branches or the staging branches.

This fixes that and also sets it so that the trigger only applies if there are actual source changes.

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
* Fix Idn tests

* Fine tune the IDN to Unicode version
* new-dfr in one commit

* fixes for decommitting large+huge and comments

* only age regions during BGC

* fix age_all_region_kinds condition.

---------

Co-authored-by: Mark Plesko <markples@microsoft.com>
… to eliminate extra call to Custom Certificate Validation (dotnet#114678)

* [WinHTTP] Certificate caching on WinHttpHandler to eliminate extra call to Custom Certificate Validation
…text() to NetFx (dotnet#114995)

Co-authored-by: Steve Harter <steveharter@users.noreply.github.com>
Co-authored-by: Jeremy Barton <jbarton@microsoft.com>
…506.6 (dotnet#115353)

Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset
 From Version 4.12.0-3.25173.5 -> To Version 4.12.0-3.25256.6

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…15026)

The previous fix dotnet#113396 could still leave us trying to evaluate 0.0/0.0,
which causes an invalid FP operation exception.

Make sure the divisor is non-zero.

Co-authored-by: Andy Ayers <andya@microsoft.com>
…115085)

* Update dependencies from https://github.com/dotnet/arcade build 20250425.6

Microsoft.SourceBuild.Intermediate.arcade , 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.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.25208.6 -> To Version 9.0.0-beta.25225.6

* Update dependencies from https://github.com/dotnet/arcade build 2025050.3

Microsoft.SourceBuild.Intermediate.arcade , 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.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.25208.6 -> To Version 9.0.0-beta.25255.3

* Update dependencies from https://github.com/dotnet/arcade build 2025050.5

Microsoft.SourceBuild.Intermediate.arcade , 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.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.25208.6 -> To Version 9.0.0-beta.25255.5

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
….33 (dotnet#114856)

Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.ApiCompat.Task
 From Version 9.0.106-servicing.25211.33 -> To Version 9.0.106-servicing.25217.33

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
)

* Update dependencies from https://github.com/dotnet/icu build 20250415.1

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25212.1 -> To Version 9.0.0-rtm.25215.1

* Update dependencies from https://github.com/dotnet/icu build 20250419.1

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25212.1 -> To Version 9.0.0-rtm.25219.1

* Update dependencies from https://github.com/dotnet/icu build 20250423.1

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25212.1 -> To Version 9.0.0-rtm.25223.1

* Update dependencies from https://github.com/dotnet/icu build 20250428.1

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25212.1 -> To Version 9.0.0-rtm.25228.1

* Update dependencies from https://github.com/dotnet/icu build 2025050.2

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25212.1 -> To Version 9.0.0-rtm.25255.2

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…14670)

* Update dependencies from https://github.com/dotnet/cecil build 20250413.6

Microsoft.SourceBuild.Intermediate.cecil , Microsoft.DotNet.Cecil
 From Version 0.11.5-alpha.25213.4 -> To Version 0.11.5-alpha.25213.6

* Update dependencies from https://github.com/dotnet/cecil build 20250428.2

Microsoft.SourceBuild.Intermediate.cecil , Microsoft.DotNet.Cecil
 From Version 0.11.5-alpha.25213.4 -> To Version 0.11.5-alpha.25228.2

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…t#114855)

* Update dependencies from https://github.com/dotnet/xharness build 20250414.1

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 9.0.0-prerelease.25209.2 -> To Version 9.0.0-prerelease.25214.1

* Update dependencies from https://github.com/dotnet/xharness build 20250428.2

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 9.0.0-prerelease.25209.2 -> To Version 9.0.0-prerelease.25228.2

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
….2 (dotnet#115466)

Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.ApiCompat.Task
 From Version 9.0.106-servicing.25217.33 -> To Version 9.0.107-servicing.25261.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
….1 (dotnet#115440)

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25255.2 -> To Version 9.0.0-rtm.25258.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…ease/9.0-staging

[automated] Merge branch 'release/9.0' => 'release/9.0-staging'
@jozkee jozkee requested review from a team May 12, 2025 22:42
@jozkee jozkee added the NO-SQUASH The PR should not be squashed label May 12, 2025
@Copilot Copilot AI review requested due to automatic review settings May 12, 2025 22:42
@jozkee jozkee added the Servicing-approved Approved for servicing release label May 12, 2025
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This merge brings the release/9.0-staging branch into release/9.0 and incorporates certificate caching functionality, dependency updates, and infrastructure improvements.

  • Introduces certificate caching logic and cleanup timer mechanisms in WinHttpHandler and related callbacks.
  • Updates dependency versions across project files and improves CI pipeline configurations.
  • Makes minor changes in coreclr components (threads, profiling, GC) and ref assemblies.

Reviewed Changes

Copilot reviewed 47 out of 47 changed files in this pull request and generated no comments.

Show a summary per file
File Description
src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestCallback.cs Adds callback logic for handling server connection events and certificate caching removal.
src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs Implements certificate cache management with timer cleanup and updates status callback flags.
src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/CachedCertificateValue.cs Introduces new types for cached certificate storage and defines equality semantics for cache keys.
src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj Includes new source file and package reference updates.
src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.cs Wraps properties with conditional compilation for NET.
src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs Updates OpenSSL version detection logic.
src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp_types.cs Defines WINHTTP_CONNECTION_INFO to avoid alignment issues.
src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj Updates KnownLibIcuVersion to include newer ICU versions.
src/coreclr/vm/threads.cpp Adds handling for TS_DebugWillSync during thread termination.
src/coreclr/jit/fgprofilesynthesis.cpp Improves safety against division by zero using a max guard.
src/coreclr/gc/gcpriv.h Updates free region constants and introduces new GC helper methods.
Various pipeline and version files Updates dependency versions and Docker image references to newer releases.
Comments suppressed due to low confidence (1)

src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/CachedCertificateValue.cs:38

  • The override of Equals(object) in CachedCertificateKey currently throws an exception. Consider implementing a proper equality comparison to support boxed comparisons without runtime exceptions.
public override bool Equals(object? obj) { throw new Exception("Unreachable"); }

@jozkee
Copy link
Member Author

jozkee commented May 15, 2025

/ba-g #115628.

@jozkee jozkee merged commit 71b9dc5 into dotnet:release/9.0 May 15, 2025
321 of 353 checks passed
@jozkee jozkee deleted the release/9.0-staging branch May 15, 2025 20:39
@github-actions github-actions bot locked and limited conversation to collaborators Jun 15, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
NO-SQUASH The PR should not be squashed Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants