[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' #41927

dotnet-maestro-bot · 2024-07-02T19:57:47Z

I detected changes in the release/6.0.4xx branch which have not been merged yet to release/8.0.1xx. I'm a robot and am configured to help you automatically keep release/8.0.1xx up to date, so I've opened this PR.

This PR merges commits made on release/6.0.4xx by the following committers:

joeloff
vseanreesermsft
v-wuzhai
dotnet-maestro[bot]
marcpopMSFT
dotnet-bot
MiYanni

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/6.0.4xx
git pull --ff-only
git checkout release/8.0.1xx
git pull --ff-only
git merge --no-ff release/6.0.4xx

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/sdk HEAD:merge/release/6.0.4xx-to-release/8.0.1xx

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/sdk HEAD:merge/release/6.0.4xx-to-release/8.0.1xx

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/6.0.4xx-to-release/8.0.1xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/6.0.4xx-to-release/8.0.1xx release/8.0.1xx
git pull https://github.com/dotnet-maestro-bot/sdk merge/release/6.0.4xx-to-release/8.0.1xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/sdk HEAD:merge/release/6.0.4xx-to-release/8.0.1xx

or if you are using SSH

git checkout -b merge/release/6.0.4xx-to-release/8.0.1xx release/8.0.1xx
git pull [email protected]:dotnet-maestro-bot/sdk merge/release/6.0.4xx-to-release/8.0.1xx
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/sdk HEAD:merge/release/6.0.4xx-to-release/8.0.1xx

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

…otnet-templating build 20240305.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.128 -> To Version 6.0.129

…otnet-aspnetcore build 20240305.4 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.28-servicing.24155.4

…otnet-aspnetcore build 20240305.11 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.28-servicing.24155.11

…otnet-aspnetcore build 20240305.18 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.28-servicing.24155.18

…otnet-templating build 20240306.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.128 -> To Version 6.0.129

…otnet-windowsdesktop build 20240306.3 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.29

…otnet-aspnetcore build 20240306.10 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24156.10

…otnet-aspnetcore build 20240306.13 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24156.13

…otnet-windowsdesktop build 20240228.9 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.28

…otnet-windowsdesktop build 20240306.10 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.29

…otnet-windowsdesktop build 20240307.10 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.29

…otnet-windowsdesktop build 20240307.17 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.29

…otnet-windowsdesktop build 20240308.11 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.29

…otnet-aspnetcore build 20240311.15 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24161.15

…otnet-windowsdesktop build 20240311.9 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.29

…otnet-aspnetcore build 20240312.5 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24162.5

…otnet-templating build 20240312.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.128 -> To Version 6.0.129

…otnet-windowsdesktop build 20240312.5 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.29

…otnet-aspnetcore build 20240312.12 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24162.12

…otnet-aspnetcore build 20240312.17 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24162.17

…otnet-templating build 20240312.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.128 -> To Version 6.0.129

…3 repositories This pull request updates the following dependencies [marker]: <> (Begin:b9edc696-13f4-406c-3a51-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: b9edc696-13f4-406c-3a51-08d961c5a689 - **Build**: 20240312.12 - **Date Produced**: March 13, 2024 12:12:46 AM UTC - **Commit**: cef75e649457c61f8ef6205cef7b526ce0592104 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.128 to 6.0.129][13] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.128 to 6.0.129][13] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.128 to 6.0.129][13] - **Microsoft.TemplateEngine.Cli**: [from 6.0.128-servicing.24120.4 to 6.0.129-servicing.24162.12][13] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.128 to 6.0.129][13] - **Microsoft.TemplateEngine.Utils**: [from 6.0.128 to 6.0.129][13] - **Microsoft.TemplateSearch.Common**: [from 6.0.128 to 6.0.129][13] [13]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC5603759138c012b54bb40b1ff33a45f79188a0f5&targetVersion=GCcef75e649457c61f8ef6205cef7b526ce0592104&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b9edc696-13f4-406c-3a51-08d961c5a689) [marker]: <> (Begin:ffa022ec-0654-4a20-3a4e-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffa022ec-0654-4a20-3a4e-08d961c5a689 - **Build**: 20240312.17 - **Date Produced**: March 12, 2024 11:40:19 PM UTC - **Commit**: dd340b191b388fd448494f70a126ce8db511bba4 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.28-servicing.24120.5 to 6.0.29-servicing.24162.17][12] - **dotnet-user-secrets**: [from 6.0.28-servicing.24120.5 to 6.0.29-servicing.24162.17][12] - **Microsoft.AspNetCore.Analyzers**: [from 6.0.28-servicing.24120.5 to 6.0.29-servicing.24162.17][12] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.28 to 6.0.29][12] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.28-servicing.24120.5 to 6.0.29-servicing.24162.17][12] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.28 to 6.0.29][12] - **Microsoft.AspNetCore.Authorization**: [from 6.0.28 to 6.0.29][12] - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.28 to 6.0.29][12] - **Microsoft.AspNetCore.Components.Web**: [from 6.0.28 to 6.0.29][12] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.28-servicing.24120.5 to 6.0.29-servicing.24162.17][12] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.28-servicing.24120.5 to 6.0.29-servicing.24162.17][12] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.28-servicing.24120.5 to 6.0.29-servicing.24162.17][12] - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 6.0.28 to 6.0.29][12] - *...

Merge from public release/6.0.1xx to internal/release/6.0.1xx and resolve conflicts if necessary

…otnet-runtime build Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.28-servicing.24120.7 -> To Version 6.0.29-servicing.24164.14

…-merge-6.0.1xx-2024-05-14-1031

…et#40889)

…419.1 Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22553.1 -> To Version 6.0.200-1.24219.1

…517.3 Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22553.1 -> To Version 6.0.200-1.24267.3

…516.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.24204.4 -> To Version 6.0.0-beta.24266.4

…0-4867-9bb7-223009cb2d2e

…520.5 Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22553.1 -> To Version 6.0.200-1.24270.5

v-wuzhai · 2024-07-04T07:04:42Z

Superseded by #41969.

dotnet-bot and others added 30 commits March 6, 2024 00:16

Merge in 'release/6.0.1xx' changes

3142356

Merge in 'release/6.0.1xx' changes

1f15699

Merge in 'release/6.0.1xx' changes

c47d4aa

Merge in 'release/6.0.1xx' changes

7e2542b

Merged PR 38108: [internal/release/6.0.1xx] Merge from public

a63f0d2

Merge from public release/6.0.1xx to internal/release/6.0.1xx and resolve conflicts if necessary

Merge in 'release/6.0.1xx' changes

d3b0f64

Add nuget localization to the dependency flow

cca8816

vseanreesermsft and others added 20 commits May 14, 2024 10:31

Merge commit '0aff0db725f3979688ed1d6692f3507dc0e2daa2' into internal…

03720f7

…-merge-6.0.1xx-2024-05-14-1031

simplify the globaljson test logic

405bc53

Merging internal commits for release/6.0.1xx (dotnet#40875)

36cc6c7

Merge branch 'release/6.0.1xx' into release/6.0.4xx

6b67549

[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (dotn…

00721e5

…et#40889)

Update branding to 6.0.424

5c66768

Update branding to 6.0.424 (dotnet#40946)

5f0dc4a

Update dependencies from https://github.com/dotnet/linker build 20240…

93a962f

…419.1 Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22553.1 -> To Version 6.0.200-1.24219.1

Update dependencies from https://github.com/dotnet/linker build 20240…

b52d686

…517.3 Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22553.1 -> To Version 6.0.200-1.24267.3

Update dependencies from https://github.com/dotnet/arcade build 20240…

24c1e02

…516.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.24204.4 -> To Version 6.0.0-beta.24266.4

[release/6.0.4xx] Update dependencies from dotnet/arcade (dotnet#41005)

48dca38

Merge branch 'release/6.0.4xx' into darc-release/6.0.4xx-3f7a7b87-623…

1f9cbf4

…0-4867-9bb7-223009cb2d2e

Update dependencies from https://github.com/dotnet/linker build 20240…

5fa6e8c

…520.5 Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22553.1 -> To Version 6.0.200-1.24270.5

[release/6.0.4xx] Update dependencies from dotnet/linker (dotnet#40980)

037df91

2024-06 CTL

5090172

Update arcade

a1950ff

Use delegation SAS for internal builds

9ffffc7

Update branding to 6.0.425

74ed3d7

Update branding to 6.0.425 (dotnet#41920)

902e113

[release/6.0.4xx] Switch to dSAS for internal runtimes (dotnet#41914)

cc61242

dotnet-maestro-bot force-pushed the merge/release/6.0.4xx-to-release/8.0.1xx branch from 359a414 to 902e113 Compare July 2, 2024 19:57

dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Jul 2, 2024

joeloff and others added 2 commits July 2, 2024 13:31

[release/6.0.4xx] Trusted roots: 2024-06 CTL (dotnet#41602)

1935c3c

Merge branch 'release/6.0.4xx' into release/8.0.1xx

bf6faf5

v-wuzhai force-pushed the merge/release/6.0.4xx-to-release/8.0.1xx branch from df947c6 to bf6faf5 Compare July 3, 2024 07:09

v-wuzhai requested a review from mmitche July 3, 2024 07:10

build-analysis bot mentioned this pull request Jul 3, 2024

The Operation will be canceled. The next steps may not contain expected logs. dotnet/dnceng#3008

Open

3 tasks

v-wuzhai closed this Jul 4, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' #41927

[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' #41927

dotnet-maestro-bot commented Jul 2, 2024

v-wuzhai commented Jul 4, 2024

[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' #41927

[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' #41927

Conversation

dotnet-maestro-bot commented Jul 2, 2024

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

v-wuzhai commented Jul 4, 2024