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 #99577

Merged
merged 15 commits into from
Mar 12, 2024
Merged

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

merged 15 commits into from
Mar 12, 2024

Conversation

carlossanlop
Copy link
Member

Merge commit.

bartonjs and others added 14 commits February 15, 2024 13:31
@bartonjs
[release/6.0-staging] Manually depad RSAES-PKCS1 on Apple OSes
f25b769
@carlossanlop
Bump Pkcs to servicing version 4 (dotnet#98716)
06f09be
@carlossanlop
Merge pull request dotnet#98456 from dotnet-maestro-bot/merge/release…
8174b80 
…/6.0-to-release/6.0-staging

[automated] Merge branch 'release/6.0' => 'release/6.0-staging'
@steveisok
[release/6.0] Bump NuGet.ProjectModel version (dotnet#98724)
69ddeaf 
This resolves a CG alert

Co-authored-by: Steve Pfister <[email protected]>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
c9b42e2 
…213.1 (dotnet#98464)

Microsoft.DotNet.ApiCompat , 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.Sdk , 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 6.0.0-beta.24059.3 -> To Version 6.0.0-beta.24113.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro @carlossanlop
[release/6.0-staging] Update dependencies from dotnet/emsdk (dotnet#9…
208b21b 
…8438)

* Update dependencies from https://github.com/dotnet/emsdk build 20240214.2

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
 From Version 6.0.28 -> To Version 6.0.28

* Update dependencies from https://github.com/dotnet/emsdk build 20240215.4

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
 From Version 6.0.28 -> To Version 6.0.28

* Update dependencies from https://github.com/dotnet/emsdk build 20240227.3

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
 From Version 6.0.28 -> To Version 6.0.28

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
@MilenaHristova @ViktorHofer
[release/6.0-staging] Set assets manifest metadata for assets that ge…
1a694d4 
…t shipped with .NET release (dotnet#98991)

* Set assets manifest metadata for assets that get shipped with .NET release (dotnet#98824)

* add metadata to manifest

* set in ItemDefinitionGroup

* remove from items

* comment

* Add ProducesNetCoreAssets property to Publishing.props (dotnet#98665)

* add property to publishing.props

* rename to ProducesDotNetReleaseShippingAssets

* Update Publishing.props

---------

Co-authored-by: Viktor Hofer <[email protected]>

---------

Co-authored-by: Viktor Hofer <[email protected]>
@carlossanlop
Merge pull request dotnet#99375 from dotnet-maestro-bot/merge/release…
da09853 
…/6.0-to-release/6.0-staging

[automated] Merge branch 'release/6.0' => 'release/6.0-staging'
@kouvel
Fix usage of recycled lists in the thread pool (dotnet#99387)
5dd6fcb 
Fixed the usage of ThreadpoolMgr::RecycledLists to use the same processor count upon access as what is used to allocate the array.
@dotnet-maestro @carlossanlop
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
eedd763 
…ild 20240215.1 (dotnet#99167)

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 6.0.0-alpha.0.23518.4 -> To Version 6.0.0-alpha.0.24115.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
@dotnet-maestro @carlossanlop
[release/6.0-staging] Update dependencies from dotnet/runtime-assets (d…
5b34a8d 
…otnet#99189)

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

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.23512.1 -> To Version 6.0.0-beta.24124.1

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

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.23512.1 -> To Version 6.0.0-beta.24124.1

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

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.23512.1 -> To Version 6.0.0-beta.24124.1

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

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.23512.1 -> To Version 6.0.0-beta.24124.1

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

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.23512.1 -> To Version 6.0.0-beta.24124.1

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

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.23512.1 -> To Version 6.0.0-beta.24124.1

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

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.23512.1 -> To Version 6.0.0-beta.24124.1

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

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.23512.1 -> To Version 6.0.0-beta.24124.1

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

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.23512.1 -> To Version 6.0.0-beta.24124.1

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

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.23512.1 -> To Version 6.0.0-beta.24124.1

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
@dotnet-maestro @carlossanlop
Update dependencies from https://github.com/dotnet/icu build 20240214…
85ca6ce 
….3 (dotnet#99166)

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 6.0.0-rtm.23512.2 -> To Version 6.0.0-rtm.24114.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
@ayakael
[release/6.0] Add RID for Alpine 3.19 / 3.20 (dotnet#99560)
757ccc2 
* Add RID for Alpine 3.19

* Add RID for Alpine 3.20

* Microsoft.NETCore.Platforms: bump ServicingVersion
@carlossanlop
Microsoft.Windows.Compatibility (dotnet#99570)
5d4543b
@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow labels Mar 12, 2024
@carlossanlop carlossanlop added this to the 8.0.4 milestone Mar 12, 2024
@carlossanlop carlossanlop requested a review from a team March 12, 2024 05:23
@carlossanlop carlossanlop self-assigned this Mar 12, 2024
@carlossanlop carlossanlop requested a review from a team March 12, 2024 05:24
@carlossanlop carlossanlop changed the title [main] Merge release/6.0-staging into release/6.0 [manual] Merge release/6.0-staging into release/6.0 Mar 12, 2024
@ericstj
Add missing Evidence types to AcccessControl NETFramework Facade (dot…
bc5e878 
…net#99462)

The AccessControl assembly is missing type forwards for Evidence and EvidenceBase on .NETFramework.
Cannot use Evidence or EvidenceBase from a netstandard2.0 library and run on .NETFramework.
Fixes dotnet#99447
@carlossanlop carlossanlop merged commit 6a9355b into dotnet:release/6.0 Mar 12, 2024
90 of 158 checks passed
@carlossanlop carlossanlop deleted the release/6.0-staging branch March 12, 2024 06:31
This was referenced Mar 12, 2024
Closed
Open
Open
@github-actions github-actions bot locked and limited conversation to collaborators Apr 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@hoyosjs hoyosjs hoyosjs approved these changes

Assignees

@carlossanlop carlossanlop

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

Successfully merging this pull request may close these issues.
8 participants
@carlossanlop @hoyosjs @bartonjs @steveisok @MilenaHristova @kouvel @ayakael @ericstj