[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' #20341
+1
−87
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
…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.8.0**: from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.11 to 8.0.12 (parent: Microsoft.NETCore.App.Runtime.win-x64) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.emsdk**: from 8.0.11-servicing.24511.5 to 8.0.12-servicing.24569.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20241203.14 - **Date Produced**: December 4, 2024 1:31:01 AM UTC - **Commit**: aaaba35c60c58e388637d347d6836853efcf792d - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.111 to 8.0.112][11] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.111-servicing.24521.41 to 8.0.112-servicing.24603.14][11] - **Microsoft.NET.Sdk**: [from 8.0.111-servicing.24521.41 to 8.0.112-servicing.24603.14][11] - **Microsoft.TemplateEngine.Cli**: [from 8.0.111-servicing.24521.41 to 8.0.112-servicing.24603.14][11] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][12] - **Microsoft.NETCore.App.Ref**: [from 8.0.11 to 8.0.12][12] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][12] - **Microsoft.NETCore...
…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.AspNetCore.App.Ref**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20241203.21 - **Date Produced**: December 4, 2024 5:56:10 AM UTC - **Commit**: d27975b5ef47a37a4ca3990f1a25b996feae3755 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.112 to 8.0.112][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.112-servicing.24603.14 to 8.0.112-servicing.24603.21][1] - **Microsoft.NET.Sdk**: [from 8.0.112-servicing.24603.14 to 8.0.112-servicing.24603.21][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.112-servicing.24603.14 to 8.0.112-servicing.24603.21][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.11 to 8.0.12][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.12][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][2] - **dotnet-dev-certs**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][2] - **dotnet-user-jwts**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][2] - **dotnet-user-secrets**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCaaaba35c60c58e388637d347d6836853efcf792d&target...
…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 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.11-servicing.24521.5 to 8.0.12-servicing.24604.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.11-servicing.24521.5 to 8.0.12-servicing.24604.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.12 to 8.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.12 to 8.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.11-servicing.24521.3 to 8.0.12-servicing.24603.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.11 to 8.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.11-servicing.24521.7 to 8.0.12-servicing.24603.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20241204.14 - **Date Produced**: December 4, 2024 6:23:20 PM UTC - **Commit**: f7cd007b9d25fd00e34a9e31da5e9b6b47de2ca2 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.112 to 8.0.112][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.112-servicing.24603.21 to 8.0.112-servicing.24604.14][1] - **Microsoft.NET.Sdk**: [from 8.0.112-servicing.24603.2...
…otnet-sdk build 20250117.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.112 -> To Version 8.0.113 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Deployment.DotNet.Releases,Microsoft.SourceBuild.Intermediate.deployment-tools From Version 8.0.12 -> To Version 8.0.13 (parent: Microsoft.NET.Sdk
…ernal/release/8.0.1xx-b65bd685-5cca-4b9f-bb94-0148a76a4115
This reverts commit 36a4d87.
- Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250117.13 - Deleted 0001-Add-support-for-building-with-Clang-19.patch - Merge commit '47d06113278587f42d13d8e3e3f05ec747149082' into darc-internal/release/8.0.1xx-b65bd685-5cca-4b9f-bb94-0148a76a4115 - sourcebuild patches: remove msbuild deps patch ---- #### AI description (iteration 1) #### PR Classification Dependency update #### PR Summary This pull request updates various dependencies to their latest versions and removes obsolete runtime patches. - `eng/Version.Details.xml`: Updated multiple dependencies to version 8.0.13. - `eng/Versions.props`: Updated package versions to 8.0.13. - Deleted obsolete patches: `src/SourceBuild/patches/runtime/0001-Add-support-for-building-with-Clang-19.patch` and `src/SourceBuild/patches/runtime/0002-Update-MSBuild-dependencies.patch`.
…otnet-sdk build 20250117.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.113 -> To Version 8.0.113 Dependency coherency updates Microsoft.Build From Version 17.8.15 -> To Version 17.8.18 (parent: Microsoft.NET.Sdk
…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.Build**: from 17.8.15 to 17.8.18 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20250117.32 - **Date Produced**: January 18, 2025 12:08:45 AM UTC - **Commit**: 8f216348dc6ef1be4bf99e60632c26c236c903c4 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.113 to 8.0.113][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.113-servicing.25067.13 to 8.0.113-servicing.25067.32][1] - **Microsoft.NET.Sdk**: [from 8.0.113-servicing.25067.13 to 8.0.113-servicing.25067.32][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.113-servicing.25067.13 to 8.0.113-servicing.25067.32][1] - **Microsoft.Build**: [from 17.8.15 to 17.8.18][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC415951d27e013364267f45602c4ba197b53110c7&targetVersion=GC8f216348dc6ef1be4bf99e60632c26c236c903c4&_a=files [2]: dotnet/msbuild@e2abee0...31744df [DependencyUpdate]: <> (End) [marker]: <> (End:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be)
Updated Version.Details.xml - update emsdk 8.0.13 ---- #### AI description (iteration 1) #### PR Classification Dependency update #### PR Summary This pull request updates the `emsdk` dependency to version 8.0.13 in the `Version.Details.xml` file. - Updated `Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100` version to 8.0.13 and its SHA. - Updated `Microsoft.SourceBuild.Intermediate.emsdk` version to 8.0.13-servicing.25071.1 and its SHA.
…-merge-8.0.1xx-2025-02-11-1225
|
@ellahathaway May you help resolve the source build conflicts please? Also with #20340 |
…into merge/release/8.0.1xx-to-release/8.0.3xx
|
@dotnet/source-build would you be able to review these changes? Thanks! |
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.
I detected changes in the release/8.0.1xx branch which have not been merged yet to release/8.0.3xx. I'm a robot and am configured to help you automatically keep release/8.0.3xx up to date, so I've opened this PR.
This PR merges commits made on release/8.0.1xx by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/8.0.1xx-to-release/8.0.3xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.