Skip to content

[manual] Merge release/9.0-staging to release/9.0 #114662

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 52 commits into from
Apr 15, 2025

Conversation

jozkee
Copy link
Member

@jozkee jozkee commented Apr 14, 2025

Merge commit

github-actions bot and others added 30 commits March 14, 2025 18:10
… + HEAD verb (dotnet#113261)

Co-authored-by: pavelsavara <[email protected]>
Co-authored-by: campersau <[email protected]>
Co-authored-by: Alexander Köplinger <[email protected]>
… try. (dotnet#112809) (dotnet#113055)

* Use FLS detach as thread termination notification on windows.

* use _ASSERTE_ALL_BUILDS

* one more case

* InitFlsSlot throws per convention used in threading initialization

* OsDetachThread could be void

* Update src/coreclr/vm/ceemain.cpp

* ensure CoInitialize

* Asserts to fail deterministically.

* comments

* scope the failfast to Windows and tweak the comments a bit.

* better assert

* Apply suggestions from code review



* Undo unnecessary finalizer thread changes

* reverse the failfast condition

* handle destruction of unattached threads

* PR feedback



* Update src/coreclr/vm/ceemain.cpp

* set g_fComStarted as soon as we call CoInitialize

* Naming nit

* fix a typpo + better comment

---------

Co-authored-by: Jan Kotas <[email protected]>
…merable throws before first item (dotnet#113699)

* [Json] Avoid writing to PipeWriter if IAsyncEnumerable throws before first item

* update

---------

Co-authored-by: Brennan <[email protected]>
This can trip up users that have enabled floating point exceptions.

While we don't generally support changing the exception modes we also
can easily avoid dividing by zero here.

Addresses dotnet#113369

Co-authored-by: Andy Ayers <[email protected]>
Fixes dotnet#110932.

The constraint would need to be resolved first.

Co-authored-by: Michal Strehovský <[email protected]>
…on20 (dotnet#113649)

* Trying to add user agent header.

* Test another way

* Change server to httpbin

* Update Http2NoPushHost and add Http2NoPushGetUris for improved testing

---------

Co-authored-by: Roman Konecny <[email protected]>
… multi-threaded scenarios (dotnet#113740)

Backport of dotnet#113140

Issue dotnet#109410 appears to be a case where klass is 0 when we perform an isinst operation, but the cache and obj are nonzero and look like valid addresses. klass is either a compile-time (well, jit-time) constant or being fetched out of the cache (it looks like it can be either depending on some sort of rgctx condition).

This PR adds null checks in two places along with a memory barrier in the location where we believe an uninitialized cache is being published to other threads.

---------

Co-authored-by: Katelyn Gadd <[email protected]>
)

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

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25157.1 -> To Version 9.0.0-rtm.25162.2

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

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25157.1 -> To Version 9.0.0-rtm.25163.1

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

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25157.1 -> To Version 9.0.0-rtm.25164.1

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

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25157.1 -> To Version 9.0.0-rtm.25167.3

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

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25157.1 -> To Version 9.0.0-rtm.25170.1

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

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25157.1 -> To Version 9.0.0-rtm.25177.1

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Larry Ewing <[email protected]>
…ld 20250313.2 (dotnet#113516)

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 9.0.0-beta.25113.2 -> To Version 9.0.0-beta.25163.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
…13461)

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

Microsoft.SourceBuild.Intermediate.cecil , Microsoft.DotNet.Cecil
 From Version 0.11.5-alpha.25112.2 -> To Version 0.11.5-alpha.25162.2

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

Microsoft.SourceBuild.Intermediate.cecil , Microsoft.DotNet.Cecil
 From Version 0.11.5-alpha.25112.2 -> To Version 0.11.5-alpha.25166.5

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

Microsoft.SourceBuild.Intermediate.cecil , Microsoft.DotNet.Cecil
 From Version 0.11.5-alpha.25112.2 -> To Version 0.11.5-alpha.25173.2

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
…314.2 (dotnet#113561)

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.25111.5 -> To Version 9.0.0-beta.25164.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
…t#113595)

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

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

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

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

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
…323.5 (dotnet#113821)

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
* [9.0] Ensure libnethost isn't built with LTCG

* Move configure include into the pal as that's the only place that uses it.

* It's the other configure file that was causing problems, fix how that one is set up.
There are some `on pull_request_target types` in the label checking yml files that were removed but they are actually necessary, so the labeler keeps working after for example: pushing new commits, pressing the update the branch, closing and opening the PR.
…s to match ILLink features (dotnet#113466)

* [Apple mobile] Enable trimming on build machines to match ILLink features (dotnet#110966)

* Disable failing tests

* Add DataSetXmlSerializationIsSupported to PlatformDetection
…otnet#113892)

* Fix VS div-by-0 in DacEnumerableHashTable code

* Code review feedback

---------

Co-authored-by: Mike McLaughlin <[email protected]>
…dotnet#113517)

* Update dependencies from https://github.com/dotnet/hotreload-utils build 20250313.2

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 9.0.0-alpha.0.25153.2 -> To Version 9.0.0-alpha.0.25163.2

* Update dependencies from https://github.com/dotnet/hotreload-utils build 2025032.2

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 9.0.0-alpha.0.25153.2 -> To Version 9.0.0-alpha.0.25174.2

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
…uild 20250323.3 (dotnet#113822)

Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.11.0-beta1.25123.3 -> To Version 3.11.0-beta1.25173.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
….42 (dotnet#113596)

Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.ApiCompat.Task
 From Version 9.0.104-servicing.25111.36 -> To Version 9.0.105-servicing.25164.42

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
…ease/9.0-staging

[automated] Merge branch 'release/9.0' => 'release/9.0-staging'
…net#114207)

* Revert "Disable tests using http://corefx-net-http11.azurewebsites.net (dotnet#111235)"

This reverts commit de8e135.

* Revert "Disable more tests dependent on http://corefx-net-http11.azurewebsites.net (dotnet#111354)"

This reverts commit 9fea441.

---------

Co-authored-by: Radek Zikmund <[email protected]>
@ghost ghost added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Apr 14, 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.

Copilot reviewed 75 out of 83 changed files in this pull request and generated 1 comment.

Files not reviewed (8)
  • .config/dotnet-tools.json: Language not supported
  • NuGet.config: Language not supported
  • eng/Version.Details.xml: Language not supported
  • eng/Versions.props: Language not supported
  • eng/testing/tests.ioslike.targets: Language not supported
  • eng/testing/tests.mobile.targets: Language not supported
  • global.json: Language not supported
  • src/coreclr/gc/CMakeLists.txt: Language not supported

@carlossanlop
Copy link
Contributor

carlossanlop commented Apr 15, 2025

@lewing @steveisok @akoeplinger there is a build failure in wasm tests like this one: https://dev.azure.com/dnceng-public/public/_build/results?buildId=1016432&view=logs&j=1fa93050-f528-55d3-a351-f8bf9ce5adbf&t=d9dc6d3d-3442-5b70-1296-5b62e29ea209&l=51

  dotnet_install: Error: Could not find `.NET Core SDK` with version = 9.0.106
  dotnet_install: Error: Refer to: https://aka.ms/dotnet-os-lifecycle for information on .NET Core support
/__w/1/s/src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets(87,5): error MSB3073: The command "chmod +x /__w/1/s/artifacts/obj/dotnet-install.sh; /__w/1/s/artifacts/obj/dotnet-install.sh -i /__w/1/s/artifacts/bin/dotnet-none/ -v 9.0.106" exited with code 1. [/__w/1/s/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj]

Can you please take a look? it's blocking the flow to internal for 9.0.

EDIT: @akoeplinger gave me the answer, thank you! I'll push a fix:

Versions.props has this:
<SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting> and MicrosoftDotNetApiCompatTaskVersion is set to 9.0.106, but that version isn't released yet so the install script can't find it we need to set it to SdkVersionForWorkloadTesting to 9.0.105

@carlossanlop
Copy link
Contributor

The other failure is #114693

@@ -12,6 +12,7 @@
<add key="darc-pub-dotnet-emsdk-3df5eac" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3df5eac9/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-pub-dotnet-sdk-fe6d1ce" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-sdk-fe6d1ced/nuget/v3/index.json" />
Copy link
Member

@lewing lewing Apr 15, 2025

Choose a reason for hiding this comment

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

We're taking a dep on an unreleased version of MicrosoftDotNetApiCompatTaskVersion (the sdk) here which is what is causing WasmBuildTests to fail. If we want to do this then WBT needs to have the stable feed added to its build as well

Copy link
Contributor

Choose a reason for hiding this comment

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

Is this commit I pushed enough to fix the failure? ab10157

Copy link
Contributor

Choose a reason for hiding this comment

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

Okay I see some linux wasm legs passing already. Merging now.

Copy link
Member

Choose a reason for hiding this comment

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

I think you didn't wait long enough.

@carlossanlop carlossanlop merged commit 34e64ad into dotnet:release/9.0 Apr 15, 2025
70 of 136 checks passed
@carlossanlop carlossanlop deleted the release/9.0-staging branch April 15, 2025 16:56
@github-actions github-actions bot locked and limited conversation to collaborators May 18, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-codeflow for labeling automated codeflow 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.