Merging internal commits for release/8.0 #5026
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
…ternal/release/8.0 dotnet#4932 conflicts resolved in favor of the internal branch
Merge from public release/8.0 to internal/release/8.0 and resolve conflicts if necessary ---- #### AI description (iteration 1) #### PR Classification Release update. #### PR Summary This pull request updates various dependencies and tool versions for the 8.0 release. - `Version.Details.xml`: Updated versions and SHA values for multiple dependencies. - `Versions.props`: Updated versions for several Microsoft.DotNet build tasks. - `global.json`: Updated `dotnet` and SDK versions. - `tools.ps1` and `sdk-task.ps1`: Updated default MSBuild version to 17.12.0. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
Updated Versions.props - BuildTasks/VersionTools 8.0.0-beta.25111.4 These arcade updates got reverted during a merge. https://dnceng.visualstudio.com/internal/_git/dotnet-windowsdesktop/pullRequest/48360#1741806807 https://dnceng.visualstudio.com/internal/_git/dotnet-windowsdesktop/pullRequest/48360#1741806882 ---- #### AI description (iteration 2) #### PR Classification Dependency update #### PR Summary This pull request updates the versions of several Arcade dependencies to newer beta versions. - Changes in `/eng/Versions.props` to update Arcade dependencies to version `8.0.0-beta.25111.4` <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…otnet-wpf build 20250313.3 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.15-servicing.25156.10 -> To Version 8.0.15-servicing.25163.3 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.8.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,System.Drawing.Common From Version 8.0.14-servicing.25112.9 -> To Version 8.0.15-servicing.25163.3 (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 8.0.14-servicing.25112.9 to 8.0.15-servicing.25163.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 8.0.14-servicing.25111.18 to 8.0.15-servicing.25162.16 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 8.0.14-servicing.25112.9 to 8.0.15-servicing.25163.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 8.0.14 to 8.0.15 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 8.0.14-servicing.25112.9 to 8.0.15-servicing.25163.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.14-servicing.25111.18 to 8.0.15-servicing.25162.16 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 8.0.14-servicing.25112.9 to 8.0.15-servicing.25163.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.14 to 8.0.15 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.14-servicing.25112.9 to 8.0.15-servicing.25163.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.14-servicing.25112.9 to 8.0.15-servicing.25163.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.14-servicing.25112.9 to 8.0.15-servicing.25163.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.14-servicing.25112.9 to 8.0.15-servicing.25163.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.14-servicing.25112.9 to 8.0.15-servicing.25163.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.14-servicing.25112.9 to 8.0.15-servicing.25163.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.14-servicing.25112.9 to 8.0.15-servicing.25163.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.14-servicing.25112.9 to 8.0.15-servicing.25163.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.14-servicing.25112.9 to 8.0.15-servicing.25163.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Diagnostics.EventLog**: from 8.0.1 to 8.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 8.0.14-servicing.25112.9 to 8.0.15-servicing.25163.3 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms*...
…otnet-wpf build 20250315.2 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.15-servicing.25163.3 -> To Version 8.0.15-servicing.25165.2 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.8.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,System.Drawing.Common From Version 8.0.15-servicing.25163.3 -> To Version 8.0.15-servicing.25165.1 (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 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.1 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 8.0.15-servicing.25162.16 to 8.0.15-servicing.25164.13 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.1 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 8.0.15 to 8.0.15 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.1 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.15-servicing.25162.16 to 8.0.15-servicing.25164.13 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.1 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.15 to 8.0.15 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.1 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.1 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.1 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.1 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.1 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.1 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.1 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.1 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.1 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Diagnostics.EventLog**: from 8.0.2 to 8.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 8.0.15-servicing.25163.3 to 8.0.15-servicing.25165.1 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms*...
…otnet-wpf build 20250317.5 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.15-servicing.25165.2 -> To Version 8.0.15-servicing.25167.5
…ng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:05a9f0d5-ba2f-4c32-efac-08dbd545292d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - **Subscription**: 05a9f0d5-ba2f-4c32-efac-08dbd545292d - **Build**: [20250317.5](https://dev.azure.com/dnceng/internal/_build/results?buildId=2665579) - **Date Produced**: March 17, 2025 4:48:43 PM UTC - **Commit**: [b929fc7b324b21fe74f2d1d4fe52b534046152b0](https://dev.azure.com/dnceng/internal/_git/dotnet-wpf?_a=history&version=GCb929fc7b324b21fe74f2d1d4fe52b534046152b0) - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 8.0.15-servicing.25165.2 to 8.0.15-servicing.25167.5][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 8.0.15-servicing.25165.2 to 8.0.15-servicing.25167.5][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.15-servicing.25165.2 to 8.0.15-servicing.25167.5][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC9d1a7bbd03007c329391026b1abf1ca404b3b90d&targetVersion=GCb929fc7b324b21fe74f2d1d4fe52b534046152b0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:05a9f0d5-ba2f-4c32-efac-08dbd545292d)
…otnet-wpf build 20250317.9 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.15-servicing.25167.5 -> To Version 8.0.15-servicing.25167.9
…ng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:05a9f0d5-ba2f-4c32-efac-08dbd545292d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - **Subscription**: 05a9f0d5-ba2f-4c32-efac-08dbd545292d - **Build**: [20250317.9](https://dev.azure.com/dnceng/internal/_build/results?buildId=2665751) - **Date Produced**: March 17, 2025 8:43:29 PM UTC - **Commit**: [4d5e32859f7dfaca9102a95d111a49d2aa2dbd8c](https://dev.azure.com/dnceng/internal/_git/dotnet-wpf?_a=history&version=GC4d5e32859f7dfaca9102a95d111a49d2aa2dbd8c) - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 8.0.15-servicing.25167.5 to 8.0.15-servicing.25167.9][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 8.0.15-servicing.25167.5 to 8.0.15-servicing.25167.9][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.15-servicing.25167.5 to 8.0.15-servicing.25167.9][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCb929fc7b324b21fe74f2d1d4fe52b534046152b0&targetVersion=GC4d5e32859f7dfaca9102a95d111a49d2aa2dbd8c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:05a9f0d5-ba2f-4c32-efac-08dbd545292d)
…-merge-8.0-2025-04-08-1205
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
Tanya-Solyanik
approved these changes
Apr 10, 2025
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.