[automated] Merge branch 'release/6.0.4xx' => 'main' #13873

dotnet-maestro-bot · 2022-05-25T20:36:50Z

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

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

marcpopMSFT
jonathanpeppers
v-wuzhai
dotnet-maestro[bot]
dougbu
MichaelSimons
mmitche
dotnet-sb-bot
vseanreesermsft
dsplaisted
dotnet-maestro-bot
dotnet-bot

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 main
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/core-sdk HEAD:merge/release/6.0.4xx-to-main

or if you are using SSH

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

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-main'. 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-main main
git pull https://github.com/dotnet-maestro-bot/core-sdk merge/release/6.0.4xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/core-sdk HEAD:merge/release/6.0.4xx-to-main

or if you are using SSH

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

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.

…dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://github.com/dotnet/sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220413.3 - **Date Produced**: April 13, 2022 10:52:12 AM UTC - **Commit**: 3456e28 - **Branch**: refs/heads/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.300-preview.22212.3 to 6.0.300-preview.22213.3][6] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.300-preview.22212.3 to 6.0.300-preview.22213.3][6] - **Microsoft.Net.Compilers.Toolset**: [from 4.2.0-4.22211.2 to 4.2.0-4.22212.4][7] [6]: dotnet/sdk@8963eb7...3456e28 [7]: dotnet/roslyn@8b5c5b8...f2d278f [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Net.Compilers.Toolset**: from 4.2.0-4.22211.2 to 4.2.0-4.22212.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates)

…ence-packages build 20220419.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22213.1 -> To Version 6.0.0-servicing.22219.1

…7ddc-719f-416d-bf3c-23f1d9067ac7 [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages

…dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.300-preview.22208.4 to 6.0.300 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.300-preview.22208.4 to 6.0.300-rtm.22215.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.300-preview.22208.4 to 6.0.300 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.FSharp.Compiler**: fr...

…dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.Net.Compilers.Toolset**: from 4.2.0-4.22212.4 to 4.2.0-4.22220.2 (parent: Microsoft.NET.Sdk) - **NuGet.Build.Tasks**: from 6.2.0-rc.140 to 6.2.0-rc.146 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220421.4 - **Date Produced**: April 21, 2022 9:07:16 AM UTC - **Commit**: ac00abe - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.300-rtm.22220.16 to 6.0.300-rtm.22221.4][4] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.300-rtm.22220.16 to 6.0.300-rtm.22221.4][4] - **Microsoft.NETCore.Platforms**: [from 6.0.2 to 6.0.3][5] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7][6] - **Microsoft.Net.Compilers.Toolset**: [from 4.2.0-4.22212.4 to 4.2.0-4.22220.2][7] - **NuGet.Build.Tasks**: [from 6.2.0-rc.140 to 6.2.0-rc.146][8] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC679e847&targetVersion=GCac00abe&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc24d9a9&targetVersion=GCbe98e88&_a=files [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1f426c9&targetVersion=GC0c636f9&_a=files [7]: dotnet/roslyn@f2d278f...1e40aa1 [8]: NuGet/NuGet.Client@6f54dbd...b8a6126 [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)

…et#13734) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220419.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22213.1 -> To Version 6.0.0-servicing.22219.1 * Remove sha from source tarball repo dir names (dotnet#13726) * Update smoke-test prereq artifact to include architecture (dotnet#13725) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: v-wuzhai <[email protected]> Co-authored-by: Michael Simons <[email protected]>

…-2022-05-03-1028 Update branding to 6.0.106

Add a direct reference to a newer version of this package

…/6.0.2xx-to-release/6.0.3xx [automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'

Add Arm64 RHEL builds

…504.3 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22212.5 -> To Version 6.0.0-beta.22254.3

…ence-packages build 20220504.1 (dotnet#13758) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages

…ence-packages build 20220504.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22254.1 -> To Version 6.0.0-servicing.22254.2

…8f3e-a32c-475b-9929-8bd3e22d154f [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages

…e17c-15a5-4fa0-b7b7-6705984127df [release/6.0.1xx] Update dependencies from dotnet/arcade

…/6.0.1xx-to-release/6.0.3xx [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22255.8 -> To Version 6.0.400-preview.22255.30 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.400-preview.22254.12 -> To Version 6.0.400-preview.22255.8 (parent: Microsoft.NET.Sdk

…4cc7-ebb2-40d5-ab7f-7590b4bfa41e [release/6.0.4xx] Update dependencies from dotnet/sdk

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22255.30 -> To Version 6.0.400-preview.22256.3 Dependency coherency updates Microsoft.Build From Version 17.3.0-preview-22254-01 -> To Version 17.3.0-preview-22256-03 (parent: Microsoft.NET.Sdk

…69b7-1435-4096-be00-f966dd7015b4 [release/6.0.4xx] Update dependencies from dotnet/sdk

…511.7 (dotnet#13836) Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22254.3 -> To Version 6.0.0-beta.22261.7 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22262.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22262.18 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk

…ence-packages build 20220512.1 (dotnet#13834) [release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22262.31 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22262.32 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk

…ence-packages build 20220512.1 (dotnet#13832) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-7bf204aa-9e0a-41ec-a411-ae6cd93b52b9

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22263.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22263.20 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22263.32 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk

…/6.0.3xx-to-release/6.0.4xx [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22265.4 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 6.0.400-preview.22259.1 -> To Version 6.0.400-preview.22262.2 (parent: Microsoft.NET.Sdk

…234b-3db5-4f21-9c03-7834d7e3485e [release/6.0.4xx] Update dependencies from dotnet/sdk

…/6.0.1xx-to-release/6.0.3xx [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'

…/6.0.3xx-to-release/6.0.4xx [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'

Context: https://aka.ms/dotnet/maui/6.0.300.json Update to MAUI GA releases. After `.\build.cmd -pack -publish`, manually tested the workloads: > .\bin\redist\Debug\dotnet\dotnet.exe workload install android --skip-manifest-update Installing pack Microsoft.Android.Sdk version 32.0.301... ... Installing pack Microsoft.NETCore.App.Runtime.Mono.android-arm version 6.0.5... I updated `$(MonoWorkloadManifestVersion)` as we require at least 6.0.5 in MAUI GA.

[release/6.0.4xx] Update MAUI GA manifests

v-wuzhai · 2022-05-31T02:08:13Z

@MichaelSimons Could you help to confirm if we need to merge these changes?

MichaelSimons · 2022-05-31T13:30:54Z

@MichaelSimons Could you help to confirm if we need to merge these changes?

I can only comment about the source-build changes. Yes, we definitely need the changes under the source-build directory to flow.

dotnet-bot and others added 30 commits April 18, 2022 23:17

Update dependencies from https://github.com/dotnet/source-build-refer…

d1c5091

…ence-packages build 20220419.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22213.1 -> To Version 6.0.0-servicing.22219.1

Merge in 'release/6.0.3xx' changes

a2eae06

Merge pull request dotnet#13665 from dotnet/darc-release/6.0.1xx-0ded…

cb2d89d

…7ddc-719f-416d-bf3c-23f1d9067ac7 [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages

Merge in 'release/6.0.3xx' changes

d3916de

Add a direct reference to a newer version of this package

e6afe7a

Remove sha from source tarball repo dir names (dotnet#13726)

2d73d3d

Add the cross-targeting app host packs to the arm64 installer

5e261ae

Update smoke-test prereq artifact to include architecture (dotnet#13725)

0176481

Update branding to 6.0.106

5a1062a

Merge pull request dotnet#13749 from vseanreesermsft/branding-6.0.106…

4bb6f38

…-2022-05-03-1028 Update branding to 6.0.106

Merge pull request dotnet#13711 from dotnet/marcpopMSFT-cg601xx

b058710

Add a direct reference to a newer version of this package

Add Mariner 2.0 and Arm64 RHEL builds

604e870

Merge pull request dotnet#13748 from dotnet-maestro-bot/merge/release…

49c3760

…/6.0.2xx-to-release/6.0.3xx [automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'

Merge pull request dotnet#13360 from dsplaisted/linux-arm64-and-mariner2

085ba13

Add Arm64 RHEL builds

Fix two broken <repo.sha> path references (dotnet#13745)

2e47208

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

a1dc2f6

…504.3 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22212.5 -> To Version 6.0.0-beta.22254.3

Update dependencies from https://github.com/dotnet/source-build-refer…

831257f

…ence-packages build 20220504.1 (dotnet#13758) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages

Update dependencies from https://github.com/dotnet/source-build-refer…

5631e9a

…ence-packages build 20220504.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22254.1 -> To Version 6.0.0-servicing.22254.2

Merge pull request dotnet#13772 from dotnet/darc-release/6.0.1xx-f762…

97150cd

…8f3e-a32c-475b-9929-8bd3e22d154f [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages

Merge pull request dotnet#13766 from dotnet/darc-release/6.0.1xx-c10c…

6ec9f0b

…e17c-15a5-4fa0-b7b7-6705984127df [release/6.0.1xx] Update dependencies from dotnet/arcade

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

305c2d1

Merge pull request dotnet#13757 from dotnet-maestro-bot/merge/release…

3fed194

…/6.0.1xx-to-release/6.0.3xx [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'

Merge pull request dotnet#13790 from dotnet/darc-release/6.0.4xx-a616…

6283996

…4cc7-ebb2-40d5-ab7f-7590b4bfa41e [release/6.0.4xx] Update dependencies from dotnet/sdk

Merge pull request dotnet#13792 from dotnet/darc-release/6.0.4xx-6453…

f5d1c04

…69b7-1435-4096-be00-f966dd7015b4 [release/6.0.4xx] Update dependencies from dotnet/sdk

dotnet-maestro bot and others added 22 commits May 12, 2022 11:16

Update dependencies from https://github.com/dotnet/source-build-refer…

48843f3

…ence-packages build 20220512.1 (dotnet#13834) [release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages

[6.0.1xx] Update template versions from dotnet/aspnetcore (dotnet#13839)

ee1b708

[6.0.4xx] Update template versions from dotnet/aspnetcore (dotnet#13841)

ff5d93b

[6.0.3xx] Update template versions from dotnet/aspnetcore (dotnet#13840)

e3c78bf

Merge pull request dotnet#13809 from dotnet-maestro-bot/merge/release…

33a917a

…/6.0.3xx-to-release/6.0.4xx [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'

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

6e89ea6

Merge pull request dotnet#13827 from dotnet/darc-release/6.0.4xx-7971…

c35149d

…234b-3db5-4f21-9c03-7834d7e3485e [release/6.0.4xx] Update dependencies from dotnet/sdk

Merge pull request dotnet#13828 from dotnet-maestro-bot/merge/release…

2b03ed9

…/6.0.1xx-to-release/6.0.3xx [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'

Revert changes to eng/folder from branch merge

63b29c2

Merge pull request dotnet#13853 from dotnet-maestro-bot/merge/release…

b6032c3

…/6.0.3xx-to-release/6.0.4xx [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'

Merge pull request dotnet#13866 from jonathanpeppers/maui-6.0.4xx

a73bedf

[release/6.0.4xx] Update MAUI GA manifests

dotnet-maestro-bot requested a review from a team as a code owner May 25, 2022 20:36

Merge branch 'release/6.0.4xx' into main

7c36f6a

v-wuzhai requested review from MichaelSimons and marcpopMSFT May 26, 2022 07:05

gkulin approved these changes May 31, 2022

View reviewed changes

gkulin merged commit cb6f768 into dotnet:main May 31, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[automated] Merge branch 'release/6.0.4xx' => 'main' #13873

[automated] Merge branch 'release/6.0.4xx' => 'main' #13873

Uh oh!

dotnet-maestro-bot commented May 25, 2022

Uh oh!

v-wuzhai commented May 31, 2022

Uh oh!

MichaelSimons commented May 31, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

[automated] Merge branch 'release/6.0.4xx' => 'main' #13873

[automated] Merge branch 'release/6.0.4xx' => 'main' #13873

Uh oh!

Conversation

dotnet-maestro-bot commented May 25, 2022

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

v-wuzhai commented May 31, 2022

Uh oh!

MichaelSimons commented May 31, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants