[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' #29531

dotnet-maestro-bot · 2022-12-13T23:09:05Z

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

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

dsplaisted
v-wuzhai
dotnet-maestro[bot]
marcpopMSFT
vseanreesermsft
javiercn
mmitche
tmds
omajid
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/7.0.1xx
git pull --ff-only
git checkout release/7.0.2xx
git pull --ff-only
git merge --no-ff release/7.0.1xx

# 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/7.0.1xx-to-release/7.0.2xx

or if you are using SSH

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

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/7.0.1xx-to-release/7.0.2xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

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

or if you are using SSH

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

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-windowsdesktop build 20221004.4 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.10 -> To Version 6.0.11

…otnet-aspnetcore build 20221004.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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.10-servicing.22476.17 -> To Version 6.0.11-servicing.22504.10

…otnet-aspnetcore build 20221004.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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.10-servicing.22476.17 -> To Version 6.0.11-servicing.22504.17

…otnet-aspnetcore build 20221004.21 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.10-servicing.22476.17 -> To Version 6.0.11-servicing.22504.21

…otnet-aspnetcore build 20221004.23 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.10-servicing.22476.17 -> To Version 6.0.11-servicing.22504.23

…otnet-aspnetcore build 20221004.24 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.10-servicing.22476.17 -> To Version 6.0.11-servicing.22504.24

…otnet-templating build 20221005.8 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.305 -> To Version 6.0.306

…otnet-aspnetcore build 20221005.2 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.10-servicing.22476.17 -> To Version 6.0.11-servicing.22505.2

…otnet-runtime build 20221005.10 Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.10-servicing.22476.5 -> To Version 6.0.11-servicing.22505.10

…otnet-runtime build 20221005.17 Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.10-servicing.22476.5 -> To Version 6.0.11-servicing.22505.17

…otnet-aspnetcore build 20221005.8 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.10-servicing.22476.17 -> To Version 6.0.11-servicing.22505.8

…otnet-templating build 20221006.4 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.305 -> To Version 6.0.306

…otnet-aspnetcore build 20221006.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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.10-servicing.22476.17 -> To Version 6.0.11-servicing.22506.4

…otnet-runtime build 20221006.9 Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.10-servicing.22476.5 -> To Version 6.0.11-servicing.22506.9

…otnet-aspnetcore build 20221007.1 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.10-servicing.22476.17 -> To Version 6.0.11-servicing.22507.1

…otnet-templating build 20221007.6 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.305 -> To Version 6.0.306

…otnet-runtime build 20221007.4 Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.10-servicing.22476.5 -> To Version 6.0.11-servicing.22507.4

…otnet-templating build 20221012.10 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.305 -> To Version 6.0.306

…otnet-windowsdesktop build 20221013.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.10 -> To Version 6.0.11

…otnet-windowsdesktop build 20221013.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.10 -> To Version 6.0.11

…4 repositories This pull request updates the following dependencies [marker]: <> (Begin:d1814f0c-875d-4709-e94c-08da181a39e5) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: d1814f0c-875d-4709-e94c-08da181a39e5 - **Build**: 20221013.9 - **Date Produced**: October 13, 2022 11:31:38 PM UTC - **Commit**: c71eacb109f176eb6a8b15d32424fafceaba6142 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.11][13] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.10 to 6.0.11][13] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.9][13] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.9][13] [13]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC74607da&targetVersion=GCc71eacb&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:d1814f0c-875d-4709-e94c-08da181a39e5) [marker]: <> (Begin:ffc11ea2-d045-4ff5-4d39-08da180de348) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffc11ea2-d045-4ff5-4d39-08da180de348 - **Build**: 20221011.16 - **Date Produced**: October 12, 2022 12:35:01 AM UTC - **Commit**: b786d2bbcc15b6841d407b3fb028d0006faa094b - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16][11] - **dotnet-user-secrets**: [from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16][11] - **Microsoft.AspNetCore.Analyzers**: [from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16][11] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.11][11] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16][11] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.11][11] - **Microsoft.AspNetCore.Authorization**: [from 6.0.10 to 6.0.11][11] - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.10 to 6.0.11][11] - **Microsoft.AspNetCore.Components.Web**: [from 6.0.10 to 6.0.11][11] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16][11] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16][11] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.10-servicing.22476.17 to 6.0.11-servicing.22511.16][11] - **Microsoft.AspNetCore.TestHost**: [from 6.0.10 to 6.0.11][11] - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0.10 to 6.0.11][11] - **Microsoft.JSInterop**: [from 6.0.10 to 6.0.11][11] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22476.17 to 6.0.11-s...

…otnet-runtime build 20221014.6 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.11-servicing.22507.4 -> To Version 6.0.11-servicing.22514.6

…dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:dc1c3afc-aa30-466e-4d3a-08da180de348) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: dc1c3afc-aa30-466e-4d3a-08da180de348 - **Build**: 20221014.6 - **Date Produced**: October 14, 2022 9:40:37 PM UTC - **Commit**: c672e901c8819a22123da5c0cb7295d914e70627 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 6.0.11-servicing.22507.4 to 6.0.11-servicing.22514.6][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][1] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][1] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.7][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22507.4 to 6.0.11-servicing.22514.6][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22507.4 to 6.0.11-servicing.22514.6][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCdd7c928&targetVersion=GCc672e90&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC5a400c2&targetVersion=GCc672e90&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:dc1c3afc-aa30-466e-4d3a-08da180de348)

…otnet-templating build 20221017.2 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.306 -> To Version 6.0.306

…dnceng/internal/dotnet-templating 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**: 20221017.2 - **Date Produced**: October 17, 2022 8:51:49 AM UTC - **Commit**: 9303db79522b69698068b6926d45b4c84fa6368f - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][1] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.306 to 6.0.306][1] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.306 to 6.0.306][1] - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22512.10 to 6.0.306-servicing.22517.2][1] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.306 to 6.0.306][1] - **Microsoft.TemplateEngine.Utils**: [from 6.0.306 to 6.0.306][1] - **Microsoft.TemplateSearch.Common**: [from 6.0.306 to 6.0.306][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC721ed1f&targetVersion=GC9303db7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:2e2c41e3-4520-418e-d824-08da180b2c46)

…dnceng/internal/dotnet-windowsdesktop 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.NET.Sdk.WindowsDesktop**: from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1 (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**: d1814f0c-875d-4709-e94c-08da181a39e5 - **Build**: 20221017.3 - **Date Produced**: October 17, 2022 7:21:10 PM UTC - **Commit**: 7b9c4cbc4933814b305208b573e700e55c600a57 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][3] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCc71eacb&targetVersion=GC7b9c4cb&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC3bbc772&targetVersion=GC8d60cc7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:d1814f0c-875d-4709-e94c-08da181a39e5)

…otnet-aspnetcore build 20221017.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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22507.1 -> To Version 6.0.11-servicing.22517.15

…097d-38e0-4b51-b31f-f2890fe76c0f [release/7.0.1xx] Update dependencies from dotnet/roslyn

…942e-2dcf-4c23-8537-d9443b272799 [release/7.0.1xx] Update dependencies from dotnet/format

Update the target framework for the desktop test projects

…from-baselines-7100 [ASP.NET] Remove versions from baselines (dotnet#29093)

…d40e-55d2-44b3-9c24-6bda049ce8a1 [release/7.0.1xx] Update dependencies from dotnet/linker

…130.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.4.0-6.22579.3 -> To Version 4.4.0-6.22580.3

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

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

…130.4 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.4.0-6.22579.3 -> To Version 4.4.0-6.22580.4

[release/7.0.1xx] Update man pages post 7.0 GA

…3389-bc9e-43aa-907d-fcb6f6fbfa85 [release/7.0.1xx] Update dependencies from dotnet/roslyn

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

…1201.6 (dotnet#29342) [release/7.0.1xx] Update dependencies from dotnet/msbuild

…ex.json Update releases-index.json

dsplaisted · 2022-12-14T19:45:14Z

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets

-    <!-- Turn on IncludeProjectsNotInAssetsFileInDepsFile by default. -->
-    <IncludeProjectsNotInAssetsFileInDepsFile Condition="'$(IncludeProjectsNotInAssetsFileInDepsFile)' == ''">true</IncludeProjectsNotInAssetsFileInDepsFile>
+    <!-- Turn off IncludeProjectsNotInAssetsFileInDepsFile by default. -->
+    <IncludeProjectsNotInAssetsFileInDepsFile Condition="'$(IncludeProjectsNotInAssetsFileInDepsFile)' == ''">false</IncludeProjectsNotInAssetsFileInDepsFile>


This change should be reverted, we want the property on by default in 7.0.2xx and forward.

Context:

Deps.json should include project references that aren't present in project.assets.json #28963

Deps.json should include project references that aren't present in project.assets.json #29095

@v-wuzhai Can you fix this?

dotnet-bot and others added 30 commits October 4, 2022 18:40

Merge in 'release/6.0.3xx' changes

2d089db

Merge in 'release/6.0.3xx' changes

22dc8bd

Merge in 'release/6.0.3xx' changes

ee49811

marcpopMSFT and others added 17 commits November 29, 2022 14:14

Merge pull request dotnet#29178 from dotnet/darc-release/7.0.1xx-0cdd…

5b79f79

…097d-38e0-4b51-b31f-f2890fe76c0f [release/7.0.1xx] Update dependencies from dotnet/roslyn

Merge pull request dotnet#29202 from dotnet/darc-release/7.0.1xx-bd2a…

c43d17d

…942e-2dcf-4c23-8537-d9443b272799 [release/7.0.1xx] Update dependencies from dotnet/format

Merge pull request dotnet#28932 from dotnet/Jason/UpdateTFM

fc8b78c

Update the target framework for the desktop test projects

Merge pull request dotnet#29119 from dotnet/javiercn/remove-versions-…

93aa9f1

…from-baselines-7100 [ASP.NET] Remove versions from baselines (dotnet#29093)

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

c352fb2

Merge pull request dotnet#29279 from dotnet/darc-release/7.0.1xx-084d…

7a1e7a7

…d40e-55d2-44b3-9c24-6bda049ce8a1 [release/7.0.1xx] Update dependencies from dotnet/linker

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

1c082c6

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

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

2890963

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

Merge pull request dotnet#29032 from omajid/update-man-pages-post-7.0-ga

29c8d9d

[release/7.0.1xx] Update man pages post 7.0 GA

Merge pull request dotnet#29312 from dotnet/darc-release/7.0.1xx-8bb5…

9085050

…3389-bc9e-43aa-907d-fcb6f6fbfa85 [release/7.0.1xx] Update dependencies from dotnet/roslyn

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

931a966

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

06a5cd1

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

Update dependencies from https://github.com/dotnet/msbuild build 2022…

5f02c0c

…1201.6 (dotnet#29342) [release/7.0.1xx] Update dependencies from dotnet/msbuild

Update releases-index.json

9eec249

Merge pull request dotnet#29445 from dotnet/Jason/Update-releases-ind…

c4280df

…ex.json Update releases-index.json

dotnet-maestro-bot requested review from a team, AntonLapounov, captainsafia and mkArtakMSFT as code owners December 13, 2022 23:09

ghost added the Area-Infrastructure label Dec 13, 2022

Merge branch 'release/7.0.1xx' into release/7.0.2xx

5176c03

v-wuzhai force-pushed the merge/release/7.0.1xx-to-release/7.0.2xx branch from d76f9ad to 5176c03 Compare December 14, 2022 08:13

v-wuzhai requested a review from marcpopMSFT December 14, 2022 09:42

dsplaisted requested changes Dec 14, 2022

View reviewed changes

Turn on IncludeProjectsNotInAssetsFileInDepsFile by default

cda43e5

dsplaisted approved these changes Dec 16, 2022

View reviewed changes

dsplaisted merged commit 0b6a381 into dotnet:release/7.0.2xx Dec 16, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' #29531

[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' #29531

Uh oh!

dotnet-maestro-bot commented Dec 13, 2022

Uh oh!

dsplaisted Dec 14, 2022

Uh oh!

dsplaisted Dec 15, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' #29531

[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' #29531

Uh oh!

Conversation

dotnet-maestro-bot commented Dec 13, 2022

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

dsplaisted Dec 14, 2022

Choose a reason for hiding this comment

Uh oh!

dsplaisted Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants