Skip to content

[automated] Merge branch 'release/11.0.1xx' => 'release/11.0.2xx' - #56753

Merged
nagilson merged 343 commits into
release/11.0.2xxfrom
merge/release/11.0.1xx-to-release/11.0.2xx
Oct 23, 2026
Merged

nagilson merged 343 commits into
release/11.0.2xxfrom
merge/release/11.0.1xx-to-release/11.0.2xx

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

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

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

  • marcpopMSFT
  • github-actions[bot]
  • javiercn
  • tmat
  • joeloff
  • baronfel
  • Evangelink
  • Copilot
  • nagilson
  • JeremyKuhne
  • rmarinho
  • mthalman
  • dotnet-maestro[bot]
  • dotnet-oneloc-localization[bot]
  • tannergooding
  • jasonmalinowski
  • invalid-email-address
  • dsplaisted
  • dotnet-bot
  • premun
  • ellahathaway
  • dotnet-sb-bot
  • vseanreesermsft
  • SimonZhao888
  • lbussell
  • wtgodbe
  • DonnaChen888

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/11.0.1xx
git pull --ff-only
git checkout release/11.0.2xx
git pull --ff-only
git merge --no-ff release/11.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/11.0.1xx-to-release/11.0.2xx
or if you are using SSH
git push git@github.com:dotnet/sdk HEAD:merge/release/11.0.1xx-to-release/11.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/11.0.1xx-to-release/11.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/11.0.1xx-to-release/11.0.2xx origin/release/11.0.2xx
git pull https://github.com/dotnet/sdk merge/release/11.0.1xx-to-release/11.0.2xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/11.0.1xx-to-release/11.0.2xx
or if you are using SSH
git fetch
git checkout -b merge/release/11.0.1xx-to-release/11.0.2xx origin/release/11.0.2xx
git pull git@github.com:dotnet/sdk merge/release/11.0.1xx-to-release/11.0.2xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/11.0.1xx-to-release/11.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.

dotnet-maestro Bot and others added 30 commits June 11, 2026 05:36
…610.7

On relative base path root
dotnet-format From Version 8.3.657409 -> To Version 8.3.731007
Co-authored-by: Mirroring <dnceng-mirroring@microsoft.com>
Co-authored-by: Noah Gilson <noahgilson@microsoft.com>
Co-authored-by: ProductConstructionServiceProd <ProductConstructionServiceProd>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: DonnaChen888 <v-donnachen@microsoft.com>
Co-authored-by: Daniel Plaisted <daplaist@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: SimonZhao888 <133954995+SimonZhao888@users.noreply.github.com>
Co-authored-by: Simon Zhao (BEYONDSOFT CONSULTING INC) <v-weidzh@microsoft.com>
Fix VMR sync for internal sdk pr builds

----
#### AI description  (iteration 1)
#### PR Classification
Bug fix to enable Azure DevOps token minting for VMR synchronization in internal SDK pull request builds.

#### PR Summary
Adds authentication token acquisition step for internal project VMR synchronization during pull request builds to fix VMR sync failures.

- `/eng/pipelines/templates/jobs/vmr-build.yml`: Added AzureCLI task to mint Azure DevOps token using workload identity federation for internal builds before VMR pull updates step, with error handling for token acquisition failures.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
#### AI description  (iteration 1)
#### PR Classification
Dependency update and testing infrastructure improvement to update ASP.NET Core dependencies from internal to public feeds and add output truncation for high-verbosity test logging.

#### PR Summary
This PR updates ASP.NET Core dependencies from version 9.0.17 to 9.0.18, switching from internal Azure DevOps repositories to public GitHub repositories, and adds a test output helper to prevent timeout issues during diagnostic-level test runs.

- `TruncatingTestOutputHelper.cs`: Added new helper class to limit test output by buffering a bounded head and tail of characters, preventing IPC channel saturation during high-verbosity logging
- `Version.Details.xml` and `Versions.props`: Updated ASP.NET Core package versions from 9.0.17 to 9.0.18 and changed repository URIs from internal Azure DevOps to public GitHub
- `vmr-build.yml`: Added conditional logic to inject public ASP.NET Core feed into smoke test NuGet configuration for non-internal builds
- `GivenDotnetTestBuildsAndRunsTestfromCsproj.cs`: Integrated `TruncatingTestOutputHelper` for diagnostic verbosity tests to prevent spurious timeouts from excessive output
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…dnceng/internal/dotnet-aspnetcore

This pull request updates the following dependencies

[marker]: <> (Begin:7c429c14-b12b-40f6-ae9e-395f98f369df)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: [7c429c14-b12b-40f6-ae9e-395f98f369df](https://maestro.dot.net/subscriptions?search=7c429c14-b12b-40f6-ae9e-395f98f369df)
- **Build**: [20260615.26](https://dev.azure.com/dnceng/internal/_build/results?buildId=3001200) ([318816](https://maestro.dot.net/channel/5128/azdo:dnceng:internal:dotnet-aspnetcore/build/318816))
- **Date Produced**: June 16, 2026 4:00:59 AM UTC
- **Commit**: [a83a8133a504cc51034db2744c3c880bc000b89b](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?_a=history&version=GCa83a8133a504cc51034db2744c3c880bc000b89b)
- **Branch**: [refs/heads/internal/release/9.0](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?version=GBrefs/heads/internal/release/9.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [9.0.17-servicing.26270.11 to 9.0.18-servicing.26315.26][7]
     - 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 [9.0.17 to 9.0.18][7]
     - 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

[7]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC3acfb497d6f5b4e0cd0f3749bfbddb61519ee271&targetVersion=GCa83a8133a504cc51034db2744c3c880bc000b89b&_a=files

[DependencyUpdate]: <> (End)


[marker]: <> (End:7c429c14-b12b-40f6-ae9e-395f98f369df)
…otnet-aspnetcore build 20260616.7

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.18-servicing.26315.26 -> To Version 9.0.18-servicing.26316.7
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.18 -> To Version 9.0.18
…otnet-runtime build 20260615.22

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.17 -> To Version 9.0.18
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.17-servicing.26264.16 -> To Version 9.0.18-servicing.26315.22

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.17-servicing.26258.3 -> To Version 9.0.18-servicing.26310.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)

Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 From Version 9.0.17 -> To Version 9.0.18 (parent: Microsoft.NETCore.App.Runtime.win-x64)
…dnceng/internal/dotnet-runtime

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.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport**: from 9.0.17-servicing.26258.3 to 9.0.18-servicing.26310.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
    - **Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100**: from 9.0.17 to 9.0.18 (parent: Microsoft.NETCore.App.Runtime.win-x64)
    - **Microsoft.SourceBuild.Intermediate.emsdk**: from 9.0.17-servicing.26258.3 to 9.0.18-servicing.26310.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:57bb26e6-6f64-40cf-a4ea-5b973f41bc22)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: [57bb26e6-6f64-40cf-a4ea-5b973f41bc22](https://maestro.dot.net/subscriptions?search=57bb26e6-6f64-40cf-a4ea-5b973f41bc22)
- **Build**: [20260615.22](https://dev.azure.com/dnceng/internal/_build/results?buildId=3001160) ([318821](https://maestro.dot.net/channel/5128/azdo:dnceng:internal:dotnet-runtime/build/318821))
- **Date Produced**: June 16, 2026 5:14:37 AM UTC
- **Commit**: [d839c41c85988aadc213e8e42269ecd7883a1790](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GCd839c41c85988aadc213e8e42269ecd7883a1790)
- **Branch**: [refs/heads/internal/release/9.0](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?version=GBrefs/heads/internal/release/9.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [9.0.17 to 9.0.18][1]
     - 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.Permi...
…otnet-windowsdesktop build 20260617.1

On relative base path root
Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 9.0.17 -> To Version 9.0.18
VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.17-servicing.26268.1 -> To Version 9.0.18-servicing.26317.1

Dependency coherency updates
On relative base path root
Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.17-rtm.26267.1 -> To Version 9.0.18-rtm.26316.5 (parent: Microsoft.WindowsDesktop.App.Ref)

Microsoft.Dotnet.WinForms.ProjectTemplates From Version 9.0.17-servicing.26265.1 -> To Version 9.0.18-servicing.26316.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.17-rtm.26267.1 -> To Version 9.0.18-rtm.26316.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
…otnet-windowsdesktop build 20260617.2

On relative base path root
Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 8.0.28 -> To Version 8.0.29
VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.28-servicing.26269.1 -> To Version 8.0.29-servicing.26317.2

Dependency coherency updates
On relative base path root
Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.28-servicing.26269.2 -> To Version 8.0.29-servicing.26316.4 (parent: Microsoft.WindowsDesktop.App.Ref)
…otnet-runtime build 20260615.23

On relative base path root
Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.28-servicing.26264.13 -> To Version 8.0.29-servicing.26315.23
Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver From Version 8.0.28 -> To Version 8.0.29

Dependency coherency updates
On relative base path root
Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.28 -> To Version 8.0.29 (parent: Microsoft.NETCore.App.Runtime.win-x64)
…dnceng/internal/dotnet-windowsdesktop

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.NET.Sdk.WindowsDesktop**: from 9.0.17-rtm.26267.1 to 9.0.18-rtm.26316.5 (parent: Microsoft.WindowsDesktop.App.Ref)
    - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.17-servicing.26265.1 to 9.0.18-servicing.26316.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
    - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 9.0.17-rtm.26267.1 to 9.0.18-rtm.26316.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:87db4525-6885-42da-8dd0-7ce296d7fd1a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: [87db4525-6885-42da-8dd0-7ce296d7fd1a](https://maestro.dot.net/subscriptions?search=87db4525-6885-42da-8dd0-7ce296d7fd1a)
- **Build**: [20260617.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=3002473) ([319111](https://maestro.dot.net/channel/5128/azdo:dnceng:internal:dotnet-windowsdesktop/build/319111))
- **Date Produced**: June 17, 2026 6:05:01 PM UTC
- **Commit**: [889bd3cf7e1c61b6bdee233190da4931118b6e6d](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?_a=history&version=GC889bd3cf7e1c61b6bdee233190da4931118b6e6d)
- **Branch**: [refs/heads/internal/release/9.0](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?version=GBrefs/heads/internal/release/9.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [9.0.17 to 9.0.18][1]
     - Microsoft.WindowsDesktop.App.Ref
     - Microsoft.WindowsDesktop.App.Runtime.win-x64
  - From [9.0.17-servicing.26268.1 to 9.0.18-servicing.26317.1][1]
     - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0
     - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC9c74c8784a90d64bcc5c5c552d5420eafb60fa4f&targetVersion=GC889bd3cf7e1c61b6bdee233190da4931118b6e6d&_a=files

[DependencyUpdate]: <> (End)


[marker]: <> (End:87db4525-6885-42da-8dd0-7ce296d7fd1a)
…dnceng/internal/dotnet-aspnetcore

This pull request updates the following dependencies

[marker]: <> (Begin:7c429c14-b12b-40f6-ae9e-395f98f369df)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: [7c429c14-b12b-40f6-ae9e-395f98f369df](https://maestro.dot.net/subscriptions?search=7c429c14-b12b-40f6-ae9e-395f98f369df)
- **Build**: [20260616.7](https://dev.azure.com/dnceng/internal/_build/results?buildId=3001706) ([319116](https://maestro.dot.net/channel/5128/azdo:dnceng:internal:dotnet-aspnetcore/build/319116))
- **Date Produced**: June 17, 2026 6:29:46 PM UTC
- **Commit**: [f8834c1fdc165a41191cd294b997aae77a6ce495](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?_a=history&version=GCf8834c1fdc165a41191cd294b997aae77a6ce495)
- **Branch**: [refs/heads/internal/release/9.0](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?version=GBrefs/heads/internal/release/9.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [9.0.18-servicing.26315.26 to 9.0.18-servicing.26316.7][1]
     - 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 [9.0.18 to 9.0.18][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

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCa83a8133a504cc51034db2744c3c880bc000b89b&targetVersion=GCf8834c1fdc165a41191cd294b997aae77a6ce495&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:7c429c14-b12b-40f6-ae9e-395f98f369df)
…dnceng/internal/dotnet-runtime, dnceng/internal/dotnet-windowsdesktop

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.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.28 to 8.0.29 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)


[marker]: <> (Begin:11ffd28b-eb51-469a-d3fb-08dca292067e)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: [11ffd28b-eb51-469a-d3fb-08dca292067e](https://maestro.dot.net/subscriptions?search=11ffd28b-eb51-469a-d3fb-08dca292067e)
- **Build**: [20260617.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=3002474) ([319114](https://maestro.dot.net/channel/3880/azdo:dnceng:internal:dotnet-windowsdesktop/build/319114))
- **Date Produced**: June 17, 2026 6:19:33 PM UTC
- **Commit**: [576dfdbe31f54d365d68ad184b53accac88313a1](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?_a=history&version=GC576dfdbe31f54d365d68ad184b53accac88313a1)
- **Branch**: [refs/heads/internal/release/8.0](https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop?version=GBrefs/heads/internal/release/8.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [8.0.28 to 8.0.29][1]
     - Microsoft.WindowsDesktop.App.Ref
     - Microsoft.WindowsDesktop.App.Runtime.win-x64
  - From [8.0.28-servicing.26269.1 to 8.0.29-servicing.26317.2][1]
     - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0
     - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC432d0577ee8d6a36654d23a83182a0c7da27a69f&targetVersion=GC576dfdbe31f54d365d68ad184b53accac88313a1&_a=files

[DependencyUpdate]: <> (End)


[marker]: <> (End:11ffd28b-eb51-469a-d3fb-08dca292067e)




[marker]: <> (Begin:82bc8158-ef88-4a27-3f7b-08dca299e604)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: [82bc8158-ef88-4a27-3f7b-08dca299e604](https://maestro.dot.net/subscriptions?search=82bc8158-ef88-4a27-3f7b-08dca299e604)
- **Build**: [20260615.23](https://dev.azure.com/dnceng/internal/_build/results?buildId=3001165) ([318822](https://maestro.dot.net/channel/3880/azdo:dnceng:internal:dotnet-runtime/build/318822))
- **Date Produced**: June 16, 2026 5:24:38 AM UTC
- **Commit**: [58638b5ff167db8be72d99d93dea9e64551ff54b](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GC58638b5ff167db8be72d99d93dea9e64551ff54b)
- **Branch**: [refs/heads/internal/release/8.0](https://dev.azure.com/dnce...
…otnet-aspnetcore build 20260617.10

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.18-servicing.26316.7 -> To Version 9.0.18-servicing.26317.10
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.18 -> To Version 9.0.18
Switch helixTargetQueue Docker image from ubuntu-22.04-helix-amd64 to
azurelinux-3.0-helix-amd64 in both .vsts-ci.yml and eng/template-engine.yml.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…dnceng/internal/dotnet-aspnetcore

This pull request updates the following dependencies

[marker]: <> (Begin:7c429c14-b12b-40f6-ae9e-395f98f369df)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: [7c429c14-b12b-40f6-ae9e-395f98f369df](https://maestro.dot.net/subscriptions?search=7c429c14-b12b-40f6-ae9e-395f98f369df)
- **Build**: [20260617.10](https://dev.azure.com/dnceng/internal/_build/results?buildId=3002576) ([319152](https://maestro.dot.net/channel/5128/azdo:dnceng:internal:dotnet-aspnetcore/build/319152))
- **Date Produced**: June 17, 2026 10:29:32 PM UTC
- **Commit**: [c2c420608bf0e24d7df00021f48a686c70928871](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?_a=history&version=GCc2c420608bf0e24d7df00021f48a686c70928871)
- **Branch**: [refs/heads/internal/release/9.0](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore?version=GBrefs/heads/internal/release/9.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [9.0.18-servicing.26316.7 to 9.0.18-servicing.26317.10][1]
     - 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 [9.0.18 to 9.0.18][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

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCf8834c1fdc165a41191cd294b997aae77a6ce495&targetVersion=GCc2c420608bf0e24d7df00021f48a686c70928871&_a=files

[DependencyUpdate]: <> (End)


[marker]: <> (End:7c429c14-b12b-40f6-ae9e-395f98f369df)
…otnet-aspnetcore build 20260617.8

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.8.0 From Version 8.0.28-servicing.26269.13 -> To Version 8.0.29-servicing.26317.8
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 8.0.28 -> To Version 8.0.29
@github-actions
github-actions Bot requested a review from a team October 22, 2026 18:42
@github-actions
github-actions Bot requested a review from a team as a code owner October 22, 2026 18:42
@tmat

tmat commented Oct 22, 2026

Copy link
Copy Markdown
Member

@copilot resolve the merge conflicts in this pull request

Copilot AI commented Oct 22, 2026

Copy link
Copy Markdown
Contributor

@tmat Unfortunately I hit an unexpected error while processing your comment. I've automatically reported this to GitHub.

You can ask me to try again later by mentioning me in a new comment.

If you want to contact GitHub about this error, please mention the following identifier so they can better serve you: ce93fb4e-fe9b-409f-81ef-65dd7d48f392

Sorry for the inconvenience!

5 similar comments

Copilot AI commented Oct 22, 2026

Copy link
Copy Markdown
Contributor

@tmat Unfortunately I hit an unexpected error while processing your comment. I've automatically reported this to GitHub.

You can ask me to try again later by mentioning me in a new comment.

If you want to contact GitHub about this error, please mention the following identifier so they can better serve you: ce93fb4e-fe9b-409f-81ef-65dd7d48f392

Sorry for the inconvenience!

Copilot AI commented Oct 22, 2026

Copy link
Copy Markdown
Contributor

@tmat Unfortunately I hit an unexpected error while processing your comment. I've automatically reported this to GitHub.

You can ask me to try again later by mentioning me in a new comment.

If you want to contact GitHub about this error, please mention the following identifier so they can better serve you: ce93fb4e-fe9b-409f-81ef-65dd7d48f392

Sorry for the inconvenience!

Copilot AI commented Oct 22, 2026

Copy link
Copy Markdown
Contributor

@tmat Unfortunately I hit an unexpected error while processing your comment. I've automatically reported this to GitHub.

You can ask me to try again later by mentioning me in a new comment.

If you want to contact GitHub about this error, please mention the following identifier so they can better serve you: ce93fb4e-fe9b-409f-81ef-65dd7d48f392

Sorry for the inconvenience!

Copilot AI commented Oct 22, 2026

Copy link
Copy Markdown
Contributor

@tmat Unfortunately I hit an unexpected error while processing your comment. I've automatically reported this to GitHub.

You can ask me to try again later by mentioning me in a new comment.

If you want to contact GitHub about this error, please mention the following identifier so they can better serve you: ce93fb4e-fe9b-409f-81ef-65dd7d48f392

Sorry for the inconvenience!

Copilot AI commented Oct 22, 2026

Copy link
Copy Markdown
Contributor

@tmat Unfortunately I hit an unexpected error while processing your comment. I've automatically reported this to GitHub.

You can ask me to try again later by mentioning me in a new comment.

If you want to contact GitHub about this error, please mention the following identifier so they can better serve you: ce93fb4e-fe9b-409f-81ef-65dd7d48f392

Sorry for the inconvenience!

@dsplaisted

Copy link
Copy Markdown
Member

@marcpopMSFT Can you help with the merge conflicts? What are the correct patch versions?

<<<<<<< merge/release/11.0.1xx-to-release/11.0.2xx
    <VersionFeature80>33</VersionFeature80>
    <VersionFeature90>22</VersionFeature90>
    <VersionFeature100>$([MSBuild]::Add($(VersionSDKMinorPatch), 14))</VersionFeature100>
=======
    <VersionFeature80>32</VersionFeature80>
    <VersionFeature90>21</VersionFeature90>
    <VersionFeature100>13</VersionFeature100>
>>>>>>> release/11.0.2xx

@nagilson

Copy link
Copy Markdown
Member

11.0.2xx is the current .NET 11 feature work branch, and typically the 2xx versions don't ship until several months later: https://learn.microsoft.com/en-us/dotnet/core/porting/versioning-sdk-msbuild-vs

Because of this, I don't really think the patch versions matter that much right now. We aren't shipping 11.0.2xx for a while. But it seems more correct to have them advance alongside the Nov release since that is the latest release we're working on now.

I assume that's what Marc was trying to do in #56629. He updated them here beforehand e062384 but this branch is just a little behind.

I also updated the feature band to 2 because it was set to 1 after the prior merge with 11.0.1xx. I'm turning off RTM as well which had flowed into 11.0.2xx which seems wrong.

…elease/11.0.1xx-to-release/11.0.2xx

Conflict resolutions:
- sdk.slnx, dotnet.csproj: keep Microsoft.DotNet.Cli.InternalMicrosoft (2xx, #56458); drop
  Microsoft.DotNet.Cli.Telemetry (removed in 1xx by #56274, replaced by Azure Monitor exporter 1.10.0).
- Program.cs: combine 1xx exit-code-aware shutdown drain with 2xx internal-Microsoft detection wait.
- Versions.props: take 1xx runtime version features (#56629: 8.0.33, 9.0.22, 10.0.MinorPatch+14) and
  restore 11.0.2xx preview band branding to match dotnet/dotnet#9512 (VersionSDKMinor 2, patch 00,
  preview label, empty iteration) instead of the auto-merged 1xx rtm label.

Fixes for files reset to release/11.0.2xx by the flow bot:
- Add Microsoft.NET.ProjectData.Tasks 5.13.0-1.26508.107 dependency (needed by #56243 from 1xx).
- Disable central transitive pinning in tool_projectdata (content-only harvest) so the 2xx ProjectData
  package's NuGet.Versioning floor does not conflict with the 2xx NuGet band.
- Update testfx dependencies to 1xx versions (MSTest 4.5.0-preview.26477.3, MTP 2.5.0-preview.26477.3)
  needed by 1xx HotReload.Client tests (#56609).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actions github-actions Bot added the sdk-diagnostic-docs-needed Indicates that a PR introduces new diagnostic codes, which must be documented over at dotnet/docs label Oct 23, 2026
@github-actions

Copy link
Copy Markdown
Contributor Author

📋 SDK Diagnostic Documentation Reminder

This PR introduces 11 new SDK diagnostic codes:

  • NETSDK1147
  • NETSDK1235
  • NETSDK1236
  • NETSDK1237
  • NETSDK1238
  • NETSDK1239
  • NETSDK1240
  • NETSDK1241
  • NETSDK1242
  • NETSDK1243
  • NETSDK1244

Action Required

Please ensure that documentation for these diagnostics is added or updated in the dotnet/docs repository at:

Each diagnostic should have:

  • A clear description of the error/warning
  • Possible causes
  • Recommended solutions
  • Code examples where applicable

Thank you for helping keep our documentation up to date! 🙏

@nagilson
nagilson enabled auto-merge October 23, 2026 19:31
@nagilson
nagilson merged commit 51e993b into release/11.0.2xx Oct 23, 2026
23 checks passed
@nagilson
nagilson deleted the merge/release/11.0.1xx-to-release/11.0.2xx branch October 23, 2026 20:56

This branch had an error being deployed

1 failed deployment
copilot-pat-pool — bb65b0c2 Deployed Oct 23, 2026 by nagilson via pre_activation #10179
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

sdk-diagnostic-docs-needed Indicates that a PR introduces new diagnostic codes, which must be documented over at dotnet/docs

Projects

None yet

Development

Successfully merging this pull request may close these issues.