Merging internal commits for release/6.0 #8017
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
WPF MSRC Fix port for CVE-2023-24895
…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**: 20230412.4 - **Date Produced**: April 12, 2023 6:20:51 PM UTC - **Commit**: 80a66e5fac1dbdd9604c201212bf2a866e3705ce - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23212.4][3] - **Microsoft.Private.Winforms**: [from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23212.4][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC357cdc523d&targetVersion=GC80a66e5fac&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
…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.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (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**: 20230413.3 - **Date Produced**: April 13, 2023 7:00:15 PM UTC - **Commit**: 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23212.4 to 6.0.17-servicing.23213.3][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23212.4 to 6.0.17-servicing.23213.3][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.16 to 6.0.17][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.17][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC80a66e5fac&targetVersion=GC1960d9e6b9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1e620a42e7&targetVersion=GCea0418c9be&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
…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.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (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**: 20230418.1 - **Date Produced**: April 18, 2023 3:25:39 PM UTC - **Commit**: 455077d161050f52799300d335ac47d53b6cfedb - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.17][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.17][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1960d9e6b9&targetVersion=GC455077d161&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCea0418c9be&targetVersion=GC6e89d2b65b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
…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**: 20230502.5 - **Date Produced**: May 2, 2023 6:56:09 PM UTC - **Commit**: 24e38444348603b9b97149b5e3ffb73f7baddc85 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23218.1 to 6.0.18-servicing.23252.5][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23218.1 to 6.0.18-servicing.23252.5][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC455077d161&targetVersion=GC24e3844434&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
…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.Platforms**: from 6.0.9 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (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**: 20230518.4 - **Date Produced**: May 18, 2023 5:31:07 PM UTC - **Commit**: bac4e66c4abaf7e2a20990556b315f015cd518ca - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23252.5 to 6.0.18-servicing.23268.4][1] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23252.5 to 6.0.18-servicing.23268.4][1] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.10][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.18][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.18][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC24e3844434&targetVersion=GCbac4e66c4a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1e620a42e7&targetVersion=GCe1d69ebd53&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC6e89d2b65b&targetVersion=GCe1d69ebd53&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
…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.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (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**: 20230518.8 - **Date Produced**: May 19, 2023 4:46:19 PM UTC - **Commit**: 9e5f193ed61f002d5d870df9c8b0b5e880fa595c - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.NETCore.Platforms**: [from 6.0.10 to 6.0.10][4] - **Microsoft.NETCore.ILDAsm**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] - **Microsoft.NETCore.ILAsm**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][4] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][4] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCbac4e66c4a&targetVersion=GC9e5f193ed6&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe1d69ebd53&targetVersion=GC01f26a7417&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
…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.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (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**: 20230522.1 - **Date Produced**: May 22, 2023 2:50:17 PM UTC - **Commit**: 865895cec5e8dc357b65c98a4a7af58643d10997 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][1] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][1] - **Microsoft.NETCore.Platforms**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC9e5f193ed6&targetVersion=GC865895cec5&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC01f26a7417&targetVersion=GCc76ac56549&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
…otnet-winforms build 20230613.5 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.18-servicing.23272.1 -> To Version 6.0.19-servicing.23313.5
…otnet-winforms build 20230613.12 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.18-servicing.23272.1 -> To Version 6.0.19-servicing.23313.12
…otnet-winforms build 20230614.6 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.18-servicing.23272.1 -> To Version 6.0.19-servicing.23314.6 Dependency coherency updates Microsoft.NETCore.Platforms,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.10 -> To Version 6.0.11 (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**: 20230614.6 - **Date Produced**: June 14, 2023 8:25:21 PM UTC - **Commit**: b1b9ae8774dbff146d4a0149a85229360e1d5dfd - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23272.1 to 6.0.19-servicing.23314.6][3] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23272.1 to 6.0.19-servicing.23314.6][3] - **Microsoft.NETCore.Platforms**: [from 6.0.10 to 6.0.11][4] - **Microsoft.NETCore.ILDAsm**: [from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25][4] - **Microsoft.NETCore.ILAsm**: [from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25][4] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.19][4] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.19][4] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC865895cec5&targetVersion=GCb1b9ae8774&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc76ac56549&targetVersion=GCfcf11495c6&_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.Platforms**: from 6.0.10 to 6.0.11 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.19 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.19 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates)
Merge from public release/6.0 to internal/release/6.0 and resolve conflicts if necessary
…otnet-winforms build 20230616.2 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.19-servicing.23314.6 -> To Version 6.0.19-servicing.23316.2
…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**: 20230616.2 - **Date Produced**: June 16, 2023 5:29:30 PM UTC - **Commit**: 4e9cc74519c57c5c4913459618f0dab2d6696ea1 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.19-servicing.23314.6 to 6.0.19-servicing.23316.2][1] - **Microsoft.Private.Winforms**: [from 6.0.19-servicing.23314.6 to 6.0.19-servicing.23316.2][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCb1b9ae8774&targetVersion=GC4e9cc74519&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
…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**: 20230620.10 - **Date Produced**: June 21, 2023 12:11:33 AM UTC - **Commit**: 2536781675df3fe4848e96605b0ee852fe3ee91b - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][2] - **Microsoft.Private.Winforms**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.11 to 6.0.11][3] - **Microsoft.NETCore.ILDAsm**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.19 to 6.0.20][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.19 to 6.0.20][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][3] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC4e9cc74519&targetVersion=GC2536781675&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCfcf11495c6&targetVersion=GCa08d9ce2ca&_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.Platforms**: from 6.0.11 to 6.0.11 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates)
…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**: 20230621.4 - **Date Produced**: June 21, 2023 5:20:08 PM UTC - **Commit**: 7f67c1539dcfa02ef740306820b44a713bdcb525 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][1] - **Microsoft.Private.Winforms**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC2536781675&targetVersion=GC7f67c1539d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
…-merge-6.0-2023-07-11-1022
ghost
requested review from
singhashish-wpf
approved these changes
Jul 12, 2023
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
null
Microsoft Reviewers: Open in CodeFlow