Merging internal commits for release/6.0 #8656
Merged
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-winforms build 20231109.9 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.25-servicing.23519.16 -> To Version 6.0.26-servicing.23559.9
…otnet-winforms build 20231109.7 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.25-servicing.23519.16 -> To Version 6.0.26-servicing.23559.7
…otnet-winforms build 20231108.10 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.26-servicing.23559.7 -> To Version 6.0.26-servicing.23558.10
…otnet-winforms build 20231107.8 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.26-servicing.23558.10 -> To Version 6.0.26-servicing.23557.8
…otnet-winforms build 20231114.8 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.25-servicing.23519.16 -> To Version 6.0.26-servicing.23564.8
…otnet-winforms build 20231120.12 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.25-servicing.23519.16 -> To Version 6.0.26-servicing.23570.12
…otnet-winforms build 20231120.17 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.25-servicing.23519.16 -> To Version 6.0.26-servicing.23570.17 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.25-servicing.23519.12 -> To Version 6.0.26-servicing.23570.14 (parent: Microsoft.Private.Winforms
…ng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20231120.17 - **Date Produced**: November 20, 2023 11:33:57 PM UTC - **Commit**: b9c0c2fab80f70deeff43070def4ca646f5dbb9d - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.25-servicing.23519.16 to 6.0.26-servicing.23570.17][7] - **Microsoft.Private.Winforms**: [from 6.0.25-servicing.23519.16 to 6.0.26-servicing.23570.17][7] - **Microsoft.NETCore.ILDAsm**: [from 6.0.25-servicing.23519.12 to 6.0.26-servicing.23570.14][8] - **Microsoft.NETCore.ILAsm**: [from 6.0.25-servicing.23519.12 to 6.0.26-servicing.23570.14][8] - **Microsoft.NETCore.App.Ref**: [from 6.0.25 to 6.0.26][8] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.25 to 6.0.26][8] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.25-servicing.23519.12 to 6.0.26-servicing.23570.14][8] [7]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCd4ee94199a&targetVersion=GCb9c0c2fab8&_a=files [8]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC492abbeef0&targetVersion=GC88c49c9217&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) [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.ILDAsm**: from 6.0.25-servicing.23519.12 to 6.0.26-servicing.23570.14 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.25-servicing.23519.12 to 6.0.26-servicing.23570.14 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.25 to 6.0.26 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.25 to 6.0.26 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.25-servicing.23519.12 to 6.0.26-servicing.23570.14 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates)
…otnet-winforms build 20231122.3 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.26-servicing.23570.17 -> To Version 6.0.26-servicing.23572.3 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.26-servicing.23570.14 -> To Version 6.0.26-servicing.23571.26 (parent: Microsoft.Private.Winforms
…ng/internal/dotnet-winforms 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.ILDAsm**: from 6.0.26-servicing.23570.14 to 6.0.26-servicing.23571.26 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.26-servicing.23570.14 to 6.0.26-servicing.23571.26 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23570.14 to 6.0.26-servicing.23571.26 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20231122.3 - **Date Produced**: November 22, 2023 3:48:14 PM UTC - **Commit**: a8858b3bd517bee2890d68b56812c05a055f8e49 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.26-servicing.23570.17 to 6.0.26-servicing.23572.3][1] - **Microsoft.Private.Winforms**: [from 6.0.26-servicing.23570.17 to 6.0.26-servicing.23572.3][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.26-servicing.23570.14 to 6.0.26-servicing.23571.26][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.26-servicing.23570.14 to 6.0.26-servicing.23571.26][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23570.14 to 6.0.26-servicing.23571.26][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCb9c0c2fab8&targetVersion=GCa8858b3bd5&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC88c49c9217&targetVersion=GC40bd47545e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
Adding a check to return NotValidForUsage status when there is an internal failure occurred in chain.Build
The internal-code-merge pipeline couldn't mirror these changes because of a git conflict
…t-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.26-servicing.23571.26 to 6.0.26-servicing.23572.29 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.26-servicing.23571.26 to 6.0.26-servicing.23572.29 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.26 to 6.0.26 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.26 to 6.0.26 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.26-servicing.23571.26 to 6.0.26-servicing.23572.29 (parent: Microsoft.Private.Winforms)
…otnet-winforms build 20231205.5 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.26-servicing.23573.4 -> To Version 6.0.26-servicing.23605.5 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.26-servicing.23572.29 -> To Version 6.0.26-servicing.23605.8 (parent: Microsoft.Private.Winforms
…ng/internal/dotnet-winforms 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.ILDAsm**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20231205.5 - **Date Produced**: December 5, 2023 10:02:50 PM UTC - **Commit**: c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.26-servicing.23573.4 to 6.0.26-servicing.23605.5][1] - **Microsoft.Private.Winforms**: [from 6.0.26-servicing.23573.4 to 6.0.26-servicing.23605.5][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCb4d268210a&targetVersion=GCc309ca06b8&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC965a793efc&targetVersion=GCdc45e96840&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
…-merge-6.0-2024-01-09-1130
ghost
assigned
ghost
requested review from
singhashish-wpf
approved these changes
Jan 10, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 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.
null
Microsoft Reviewers: Open in CodeFlow