Skip to content

Conversation

carlossanlop
Copy link
Contributor

Merge commit.

amanasifkhalid and others added 22 commits June 11, 2024 16:36
This introduces new templates from #75473 needed to switch over the .NET 6 servicing branch to 1ES templates. Once this is merged, #102681 (along with some pool provider updates) should be all we need to switch release/6.0-staging over to 1ES templates.
…to-release/6.0-staging

[automated] Merge branch 'release/6.0' => 'release/6.0-staging'
* 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 <[email protected]>
Co-authored-by: Jan Kotas <[email protected]>
….1 (#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>
…03.1 (#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>
* Remove release/6.0 from HttpStress

Follow up from #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
….7 (#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>
…to-release/6.0-staging

[automated] Merge branch 'release/6.0' => 'release/6.0-staging'
…ild 20240712.1 (#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>
….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
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
Contributor 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.

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.

8 participants