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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 14 commits into from
Oct 17, 2023
Merged

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

merged 14 commits into from
Oct 17, 2023

Conversation

carlossanlop
Copy link
Member

Merge commit.

elinor-fung and others added 14 commits September 18, 2023 09:35
@elinor-fung
Check for <framework_name>.deps.json when enumerating framework paths (…
c2f1e7e 
…dotnet#92032)

This adds a check for the framework's .deps.json instead of just the existence of the directory. To avoid extra file checks in the normal/happy path (where all framework version folder are valid), when resolving, it only does the check after resolving the best version match. And if that version directory isn't valid, it tries resolving again without it.

Backport of dotnet#90035
@carlossanlop
Merge pull request dotnet#91917 from dotnet-maestro-bot/merge/release…
27746ce 
…/6.0-to-release/6.0-staging

[automated] Merge branch 'release/6.0' => 'release/6.0-staging'
@carlossanlop
[release/6.0] Update Ubuntu 16.04 amd64 queues to 22.04 (dotnet#92794)
f13337f 
* [release/6.0] Update Ubuntu 16.04 queues to 22.04

* add svc prefix
@eiriktsarpalis
[release/6.0-staging] Fix JsonDocument thread safety. (dotnet#92832)
f95e178 
* Fix JsonDocument thread safety. (dotnet#76716)

Co-authored-by: stoub@microsoft.com

* Update ServicingVersion.
@dotnet-maestro
[release/6.0-staging] Update dependencies from dotnet/runtime-assets (d…
61fb33f 
…otnet#92884)

* Update dependencies from https://github.com/dotnet/runtime-assets build 20231002.2

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.23410.1 -> To Version 6.0.0-beta.23502.2

* Update dependencies from https://github.com/dotnet/runtime-assets build 20231002.2

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.23410.1 -> To Version 6.0.0-beta.23502.2

* Update dependencies from https://github.com/dotnet/runtime-assets build 20231002.2

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.23410.1 -> To Version 6.0.0-beta.23502.2

* Update dependencies from https://github.com/dotnet/runtime-assets build 20231002.2

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.23410.1 -> To Version 6.0.0-beta.23502.2

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@carlossanlop
[release/6.0-staging] Re-add emsdk key to NuGet.config (dotnet#93074)
e3df2ed
@jkoritzinsky
[release/6.0] Fix a memory leak in runtime interop stubs when using a…
4f5047f 
…n array of structs of types that use old-style managed marshalers (dotnet#93147)
@kouvel
Make thread pool thread timeouts configurable (dotnet#92988)
7318da8 
- Added two config options, one that configures the worker and wait thread timeouts, and another that enables keeping some number of worker threads alive after they are created
- This enables services that take periodic traffic to keep some worker threads around for better latency, while allowing extra threads to time out as appropriate for the service
@dotnet-maestro @carlossanlop
[release/6.0-staging] Update dependencies from dotnet/xharness (dotne…
8b530d4 
…t#93396)

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

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 6.0.0-prerelease.23401.2 -> To Version 6.0.0-prerelease.23455.2

* Re-add removed feed

---------

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>
@carlossanlop
Merge pull request dotnet#92979 from dotnet-maestro-bot/merge/release…
21783bb 
…/6.0-to-release/6.0-staging

[automated] Merge branch 'release/6.0' => 'release/6.0-staging'
@jkotas
Workaround for dotnet#93442 (dotnet#93530)
bd3c979
@antonfirsov
TcpReceiveSendGetsCanceledByDispose: update test for change in Linux …
a753662 
…kernel. (dotnet#93198) (dotnet#93554)
@carlossanlop @tmds
ProcessTests: allow WorkingSet to be zero just after launching the pr…
142b0fd 
…ocess. (dotnet#85649) (dotnet#93574)

* ProcessTests: allow WorkingSet to be zero just after launching the process.

The WorkingSet tests fail on Fedora 38+ because a zero working set value
is observed just after the process start.

Co-authored-by: Tom Deseyn <tom.deseyn@gmail.com>
@carlossanlop
[6.0] Bump Ubuntu 19.10 queues to 22.04 (dotnet#93578)
c76ae01
@carlossanlop carlossanlop added the area-codeflow for labeling automated codeflow label Oct 17, 2023
@carlossanlop carlossanlop added this to the 6.0.x milestone Oct 17, 2023
@carlossanlop carlossanlop self-assigned this Oct 17, 2023
@carlossanlop
Copy link
Member Author

@mmitche @vseanreesermsft this does not yet include this deps flow which keeps failing due to emsdk issues: #93395

@carlossanlop carlossanlop added the Servicing-approved Approved for servicing release label Oct 17, 2023
@carlossanlop
Copy link
Member Author

this does not yet include this deps flow which keeps failing due to emsdk issues: #93395

@lewing The failure is also here. I'll get this merged and we can fix the emscripten issue tomorrow.

@carlossanlop carlossanlop merged commit 7cd9356 into dotnet:release/6.0 Oct 17, 2023
212 of 220 checks passed
@carlossanlop carlossanlop deleted the release/6.0-staging branch October 17, 2023 04:35
This was referenced Oct 17, 2023
Open
Open
@ghost ghost locked as resolved and limited conversation to collaborators Nov 16, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lewing lewing Awaiting requested review from lewing

@steveisok steveisok Awaiting requested review from steveisok

@ViktorHofer ViktorHofer Awaiting requested review from ViktorHofer

@ericstj ericstj Awaiting requested review from ericstj

@hoyosjs hoyosjs Awaiting requested review from hoyosjs

@steveharter steveharter Awaiting requested review from steveharter steveharter is a code owner

@eiriktsarpalis eiriktsarpalis Awaiting requested review from eiriktsarpalis eiriktsarpalis is a code owner

Assignees

@carlossanlop carlossanlop

Labels
area-codeflow for labeling automated codeflow Servicing-approved Approved for servicing release
Projects
None yet
Milestone
6.0.x
Development

Successfully merging this pull request may close these issues.
7 participants
@carlossanlop @elinor-fung @eiriktsarpalis @jkoritzinsky @kouvel @jkotas @antonfirsov