Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

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

Merged
merged 38 commits into from
Feb 11, 2025

Conversation

carlossanlop
Copy link
Member

MERGE COMMIT

@lewing let's monitor the CI for any issues coming from #111483

akoeplinger and others added 30 commits January 15, 2025 11:01
…websites.net (dotnet#111402)

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

* Disable more tests dependent on http://corefx-net-http11.azurewebsites.net

* Disable winhttphandlertests

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

Disabling until HTTPS redirection can be turned off at the server.
* [wasm] Re-enable skiasharp WBT tests

* Disable Debug/AOT combination

That would trigger build error, because we don't support that combination
anymore
…removal (dotnet#111508)

* [NRBF] Reduce the most time-consuming test case to avoid timeouts for checked builds (dotnet#110550)

* don't run drawing tests on Mono (dotnet#111208)

* don't run Drawing-related tests that do things like creating Bitmaps on Mono, as it's not supported (it does not support ComWrappers)

* re-enable the tests
[manual] Merge branch 'release/9.0' => 'release/9.0-staging'
Co-authored-by: Matous Kozak <matouskozak@seznam.cz>
…d sigs. (dotnet#111648) (dotnet#111675)

* Consume custom modifiers and ByRef in RetType signature
prior to comparing field signature.
…Mono LLVM PRs (dotnet#111739)

Co-authored-by: Matous Kozak <matouskozak@seznam.cz>
…110053)

* fix stack 2x2 tensor along dimension 1

* fixed last stack errors

---------

Co-authored-by: kasperk81 <83082615+kasperk81@users.noreply.github.com>
Co-authored-by: Michael Sharp <misharp@microsoft.com>
…read static variables (dotnet#111275)

* Fix issue 110837

There was a race condition where we could have collected all of the managed state of a LoaderAllocator, but not yet started cleaning up the actual LoaderAllocator object in native code. If a thread which had a TLS variable defined in a code associated with a collectible loader allocator was terminated at that point, then the runtime would crash.

The fix is to detect if the LoaderAllocator managed state is still alive, and if so, do not attempt to clean it up.

* Disable test on NativeAOT

* Update src/tests/Loader/CollectibleAssemblies/Statics/CollectibleTLSStaticCollection.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/tests/Loader/CollectibleAssemblies/Statics/CollectibleTLSStaticCollection.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Fix missing adjustment missed by copilot

---------

Co-authored-by: David Wrighton <davidwr@microsoft.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…NO-MERGE` label is applied (dotnet#111961)

* Add workflow to prevent merging a PR when the `NO-MERGE` label is applied.

* Invert condition

* Fix backtick bug in check-service-labels echo.

---------

Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
* Fix UNC paths

If the input file was a network path then the raw path returned by
GetFinalPathByHandle may return a UNC path. If so, and if the original
path wasn't a UNC path, and the original path doesn't need normalization,
we want to use the original path.

* Use MAXPATH instead

* Update src/native/corehost/hostmisc/pal.windows.cpp

Co-authored-by: Elinor Fung <elfung@microsoft.com>

* Update src/native/corehost/hostmisc/pal.windows.cpp

Co-authored-by: Elinor Fung <elfung@microsoft.com>

---------

Co-authored-by: Andy Gocke <angocke@microsoft.com>
Co-authored-by: Elinor Fung <elfung@microsoft.com>
…mory (dotnet#111069)

* [mono] [llvm-aot] Fixed storing Vector3 into memory

* Removed unused variable

---------

Co-authored-by: Jeremi Kurdek <jkurdek@gmail.com>
…t#111606)

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

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

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

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

---------

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

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

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25061.1 -> To Version 9.0.0-rtm.25065.1

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

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25061.1 -> To Version 9.0.0-rtm.25068.1

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

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25061.1 -> To Version 9.0.0-rtm.25070.1

---------

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

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

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25061.1 -> To Version 9.0.0-rtm.25102.2

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

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25061.1 -> To Version 9.0.0-rtm.25104.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>
…ld 20250121.2 (dotnet#111737)

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.24517.2 -> To Version 9.0.0-beta.25071.2

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>
…t to handle HMAC.

The TryGetHashAndReset in switches on the algorithm name of IncrementalHash. IncrementalHash prepends "HMAC" in front of the algorithm name, so the shim did not correctly handle the HMAC-prepended algorithm names.


---------

Co-authored-by: Kevin Jones <kevin@vcsjones.com>
Co-authored-by: Larry Ewing <lewing@microsoft.com>
…ference-packages (dotnet#111603)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250116.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.25060.3 -> To Version 9.0.0-alpha.1.25066.1

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250131.6

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.25060.3 -> To Version 9.0.0-alpha.1.25081.6

---------

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>
….25 (dotnet#111607)

Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.ApiCompat.Task
 From Version 9.0.102-servicing.24610.2 -> To Version 9.0.103-servicing.25065.25

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>
dotnet#111826)

* Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20250124.2

Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.11.0-beta1.24629.2 -> To Version 3.11.0-beta1.25074.2

* Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20250126.3

Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.11.0-beta1.24629.2 -> To Version 3.11.0-beta1.25076.3

---------

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>
…ild 20250127.3 (dotnet#111885)

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 9.0.0-alpha.0.25057.3 -> To Version 9.0.0-alpha.0.25077.3

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>
dotnet-maestro bot and others added 5 commits February 10, 2025 14:00
….1 (dotnet#112261)

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 9.0.0-rtm.25104.1 -> To Version 9.0.0-rtm.25105.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>
…ease/9.0-staging

[automated] Merge branch 'release/9.0' => 'release/9.0-staging'
…50203.3 (dotnet#112340)

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

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>
…111483)

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

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.25058.5 -> To Version 9.0.0-beta.25065.2

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

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.25058.5 -> To Version 9.0.0-beta.25077.4

* Bump SdkVersionForWorkloadTesting

---------

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>
@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow labels Feb 10, 2025
@carlossanlop carlossanlop requested review from lewing and a team February 10, 2025 23:41
@carlossanlop carlossanlop self-assigned this Feb 10, 2025
* Add tests to verify issue and fix.

* Check for type-assignability instead of equivallence. Also fix Choice logic.

* Add tests to verify issue and fix.

* Ensure collections are initialized to empty - even if they should be null according to the xml.

* Disable test scenarios that find failures that aren't fixed until .Net 10.
@carlossanlop
Copy link
Member Author

I don't see any arcade failures, @lewing. I can merge.

@carlossanlop
Copy link
Member Author

/ba-g Failures are mostly known, and I opened issues for #112423 and #112422

@carlossanlop carlossanlop merged commit 689f4e9 into dotnet:release/9.0 Feb 11, 2025
245 of 317 checks passed
@carlossanlop carlossanlop deleted the release/9.0-staging branch February 11, 2025 16:21
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
area-codeflow for labeling automated codeflow Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.