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/8.0-staging into release/8.0 #108862

Merged
merged 20 commits into from
Oct 15, 2024

Conversation

carlossanlop
Copy link
Member

@carlossanlop carlossanlop commented Oct 14, 2024

Merge commit!

No OOB packages were turned on this month. The only libraries changes we got were in System.Collections.Concurrent, System.Globalization and System.Private.CoreLib. So we can safely turn off all the ones that were turned on last month: 8249297

VSadov and others added 19 commits September 19, 2024 10:58
…ss shutdown. (dotnet#107844)

* Add a test

* Minimal part of "Use RtlDllShutdownInProgress to detect process shutdown on Windows (dotnet#103877)"

Fixes:107800

* Use RtlDllShutdownInProgress to detect process shutdown on Windows

Switching to cooperative mode is not safe during process shutdown on
Windows. Process shutdown can terminate a thread in the middle of the
GC. The shutdown thread deadlocks if it tries to switch to cooperative
mode and wait for the GC to finish in this situation.

Use RtlDllShutdownInProgress Windows API to detect process
shutdown to avoid waiting for GC completion when that may lead to deadlocks.

* Update src/coreclr/vm/vars.hpp

Co-authored-by: Manish Godse <61718172+mangod9@users.noreply.github.com>

---------

Co-authored-by: Jan Kotas <jkotas@microsoft.com>
Co-authored-by: Manish Godse <61718172+mangod9@users.noreply.github.com>
…yRemove …" (dotnet#107656)

This reverts commit 252018c.

Co-authored-by: Stephen Toub <stoub@microsoft.com>
…ease/8.0-staging

[automated] Merge branch 'release/8.0' => 'release/8.0-staging'
* Fix wrong RegionInfo Names

* Exclude the test on Windows 8 for the lack of full globalization data

---------

Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
* Fix IndexOf Optimization Code

* small typo

* Address the feedback

* Exclude hybrid globalization runs on the new added tests

---------

Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
Co-authored-by: Miha Zupan <mihazupan.zupan1@gmail.com>
This is a modified backport of dotnet#105548. It mostly preserves the logic of the original fix in .NET 9 with a few adjustments:
- Added a config switch System.Diagnostics.Tracing.CounterCallbackOnTimerThread that must be set to true to opt-in to the fix behavior. The .NET 9 fix
  was documented as a breaking change because it slighly modifies the timing and thread used for first call to an IncrementingPollingCounter callback. I did not want anyone in 8.0 to opted into this by default.
- The opt-in switch sets the property CounterCallbackOnTimerThread and I added this condition to several of the if checks in the code. Its more than would be strictly necessary just to make it obvious when code reviewing individual methods that the new code paths are unreachable unless the app opts in.
- The original 9.0 change had a bit more refactoring that wasn't essential (renaming a method, removing an unneeded lock() scope) and I removed that here to reduce the code delta.
…ease/8.0-staging

[automated] Merge branch 'release/8.0' => 'release/8.0-staging'
…ld 20241010.3 (dotnet#108785)

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 8.0.0-beta.24362.2 -> To Version 8.0.0-beta.24510.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…nals build 20241010.2 (dotnet#108784)

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.24379.1 -> To Version 8.0.0-alpha.1.24510.2

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

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

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 8.0.0-alpha.0.24453.2 -> To Version 8.0.0-alpha.0.24507.2

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

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 8.0.0-alpha.0.24507.2 -> To Version 8.0.0-alpha.0.24510.2

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

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 8.0.0-alpha.0.24510.2 -> To Version 8.0.0-alpha.0.24514.2

---------

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

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 8.0.0-prerelease.24229.2 -> To Version 8.0.0-prerelease.24480.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>
…008.1 (dotnet#108760)

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.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24426.2 -> To Version 8.0.0-beta.24508.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow labels Oct 14, 2024
@carlossanlop carlossanlop added this to the 8.0.11 milestone Oct 14, 2024
@carlossanlop carlossanlop requested review from a team October 14, 2024 21:14
@carlossanlop carlossanlop self-assigned this Oct 14, 2024
@carlossanlop
Copy link
Member Author

/ba-g Killed test processes

@carlossanlop carlossanlop merged commit cddad1e into dotnet:release/8.0 Oct 15, 2024
8 of 9 checks passed
@carlossanlop carlossanlop deleted the release/8.0-staging branch October 15, 2024 02:50
@github-actions github-actions bot locked and limited conversation to collaborators Nov 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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.

6 participants