Merging internal commits for release/6.0.3xx #17487
Merged
Conversation
This file contains 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
…otnet-sdk build 20230927.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.318-servicing.23477.33 Dependency coherency updates 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 From Version 6.0.21-servicing.23363.11 -> To Version 6.0.23-servicing.23475.15 (parent: Microsoft.NET.Sdk
…ncies 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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.21-servicing.23363.11 to 6.0.23-servicing.23475.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.21 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.21-servicing.23363.11 to 6.0.23-servicing.23475.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.21 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.21 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.21 to 6.0.23 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:faa69491-4c9a-4477-752f-08dbbf92e774) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: faa69491-4c9a-4477-752f-08dbbf92e774 - **Build**: 20230927.33 - **Date Produced**: September 27, 2023 11:45:51 PM UTC - **Commit**: c275f388513a7ca17defaea62bb9ac8a275a59d7 - **Branch**: refs/heads/internal/release/frameshift/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.316-servicing.23367.14 to 6.0.318-servicing.23477.33][1] - **Microsoft.NET.Sdk**: [from 6.0.316-servicing.23367.14 to 6.0.318-servicing.23477.33][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.21-servicing.23363.11 to 6.0.23-servicing.23475.15][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.21 to 6.0.23][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.21-servicing.23363.11 to 6.0.23-servicing.23475.15][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.21 to 6.0.23][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.21 to 6.0.23][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.21 to 6.0.23][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC68456cae29&targetVersion=GCc275f38851&_a=files [2]: dotnet/runtime@e40b3ab...301ba1e [DependencyUpdate]: <> (End) [marker]: <> (End:faa69491-4c9a-4477-752f-08dbbf92e774)
…otnet-sdk build 20230927.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.33 -> To Version 6.0.318-servicing.23477.41
…otnet-sdk build 20230927.53 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.41 -> To Version 6.0.318-servicing.23477.53
…otnet-sdk build 20230927.57 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.53 -> To Version 6.0.318-servicing.23477.57
Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk
…ncies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:faa69491-4c9a-4477-752f-08dbbf92e774) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: faa69491-4c9a-4477-752f-08dbbf92e774 - **Build**: 20230927.57 - **Date Produced**: September 28, 2023 3:16:47 AM UTC - **Commit**: c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 - **Branch**: refs/heads/internal/release/frameshift/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.318-servicing.23477.53 to 6.0.318-servicing.23477.57][3] - **Microsoft.NET.Sdk**: [from 6.0.318-servicing.23477.53 to 6.0.318-servicing.23477.57][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCcccbf1c1f1&targetVersion=GCc99358f96c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:faa69491-4c9a-4477-752f-08dbbf92e774) [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.21 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.21-servicing.23367.3 to 6.0.23-servicing.23477.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.21-servicing.23367.3 to 6.0.23-servicing.23477.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.21 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.21-servicing.23364.38 to 6.0.23-servicing.23477.22 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.21 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.21-servicing.23364.38 to 6.0.23-servicing.23477.22 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.21-servicing.23364.38 to 6.0.23-servicing.23477.22 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.21-servicing.23364.38 to 6.0.23-servicing.23477.22 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.316 to 6.0.318 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.316-servicing.23363.10 to 6.0.318-servicing.23477.13 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.316 to 6.0.318 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.21 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.21-servicin...
…otnet-sdk build 20230929.69 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.57 -> To Version 6.0.318-servicing.23479.69 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,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,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.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.23 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk
…ncies 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.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.23-servicing.23477.7 to 6.0.23-servicing.23479.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.23-servicing.23477.7 to 6.0.23-servicing.23479.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23475.15 to 6.0.23-servicing.23479.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.23-servicing.23475.15 to 6.0.23-servicing.23479.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.23-servicing.23477.22 to 6.0.23-servicing.23479.20 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23477.22 to 6.0.23-servicing.23479.20 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.23-servicing.23477.22 to 6.0.23-servicing.23479.20 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.23-servicing.23477.22 to 6.0.23-servicing.23479.20 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.318 to 6.0.318 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.318-servicing.23477.13 to 6.0.318-servicing.23479.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.318 to 6.0.318 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.23-servicing.23477.14 to 6.0.23-servicing.23479.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.23-servicing.23477.3 to 6.0.23-servicing.23479.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:faa69491-4c9a-4477-752f-08dbbf92e774) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: faa6949...
…otnet-sdk build 20230929.28 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.69 -> To Version 6.0.318-servicing.23479.28
…otnet-sdk build 20230929.38 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.28 -> To Version 6.0.318-servicing.23479.38
…otnet-sdk build 20230929.46 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.38 -> To Version 6.0.318-servicing.23479.46
…otnet-sdk build 20230929.55 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.46 -> To Version 6.0.318-servicing.23479.55
…otnet-sdk build 20230929.69 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.55 -> To Version 6.0.318-servicing.23479.69
…ncies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:faa69491-4c9a-4477-752f-08dbbf92e774) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: faa69491-4c9a-4477-752f-08dbbf92e774 - **Build**: 20230929.69 - **Date Produced**: September 30, 2023 5:33:01 AM UTC - **Commit**: 9f5cb3400f5877845decdddd2c17d57cf77f2202 - **Branch**: refs/heads/internal/release/frameshift/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.318-servicing.23479.55 to 6.0.318-servicing.23479.69][5] - **Microsoft.NET.Sdk**: [from 6.0.318-servicing.23479.55 to 6.0.318-servicing.23479.69][5] [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC556a86c411&targetVersion=GC9f5cb3400f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:faa69491-4c9a-4477-752f-08dbbf92e774)
…ncies 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.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.318 to 6.0.318 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.318-servicing.23479.12 to 6.0.318-servicing.23480.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.318 to 6.0.318 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.23-servicing.23479.10 to 6.0.23-servicing.23480.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft....
…ncies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:faa69491-4c9a-4477-752f-08dbbf92e774) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: faa69491-4c9a-4477-752f-08dbbf92e774 - **Build**: 20230930.39 - **Date Produced**: October 1, 2023 1:52:26 AM UTC - **Commit**: 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 - **Branch**: refs/heads/internal/release/frameshift/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.318-servicing.23480.29 to 6.0.318-servicing.23480.39][1] - **Microsoft.NET.Sdk**: [from 6.0.318-servicing.23480.29 to 6.0.318-servicing.23480.39][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC080adee382&targetVersion=GC40c58ac25e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:faa69491-4c9a-4477-752f-08dbbf92e774)
…-merge-6.0.3xx-2023-10-10-1025
marcpopMSFT
approved these changes
Oct 10, 2023
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.
No description provided.