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

Merged
merged 23 commits into from
Jul 16, 2024
Merged

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

merged 23 commits into from
Jul 16, 2024

Conversation

carlossanlop
Copy link
Member

Merge commit.

amanasifkhalid and others added 22 commits June 11, 2024 16:36
@amanasifkhalid
[release/6.0-staging] Merge dotnet#75473 (dotnet#103266)
30900da 
This introduces new templates from dotnet#75473 needed to switch over the .NET 6 servicing branch to 1ES templates. Once this is merged, dotnet#102681 (along with some pool provider updates) should be all we need to switch release/6.0-staging over to 1ES templates.
@amanasifkhalid
[release/6.0-staging] Merge dotnet#78968 (dotnet#103312)
255d1c5
@jkoritzinsky
Reapply "[release/6.0-staging] Merge dotnet#92901 (dotnet#102862)" (d…
7651c9f 
…otnet#103484)

This reverts commit 68438ed.
@jkoritzinsky
Merge branch 'release/6.0-staging' of github.com:dotnet/runtime into …
d548b12 
…merge/release/6.0-to-release/6.0-staging
@jkoritzinsky
Merge pull request dotnet#103260 from dotnet-maestro-bot/merge/releas…
0cb87bf 
…e/6.0-to-release/6.0-staging

[automated] Merge branch 'release/6.0' => 'release/6.0-staging'
@github-actions @vcsjones
[release/6.0-staging] Do not use nonces in OCSP requests
4a8d3e7 
Co-authored-by: Kevin Jones <kevin@vcsjones.com>
@github-actions @steveisok @jkotas
[release/6.0-staging] Update dotnet-pgo.md (dotnet#103927)
fe9a7b2 
* Update dotnet-pgo.md

Updates the instructions on how to install and use dotnet-pgo.

* Update docs/design/features/dotnet-pgo.md

---------

Co-authored-by: Steve Pfister <steveisok@users.noreply.github.com>
Co-authored-by: Jan Kotas <jkotas@microsoft.com>
@ilonatommy
Backport: surface error when emcc -version failed. (dotnet#103967)
40f8a8d
@amanasifkhalid
[release/6.0-staging] Fix dotnet#103485 (dotnet#103935)
89447d5
@rokonec
Disable Credentials_ServerChallengesWithWindowsAuth_ClientSendsWindow…
db12080 
…sAuthHeader test for linux (dotnet#104290)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/icu build 20240615…
b9c7e8b 
….1 (dotnet#103514)

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 6.0.0-rtm.24269.3 -> To Version 6.0.0-rtm.24315.1

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/…
6e3533f 
…6.0-staging
@dkurepa
update ESRPCodeSigning to 5 (dotnet#103895)
073a0e1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/emsdk build 202407…
70ca171 
…03.1 (dotnet#104353)

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.32 -> To Version 6.0.33

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/…
c3f817c 
…6.0-staging
@amanasifkhalid
[release/6.0-staging] Merge 1ES templates (dotnet#103366)
ac83237
@rzikm
[release/6.0] Disable SslStress and HttpStress runs (dotnet#104714)
3ab6d0f 
* Remove release/6.0 from HttpStress

Follow up from dotnet#103572. Seems like the schedule must be disabled in the particular branch (see https://learn.microsoft.com/en-us/azure/devops/pipelines/process/scheduled-triggers?view=azure-devops&tabs=yaml)

* Update ssl.yml
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20240…
5041bae 
…710.7 (dotnet#104748)

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.24266.4 -> To Version 6.0.0-beta.24360.7

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@carlossanlop
Merge pull request dotnet#104330 from dotnet-maestro-bot/merge/releas…
bd369c6 
…e/6.0-to-release/6.0-staging

[automated] Merge branch 'release/6.0' => 'release/6.0-staging'
@carlossanlop
Merge branch 'release/6.0-staging' into merge/release/6.0-to-release/…
b2d2bd3 
…6.0-staging
@dotnet-maestro
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
2ac8b5f 
…ild 20240712.1 (dotnet#104892)

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 6.0.0-alpha.0.24271.2 -> To Version 6.0.0-alpha.0.24362.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@carlossanlop
Merge pull request dotnet#104565 from dotnet/merge/release/6.0-to-rel…
50f436d 
…ease/6.0-staging

[automated] Merge branch 'release/6.0' => 'release/6.0-staging'
@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow labels Jul 15, 2024
@carlossanlop carlossanlop self-assigned this Jul 15, 2024
vseanreesermsft
vseanreesermsft approved these changes Jul 15, 2024
View reviewed changes
Copy link

@vseanreesermsft vseanreesermsft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@carlossanlop
Copy link
Member Author

FYI OOB packages from last month have been reset directly here instead with a separate PR: 2913386

Once merged into the base branch, An automatic PR will flow this into the staging branch.

This was referenced Jul 16, 2024
Open
Open
@carlossanlop carlossanlop merged commit ec9cf12 into dotnet:release/6.0 Jul 16, 2024
138 of 154 checks passed
@carlossanlop carlossanlop deleted the release/6.0-staging branch July 16, 2024 00:24
This was referenced Jul 16, 2024
Open
Closed
@github-actions github-actions bot locked and limited conversation to collaborators Aug 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@vseanreesermsft vseanreesermsft vseanreesermsft approved these changes

@lewing lewing Awaiting requested review from lewing

@directhex directhex Awaiting requested review from directhex

@steveisok steveisok Awaiting requested review from steveisok

@jkoritzinsky jkoritzinsky Awaiting requested review from jkoritzinsky

@mmitche mmitche Awaiting requested review from mmitche

@ericstj ericstj Awaiting requested review from ericstj

@hoyosjs hoyosjs Awaiting requested review from hoyosjs

@marek-safar marek-safar Awaiting requested review from marek-safar marek-safar is a code owner

Assignees

@carlossanlop carlossanlop

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

Successfully merging this pull request may close these issues.
8 participants
@carlossanlop @vseanreesermsft @amanasifkhalid @jkoritzinsky @ilonatommy @rokonec @dkurepa @rzikm