Skip to content

[Manual] Merge release/6.0-staging into release/6.0 #97063

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
Merged
carlossanlop merged 16 commits into from
Jan 17, 2024
Merged

[Manual] Merge release/6.0-staging into release/6.0 #97063

carlossanlop merged 16 commits into from
Jan 17, 2024

Conversation

@carlossanlop
Copy link
Contributor

@carlossanlop carlossanlop commented Jan 17, 2024

Merge commit

carlossanlop and others added 15 commits November 27, 2023 14:57
@carlossanlop
Merge pull request #95163 from dotnet-maestro-bot/merge/release/6.0-t…
855d958 
…o-release/6.0-staging

[automated] Merge branch 'release/6.0' => 'release/6.0-staging'
@ManickaP
Disable mock test (#95407)
93e8c5c
@LoopedBard3
Update Perf Android jobs to use the Windows 11 Pixel Queue.
97c6639
@dotnet-maestro
[release/6.0-staging] Update dependencies from dotnet/emsdk (#95642)
95ca3cf 
* Update dependencies from https://github.com/dotnet/emsdk build 20231122.1

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.25 -> To Version 6.0.25

* Update dependencies from https://github.com/dotnet/emsdk build 20231205.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.25 -> To Version 6.0.26

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions @rzikm
Temporarily disable NoCallback_RevokedCertificate_NoRevocationCheckin…
8f280fc 
…g_Succeeds (#96055)

The 3rd party service has expired certificate

Co-authored-by: Radek Zikmund <[email protected]>
@akoeplinger
[release/6.0] Use NuGetAuthenticate@1 instead of @0 (#96651) (#96668)
715aae2 
There is a build warning about the old version now. eng/common usages are handled by dotnet/arcade#14314

Backport of #96651
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
66c50c0 
…220.4 (#96670)

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.23517.3 -> To Version 6.0.0-beta.23620.4

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@carlossanlop
Merge branch 'release/6.0-staging' into merge/release/6.0-to-release/…
a0e8f4f 
…6.0-staging
@wfurt
[release/6.0] fix IsMutuallyAuthenticated on SslStream (#92684)
f27366f 
* fix IsMutuallyAuthenticated

* update

* update test data

* cleanup

* pick up also  #65134 and #66077
@carlossanlop
Merge pull request #96725 from dotnet-maestro-bot/merge/release/6.0-t…
84d637a 
…o-release/6.0-staging

[automated] Merge branch 'release/6.0' => 'release/6.0-staging'
@dotnet-maestro
Update dependencies from https://github.com/dotnet/emsdk build 202401…
4a9016e 
…10.1 (#96760)

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.26 -> To Version 6.0.26

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
1fceb54 
…109.3 (#96784)

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.23620.4 -> To Version 6.0.0-beta.24059.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/xharness build 202…
62c2ce4 
…31031.3 (#96785)

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@akoeplinger
[release/6.0] Disable CI job: Android x64 Release AllSubsets_Mono_Run…
d8a2748 
…timeTests (#96891)

It is causing a lot of flaky failures: #83422

.NET MAUI is already EOL on 6.0 so disabling the tests is fine.

Fixes #83422
@github-actions @vcsjones
Disable implicit rejection for RSA PKCS#1 (#95218)
e3500b8 
Co-authored-by: Kevin Jones <[email protected]>
@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow labels Jan 17, 2024
@carlossanlop carlossanlop added this to the 8.0.2 milestone Jan 17, 2024
@carlossanlop carlossanlop self-assigned this Jan 17, 2024
@carlossanlop carlossanlop modified the milestones: 8.0.2, 6.0.27 Jan 17, 2024
@carlossanlop carlossanlop merged commit a4daad6 into dotnet:release/6.0 Jan 17, 2024
@carlossanlop carlossanlop deleted the release/6.0-staging branch January 17, 2024 01:57
@build-analysis build-analysis bot mentioned this pull request Jan 17, 2024
Closed
@github-actions github-actions bot locked and limited conversation to collaborators Feb 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jeffhandley jeffhandley jeffhandley approved these changes

@ericstj ericstj Awaiting requested review from ericstj

Assignees

@carlossanlop carlossanlop

Labels

area-codeflow for labeling automated codeflow Servicing-approved Approved for servicing release

Projects

None yet

Milestone

6.0.27

Development

Successfully merging this pull request may close these issues.

6 participants

@carlossanlop @jeffhandley @ManickaP @LoopedBard3 @akoeplinger @wfurt