Skip to content

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx'#52586

Merged
MiYanni merged 288 commits intorelease/10.0.2xxfrom
merge/release/10.0.1xx-to-release/10.0.2xx
Jan 21, 2026
Merged

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx'#52586
MiYanni merged 288 commits intorelease/10.0.2xxfrom
merge/release/10.0.1xx-to-release/10.0.2xx

Conversation

@github-actions
Copy link
Contributor

I detected changes in the release/10.0.1xx branch which have not been merged yet to release/10.0.2xx. I'm a robot and am configured to help you automatically keep release/10.0.2xx up to date, so I've opened this PR.

This PR merges commits made on release/10.0.1xx by the following committers:

  • MiYanni
  • marcpopMSFT
  • dotnet-maestro[bot]
  • akoeplinger
  • github-actions[bot]
  • DonnaChen888
  • mthalman
  • SimonZhao888
  • joeloff
  • vseanreesermsft
  • dotnet-sb-bot
  • MichaelSimons
  • NikolaMilosavljevic
  • dotnet-bot

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.

merge button instructions

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.

git fetch
git checkout release/10.0.1xx
git pull --ff-only
git checkout release/10.0.2xx
git pull --ff-only
git merge --no-ff release/10.0.1xx

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/sdk HEAD:merge/release/10.0.1xx-to-release/10.0.2xx
or if you are using SSH
git push git@github.com:dotnet/sdk HEAD:merge/release/10.0.1xx-to-release/10.0.2xx

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/10.0.1xx-to-release/10.0.2xx'. 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.

git fetch
git checkout -b merge/release/10.0.1xx-to-release/10.0.2xx origin/release/10.0.2xx
git pull https://github.com/dotnet/sdk merge/release/10.0.1xx-to-release/10.0.2xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/10.0.1xx-to-release/10.0.2xx
or if you are using SSH
git fetch
git checkout -b merge/release/10.0.1xx-to-release/10.0.2xx origin/release/10.0.2xx
git pull git@github.com:dotnet/sdk merge/release/10.0.1xx-to-release/10.0.2xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/10.0.1xx-to-release/10.0.2xx

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.

Mirroring and others added 30 commits December 8, 2025 08:41
…08.4

On relative base path root
Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25526.9 -> To Version 9.0.0-preview.25608.4
…08.8

On relative base path root
Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25526.9 -> To Version 9.0.0-preview.25608.8
…08.14

On relative base path root
Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.25424.3 -> To Version 7.0.0-preview.25608.14
…08.9

On relative base path root
Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25526.6 -> To Version 9.0.0-preview.25608.9
…208.5

On relative base path root
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25577.5 -> To Version 9.0.0-beta.25608.5
…0251208.2

On relative base path root
Microsoft.TemplateEngine.Abstractions From Version 9.0.309 -> To Version 9.0.309
Microsoft.TemplateEngine.Mocks From Version 9.0.309-servicing.25605.2 -> To Version 9.0.309-servicing.25608.2
…0251208.4

On relative base path root
Microsoft.TemplateEngine.Abstractions From Version 9.0.309 -> To Version 9.0.309
Microsoft.TemplateEngine.Mocks From Version 9.0.309-servicing.25608.2 -> To Version 9.0.309-servicing.25608.4
#### AI description  (iteration 1)
#### PR Classification
Internal release merge updating templating dependency versions and package source details.

#### PR Summary
This PR merges changes from the public branch that update dependency SHA values and version numbers to align with the latest templating engine releases.
- `eng/Version.Details.xml`: Updated the SHA for Microsoft.TemplateEngine.Abstractions and revised both version and SHA for Microsoft.TemplateEngine.Mocks.
- `NuGet.config`: Modified the package source key and URL to reflect the new SHA.
- `eng/Versions.props`: Revised the MicrosoftTemplateEngineMocksPackageVersion to the updated serviced release.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…otnet-windowsdesktop build 20251209.1

On relative base path root
Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 9.0.12 -> To Version 9.0.12
VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.12-servicing.25574.6 -> To Version 9.0.12-servicing.25609.1

Dependency coherency updates
On relative base path root
Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 From Version 9.0.11 -> To Version 9.0.11 (parent: Microsoft.NETCore.App.Runtime.win-x64)

Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.11-servicing.25516.4 -> To Version 9.0.11-servicing.25529.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)

Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.12-rtm.25566.6 -> To Version 9.0.12-rtm.25609.3 (parent: Microsoft.WindowsDesktop.App.Ref)

Microsoft.Dotnet.WinForms.ProjectTemplates From Version 9.0.12-servicing.25563.6 -> To Version 9.0.12-servicing.25608.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.12-rtm.25566.6 -> To Version 9.0.12-rtm.25609.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
…otnet-runtime build 20251206.9

On relative base path root
Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions From Version 9.0.12 -> To Version 9.0.12
Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.12-servicing.25555.20 -> To Version 9.0.12-servicing.25606.9

Dependency coherency updates
On relative base path root
Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.11-servicing.25516.4 -> To Version 9.0.12-servicing.25602.39 (parent: Microsoft.NETCore.App.Runtime.win-x64)

Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 From Version 9.0.11 -> To Version 9.0.12 (parent: Microsoft.NETCore.App.Runtime.win-x64)
…otnet-runtime build 20251206.9

On relative base path root
Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions From Version 9.0.12 -> To Version 9.0.12
Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.12-servicing.25555.20 -> To Version 9.0.12-servicing.25606.9

Dependency coherency updates
On relative base path root
Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 From Version 9.0.11 -> To Version 9.0.12 (parent: Microsoft.NETCore.App.Runtime.win-x64)

Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.11-servicing.25516.4 -> To Version 9.0.12-servicing.25602.39 (parent: Microsoft.NETCore.App.Runtime.win-x64)
…otnet-aspnetcore build 20251208.1

On relative base path root
dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.12-servicing.25574.1 -> To Version 9.0.12-servicing.25608.1
Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 9.0.12 -> To Version 9.0.12
SimonZhao888 and others added 21 commits January 16, 2026 11:10
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…0260119.1

On relative base path root
Microsoft.TemplateEngine.Abstractions From Version 9.0.311 -> To Version 9.0.311
Microsoft.TemplateEngine.Mocks From Version 9.0.311-servicing.26065.3 -> To Version 9.0.311-servicing.26069.1
…19.1

On relative base path root
Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.26064.1 -> To Version 9.0.0-preview.26069.1
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Versions.props
- eng/common/*
)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com>
Co-authored-by: DonnaChen888 <v-donnachen@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: Michael Yanni <miyanni@microsoft.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Simon Zhao (BEYONDSOFT CONSULTING INC) <v-weidzh@microsoft.com>
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
- src/SourceBuild/*
…elease/9.0.3xx-to-release/10.0.1xx

# Conflicts:
#	eng/Versions.props
#	eng/pipelines/templates/variables/vmr-build.yml
#	src/SourceBuild/content/eng/Version.Details.xml
#	src/SourceBuild/content/eng/Versions.props
#	src/SourceBuild/content/global.json
#	src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs
#	src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs
#	src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/SdkFileDiffExclusions.txt
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.