-
Notifications
You must be signed in to change notification settings - Fork 437
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' #14870
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
dotnet-maestro-bot
wants to merge
30
commits into
dotnet:release/7.0.1xx
from
dotnet-maestro-bot:merge/release/6.0.4xx-to-release/7.0.1xx
Closed
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' #14870
dotnet-maestro-bot
wants to merge
30
commits into
dotnet:release/7.0.1xx
from
dotnet-maestro-bot:merge/release/6.0.4xx-to-release/7.0.1xx
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
…ld-reference-packages
…otnet-sdk build 20220901.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.304-servicing.22451.9
…otnet-sdk build 20220906.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22456.40
…otnet-sdk build 20220907.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22457.5
…otnet-sdk build 20220908.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22458.13
…otnet-sdk build 20220912.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22462.31
…otnet-sdk build 20220913.34 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22463.34
…otnet-sdk build 20220913.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22463.41
…otnet-sdk build 20220914.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22464.21 Dependency coherency updates NuGet.Build.Tasks From Version 6.2.1-rc.7 -> To Version 6.2.2-rc.1 (parent: Microsoft.NET.Sdk
…dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220914.21 - **Date Produced**: September 14, 2022 3:41:14 PM UTC - **Commit**: 2336f3a - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.304-servicing.22421.4 to 6.0.305-servicing.22464.21][8] - **Microsoft.NET.Sdk**: [from 6.0.304-servicing.22421.4 to 6.0.305-servicing.22464.21][8] - **NuGet.Build.Tasks**: [from 6.2.1-rc.7 to 6.2.2-rc.1][9] [8]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC092f7d6&targetVersion=GC2336f3a&_a=files [9]: https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted/branches?baseVersion=GC4be14ee&targetVersion=GC027ca8b&_a=files [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**: - **NuGet.Build.Tasks**: from 6.2.1-rc.7 to 6.2.2-rc.1 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates)
…913.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22412.2 -> To Version 6.0.0-beta.22463.7
…dotnet/arcade This pull request updates the following dependencies [marker]: <> (Begin:6d383863-e2a5-4edc-fb90-08da32c10934) ## From https://github.com/dotnet/arcade - **Subscription**: 6d383863-e2a5-4edc-fb90-08da32c10934 - **Build**: 20220913.7 - **Date Produced**: September 14, 2022 2:42:03 AM UTC - **Commit**: 2fbe602d12256bf82de53791ddcbb964c1541b4e - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.22412.2 to 6.0.0-beta.22463.7][1] - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.22412.2 to 6.0.0-beta.22463.7][1] - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.22412.2 to 6.0.0-beta.22463.7][1] [1]: dotnet/arcade@41323ec...2fbe602 [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates tools.dotnet to 6.0.109 [marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934)
…dotnet/source-build-reference-packages This pull request updates the following dependencies [marker]: <> (Begin:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) ## From https://github.com/dotnet/source-build-reference-packages - **Subscription**: 4fe19a4b-6691-493a-bfdf-08da32c0fb1e - **Build**: 20220914.1 - **Date Produced**: September 14, 2022 8:48:10 PM UTC - **Commit**: 59e601c150793f6a32cd39e598ba6fe94edfe21d - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22426.1 to 6.0.0-servicing.22464.1][5] [5]: dotnet/source-build-reference-packages@e45e6e2...59e601c [DependencyUpdate]: <> (End) [marker]: <> (End:4fe19a4b-6691-493a-bfdf-08da32c0fb1e)
…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.Build**: from 17.2.0 to 17.2.2 (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**: 20220919.16 - **Date Produced**: September 19, 2022 7:26:24 PM UTC - **Commit**: edd49c1 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22464.21 to 6.0.305-servicing.22469.16][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22464.21 to 6.0.305-servicing.22469.16][1] - **Microsoft.Build**: [from 17.2.0 to 17.2.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2336f3a&targetVersion=GCedd49c1&_a=files [2]: https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted/branches?baseVersion=GC41abc56&targetVersion=GC038f9ba&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
…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.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.304 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.304-servicing.22420.10 to 6.0.305-servicing.22470.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.304 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win...
…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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.305 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.305-servicing.22470.3 to 6.0.305-servicing.22476.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.305 to 6.0.305 (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**: 20220926.23 - **Date Produced**: September 26, 2022 11:16:43 PM UTC - **Commit**: 5d8812a - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22470.36 to 6.0.305-servicing.22476.23][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22470.36 to 6.0.305-servicing.22476.23][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Host.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] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.305 to 6.0.305][3] - **Microsoft.TemplateEngine.Cl...
…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.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.305 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.305-servicing.22476.13 to 6.0.305-servicing.22476.20 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.305 to 6.0.305 (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**: 20220926.32 - **Date Produced**: September 27, 2022 1:41:11 AM UTC - **Commit**: 5fd3362 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22476.23 to 6.0.305-servicing.22476.32][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22476.23 to 6.0.305-servicing.22476.32][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-dev-certs**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-user-secrets**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.305 to 6.0.305][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.305-servicing.22476.13 to 6.0.305-servicing.2247...
…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.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22470.3 to 6.0.10-servicing.22476.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: 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:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220926.47 - **Date Produced**: September 27, 2022 3:41:49 AM UTC - **Commit**: 0c33071 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22476.32 to 6.0.305-servicing.22476.47][1] - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22476.32 to 6.0.305-servicing.22476.47][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-...
…-merge-6.0.3xx-2022-10-11-1010
….0.3xx-2022-10-11-1010 Merging internal commits for release/6.0.3xx
…/6.0.3xx-to-release/6.0.4xx [automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
…et#14807) * Merged PR 25462: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220919.14 - **Date Produced**: September 19, 2022 7:24:58 PM UTC - **Commit**: 020b4fd - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23] - **Microsoft.NET.Sdk**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.9 to 6.0.10][24] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24] - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.10][25] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.9 to 6.0.10][25] - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.6][26] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.9 to 6.0.10][27] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][27] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **dotnet-dev-certs**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **dotnet-user-secrets**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.109 to 6.0.110][28] - **Microsoft.TemplateEngine.Cli**: [from 6.0.109-servicing.22420.11 to 6.0.110-servicing.22464.25][28] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.109 to 6.0.110][28] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.9-servicing.22420.4 to 6.0.10-servicing.22456.13][29] - **Microsoft.Build**: [from 17.0.0 to 17.0.1][30] - **NuGet.Build.Tasks**: [from 6.0.2-rc.5 to 6.0.3-rc.1][31] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25] [23]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7fffe6d&targetVersion=GC020b4fd&_a=files [24]: https://dev.azure.com/dnceng/inte... * Merged PR 26041: [internal/release/6.0.1xx] Update dependencies from 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.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22463.20 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22464.25 to 6.0.110-servicing.22470.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22456... * Merged PR 26213: [internal/release/6.0.1xx] Update dependencies from 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.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220926.22 - **Date Produced**: September 26, 2022 11:14:22 PM UTC - **Commit**: 4041520 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Host.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] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12][3] - **Microsoft.DotNet.Common.ProjectTemplates.6.0*... * Merged PR 26229: [internal/release/6.0.1xx] Update dependencies from 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.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22476.12 to 6.0.110-servicing.22476.19 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220926.31 - **Date Produced**: September 27, 2022 1:37:52 AM UTC - **Commit**: cb11e73 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-dev-certs**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **dotnet-user-secrets**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22476.12 to 6.0.110-servicing.2247... * Merged PR 26243: [internal/release/6.0.1xx] Update dependencies from 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.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22470.3 to 6.0.10-servicing.22476.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: 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:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220926.46 - **Date Produced**: September 27, 2022 3:39:36 AM UTC - **Commit**: a886cd6 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1] - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-... * Update source-build tarball CI to utilize faster build agents (dotnet#14795) Co-authored-by: dotnet-bot <[email protected]> Co-authored-by: DotNet Bot <[email protected]> Co-authored-by: Sean Reeser <[email protected]> Co-authored-by: Marc Paine <[email protected]> Co-authored-by: Matt Mitchell <[email protected]> Co-authored-by: Jason Zhai <[email protected]> Co-authored-by: v-wuzhai <[email protected]> Co-authored-by: Michael Simons <[email protected]>
…-2022-11-01-1417 Update branding to 6.0.404
755132c to
93f8515
Compare
|
@dotnet/source-build-internal Could you help to confirm if we need to merge the change into 7.0.1xx? |
Member
|
We do not want this change. In fact I need to open a PR to fix 6.0 to match 7.0. |
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.4xx branch which have not been merged yet to release/7.0.1xx. I'm a robot and am configured to help you automatically keep release/7.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:
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.4xx-to-release/7.0.1xx'. 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.