[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' #28600
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NuGet binary insertion for MSRC servicing, planned for October 2022 Patch Tuesday. MSRC 73498 - https://greymatter/MSRC/main.aspx?etc=112&id=ce925c1e-7d12-ed11-a867-000d3a6d3364&pagetype=entityrecord Reference - https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/pullrequest/22929
get msbuild bits
…4 repositories This pull request updates the following dependencies [marker]: <> (Begin:2e2c41e3-4520-418e-d824-08da180b2c46) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: 2e2c41e3-4520-418e-d824-08da180b2c46 - **Build**: 20220920.3 - **Date Produced**: September 20, 2022 4:17:57 PM UTC - **Commit**: a596312f285b849740c070b3b9f0825dc0ba84cf - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.304 to 6.0.305][33] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.304 to 6.0.305][33] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.304 to 6.0.305][33] - **Microsoft.TemplateEngine.Cli**: [from 6.0.304-servicing.22420.10 to 6.0.305-servicing.22470.3][33] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.304 to 6.0.305][33] - **Microsoft.TemplateEngine.Utils**: [from 6.0.304 to 6.0.305][33] - **Microsoft.TemplateSearch.Common**: [from 6.0.304 to 6.0.305][33] [33]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC0b3a1bf&targetVersion=GCa596312&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:2e2c41e3-4520-418e-d824-08da180b2c46) [marker]: <> (Begin:dc1c3afc-aa30-466e-4d3a-08da180de348) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: dc1c3afc-aa30-466e-4d3a-08da180de348 - **Build**: 20220919.10 - **Date Produced**: September 19, 2022 11:32:17 PM UTC - **Commit**: 3bd501a063af406167e0195844048a3c222afd29 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10][31] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.9 to 6.0.10][31] - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.10][31] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][31] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.9 to 6.0.10][31] - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.6][32] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10][31] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10][31] [31]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC163a635&targetVersion=GC3bd501a&_a=files [32]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC0ec02c8&targetVersion=GC3bd501a&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:dc1c3afc-aa30-466e-4d3a-08da180de348) [marker]: <> (Begin:ffc11ea2-d045-4ff5-4d39-08da180de348) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffc11ea2-d045-4ff5-4d39-08da180de348 - *...
…dnceng/internal/dotnet-templating dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:2e2c41e3-4520-418e-d824-08da180b2c46) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: 2e2c41e3-4520-418e-d824-08da180b2c46 - **Build**: 20220926.13 - **Date Produced**: September 26, 2022 2:47:07 PM UTC - **Commit**: 13826b7b41995f89808a7b7644b41a89f81b33b6 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.305 to 6.0.305][1] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.305 to 6.0.305][1] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.305 to 6.0.305][1] - **Microsoft.TemplateEngine.Cli**: [from 6.0.305-servicing.22470.3 to 6.0.305-servicing.22476.13][1] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.305 to 6.0.305][1] - **Microsoft.TemplateEngine.Utils**: [from 6.0.305 to 6.0.305][1] - **Microsoft.TemplateSearch.Common**: [from 6.0.305 to 6.0.305][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCa596312&targetVersion=GC13826b7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:2e2c41e3-4520-418e-d824-08da180b2c46) [marker]: <> (Begin:dc1c3afc-aa30-466e-4d3a-08da180de348) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: dc1c3afc-aa30-466e-4d3a-08da180de348 - **Build**: 20220926.5 - **Date Produced**: September 26, 2022 9:30:53 PM UTC - **Commit**: 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC3bd501a&targetVersion=GC5a400c2&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:dc1c3afc-aa30-466e-4d3a-08da180de348)
…dnceng/internal/dotnet-aspnetcore dnceng/internal/dotnet-templating This pull request updates the following dependencies [marker]: <> (Begin:ffc11ea2-d045-4ff5-4d39-08da180de348) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffc11ea2-d045-4ff5-4d39-08da180de348 - **Build**: 20220926.12 - **Date Produced**: September 26, 2022 11:42:31 PM UTC - **Commit**: 9efc206d0eec75172819678bbc4899d55ba01e9c - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] - **dotnet-user-secrets**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] - **Microsoft.AspNetCore.Analyzers**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.Authorization**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.Components.Web**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] - **Microsoft.AspNetCore.TestHost**: [from 6.0.10 to 6.0.10][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0.10 to 6.0.10][1] - **Microsoft.JSInterop**: [from 6.0.10 to 6.0.10][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC3678930&targetVersion=GC9efc206&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ffc11ea2-d045-4ff5-4d39-08da180de348) [marker]: <> (Begin:2e2c41e3-4520-418e-d824-08da180b2c46) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: 2e2c41e3-4520-418e-d824-08da180b2c46 - **Build**: 20220926.20 - **Date Produced**: September 26, 2022 11:58:43 PM UTC - **Commit**: 4c6436d0fb4378537a091f06432b306ea8ef383e - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.305 to 6.0.305][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.305 to 6.0.305][2] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.305 to 6.0.305][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.305-servicing.22476.13 to 6.0.305-servicing.22476.20][2] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: ...
…dnceng/internal/dotnet-aspnetcore dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:ffc11ea2-d045-4ff5-4d39-08da180de348) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffc11ea2-d045-4ff5-4d39-08da180de348 - **Build**: 20220926.17 - **Date Produced**: September 27, 2022 2:14:59 AM UTC - **Commit**: 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] - **dotnet-user-secrets**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] - **Microsoft.AspNetCore.Analyzers**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.Authorization**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.Components.Web**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] - **Microsoft.AspNetCore.TestHost**: [from 6.0.10 to 6.0.10][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0.10 to 6.0.10][1] - **Microsoft.JSInterop**: [from 6.0.10 to 6.0.10][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC9efc206&targetVersion=GC32e8c8c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ffc11ea2-d045-4ff5-4d39-08da180de348) [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.Sdk.WindowsDesktop**: from 6.0.10-servicing.22470.7 to 6.0.10-servicing.22476.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:d1814f0c-875d-4709-e94c-08da181a39e5) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: d18...
…-merge-6.0.3xx-2022-10-11-1013
….0.3xx-2022-10-11-1013 Merging internal commits for release/6.0.3xx
dotnet-maestro-bot
force-pushed
the
merge/release/6.0.3xx-to-release/6.0.4xx
branch
from
1ffe2b1 to
b85f6b7
Compare
ghost
added
the
|
I think we should close this as its a dupe of #28469, all of the changes were made internally to release so the branches still have these changes, but updated to their specific code changes, which each branch has slightly different changes |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I detected changes in the release/6.0.3xx branch which have not been merged yet to release/6.0.4xx. I'm a robot and am configured to help you automatically keep release/6.0.4xx up to date, so I've opened this PR.
This PR merges commits made on release/6.0.3xx by the following committers:
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
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.3xx-to-release/6.0.4xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
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.