Merging internal commits for release/6.0 #4316
Merged
+28
−26
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
…otnet-wpf build 20240305.11 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 6.0.28-servicing.24120.2 -> To Version 6.0.29-servicing.24155.11
…otnet-wpf build 20240309.3 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 6.0.28-servicing.24120.2 -> To Version 6.0.29-servicing.24159.3 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Dotnet.WinForms.ProjectTemplates From Version 6.0.28-servicing.24120.4 -> To Version 6.0.29-servicing.24158.7 (parent: Microsoft.DotNet.Wpf.GitHub
…otnet-wpf build 20240311.6 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 6.0.28-servicing.24120.2 -> To Version 6.0.29-servicing.24161.6 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Dotnet.WinForms.ProjectTemplates From Version 6.0.28-servicing.24120.4 -> To Version 6.0.29-servicing.24158.7 (parent: Microsoft.DotNet.Wpf.GitHub
…ng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:5b48321b-d791-47a4-da08-08d961c27f17) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - **Subscription**: 5b48321b-d791-47a4-da08-08d961c27f17 - **Build**: 20240311.6 - **Date Produced**: March 11, 2024 8:38:28 PM UTC - **Commit**: 46dcf8720a1326a2c3f84b10a3d71ceb954cde70 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 6.0.28-servicing.24120.2 to 6.0.29-servicing.24161.6][4] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.28-servicing.24120.2 to 6.0.29-servicing.24161.6][4] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.28-servicing.24120.2 to 6.0.29-servicing.24161.6][4] - **Microsoft.Private.Winforms**: [from 6.0.28-servicing.24120.4 to 6.0.29-servicing.24158.7][5] - **Microsoft.Private.Winforms**: [from 6.0.28-servicing.24120.4 to 6.0.29-servicing.24158.7][5] - **Microsoft.Private.Winforms**: [from 6.0.28-servicing.24120.4 to 6.0.29-servicing.24158.7][5] - **Microsoft.Private.Winforms**: [from 6.0.28-servicing.24120.4 to 6.0.29-servicing.24158.7][5] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.28-servicing.24120.4 to 6.0.29-servicing.24158.7][5] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC4bb3a1d8ec37eda521bbf94605c43b035d2718b1&targetVersion=GC46dcf8720a1326a2c3f84b10a3d71ceb954cde70&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC9de94bff9795bb0644835098b91e81edccfaa367&targetVersion=GCbf4b84dfe89000c252e2c287da991a522f62157e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5b48321b-d791-47a4-da08-08d961c27f17) [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.Private.Winforms**: from 6.0.28-servicing.24120.4 to 6.0.29-servicing.24158.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 6.0.28-servicing.24120.4 to 6.0.29-servicing.24158.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 6.0.28-servicing.24120.4 to 6.0.29-servicing.24158.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 6.0.28-servicing.24120.4 to 6.0.29-servicing.24158.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.28-servicing.24120.4 to 6.0.29-servicing.24158.7 (parent: Microsoft.DotNet.Wpf.GitHub) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) ...
…otnet-wpf build Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 6.0.29-servicing.24161.6 -> To Version 6.0.29-servicing.24168.9 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates From Version 6.0.29-servicing.24158.7 -> To Version 6.0.29-servicing.24165.6 (parent: Microsoft.DotNet.Wpf.GitHub
…ng/internal/dotnet-wpf 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.Private.Winforms**: from 6.0.29-servicing.24158.7 to 6.0.29-servicing.24165.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 6.0.28-servicing.24120.7 to 6.0.29-servicing.24164.14 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 6.0.29-servicing.24158.7 to 6.0.29-servicing.24165.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 6.0.28 to 6.0.29 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 6.0.29-servicing.24158.7 to 6.0.29-servicing.24165.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.28-servicing.24120.7 to 6.0.29-servicing.24164.14 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 6.0.29-servicing.24158.7 to 6.0.29-servicing.24165.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.28 to 6.0.29 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.29-servicing.24158.7 to 6.0.29-servicing.24165.6 (parent: Microsoft.DotNet.Wpf.GitHub) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5b48321b-d791-47a4-da08-08d961c27f17) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - **Subscription**: 5b48321b-d791-47a4-da08-08d961c27f17 - **Build**: - **Date Produced**: March 18, 2024 7:47:09 PM UTC - **Commit**: 573c73a5486beb4de70c4b628df1825540ea1d83 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 6.0.29-servicing.24161.6 to 6.0.29-servicing.24168.9][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.29-servicing.24161.6 to 6.0.29-servicing.24168.9][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.29-servicing.24161.6 to 6.0.29-servicing.24168.9][1] - **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24158.7 to 6.0.29-servicing.24165.6][2] - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 6.0.28-servicing.24120.7 to 6.0.29-servicing.24164.14][3] - **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24158.7 to 6.0.29-servicing.24165.6][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.28 to 6.0.29][3] - **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24158.7 to 6.0.29-servicing.24165.6][2] - **VS.Redi...
…otnet-wpf build Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 6.0.29-servicing.24168.9 -> To Version 6.0.29-servicing.24169.12 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates From Version 6.0.29-servicing.24165.6 -> To Version 6.0.29-servicing.24169.15 (parent: Microsoft.DotNet.Wpf.GitHub
…ng/internal/dotnet-wpf 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.Private.Winforms**: from 6.0.29-servicing.24165.6 to 6.0.29-servicing.24169.15 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 6.0.29-servicing.24164.14 to 6.0.29-servicing.24169.13 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 6.0.29-servicing.24165.6 to 6.0.29-servicing.24169.15 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 6.0.29 to 6.0.29 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 6.0.29-servicing.24165.6 to 6.0.29-servicing.24169.15 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24164.14 to 6.0.29-servicing.24169.13 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 6.0.29-servicing.24165.6 to 6.0.29-servicing.24169.15 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.29-servicing.24165.6 to 6.0.29-servicing.24169.15 (parent: Microsoft.DotNet.Wpf.GitHub) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5b48321b-d791-47a4-da08-08d961c27f17) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - **Subscription**: 5b48321b-d791-47a4-da08-08d961c27f17 - **Build**: - **Date Produced**: March 20, 2024 4:09:11 AM UTC - **Commit**: f3f959782e4e407301c19cd90dc0d1da329425bf - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 6.0.29-servicing.24168.9 to 6.0.29-servicing.24169.12][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.29-servicing.24168.9 to 6.0.29-servicing.24169.12][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.29-servicing.24168.9 to 6.0.29-servicing.24169.12][1] - **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24165.6 to 6.0.29-servicing.24169.15][2] - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 6.0.29-servicing.24164.14 to 6.0.29-servicing.24169.13][3] - **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24165.6 to 6.0.29-servicing.24169.15][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.29][3] - **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24165.6 to 6.0.29-servicing.24169.15][2] ...
…ng/internal/dotnet-wpf 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.Private.Winforms**: from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 6.0.29 to 6.0.29 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6 (parent: Microsoft.DotNet.Wpf.GitHub) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5b48321b-d791-47a4-da08-08d961c27f17) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - **Subscription**: 5b48321b-d791-47a4-da08-08d961c27f17 - **Build**: - **Date Produced**: March 22, 2024 1:15:20 AM UTC - **Commit**: 6aec9b95d59f97bae95b5a5814e3e53de7a0ccfc - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7][1] - **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6][2] - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5][3] - **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.29][3] - **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6][2] ...
…-merge-6.0-2024-04-09-1222
lonitra
approved these changes
Apr 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.