[release/10.0.4xx] Source code updates from dotnet/source-build-assets by dotnet-maestro[bot] · Pull Request #8313 · dotnet/dotnet

dotnet-maestro · 2026-08-14T17:58:21Z

Note

This is a codeflow update. It may contain both source code changes from
the source repo
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/source-build-assets

Subscription: e79518cd-e118-46fe-b7ff-1cae03a85e29
Build: 20260814.1 (327189)
Date Produced: August 14, 2026 5:54:22 PM UTC
Commit: 14e081d380852f433a5d4bad7905a1267d5be5d7
Commit Diff: f7cee04...14e081d
Branch: release/10.0

Diff the source with this PR branch

darc vmr diff --name-only https://github.com/dotnet/source-build-assets:14e081d380852f433a5d4bad7905a1267d5be5d7..https://github.com/dotnet/dotnet:darc-release/10.0.4xx-d4c9b4d0-5e8b-4117-90aa-e33e8f4440eb

dotnet-maestro · 2026-08-14T17:58:27Z

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 327189 of https://github.com/dotnet/source-build-assets/tree/14e081d380852f433a5d4bad7905a1267d5be5d7.

The conflicts in the following files need to be manually resolved:

src/externalPackages/projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj
🔍 View file in dotnet/source-build-assets vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

Clone the current repository

git clone https://github.com/dotnet/dotnet
cd dotnet

Make sure your darc is up-to-date
(version 1.1.0-beta.26413.1 or higher)

# Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1

Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
```
darc vmr resolve-conflict --subscription e79518cd-e118-46fe-b7ff-1cae03a85e29 
```
This should apply the build 327189 with sources from 14e081d
Resolve the conflicts, commit & push the changes
Once pushed, the Codeflow verification check will turn green.
If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

dotnet-maestro · 2026-08-14T17:58:28Z

Important

⚠️ No subscription flowing code in the opposite direction is set up.
Code changes made in the VMR's src/ directory will not flow back to the source repository on branch "release/10.0".

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

dotnet-maestro · 2026-08-14T17:58:29Z

Note

PRs from original repository included in this codeflow update:

[release/10.0] Source code updates from dotnet/dotnet source-build-assets#1767

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

azure-pipelines · 2026-08-14T17:58:36Z

Azure Pipelines: Successfully started running 1 pipeline(s). 1 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run.

akoeplinger · 2026-08-18T14:06:43Z

FYI @wtgodbe this needs conflict resolution

wtgodbe · 2026-08-19T17:02:12Z

@mthalman PTAL - I resolved in favor of dotnet/source-build-assets#1767 (kept ConfigureMicrosoftBclCryptographyPackageSource, got rid of AddPreviouslySourceBuiltPackageSource)

Updated [Microsoft.Extensions.Http.Resilience](https://github.com/dotnet/extensions) from 10.9.0 to 10.10.0. <details> <summary>Release notes</summary> _Sourced from [Microsoft.Extensions.Http.Resilience's releases](https://github.com/dotnet/extensions/releases)._ No release notes found for this version range. Commits viewable in [compare view](https://github.com/dotnet/extensions/commits). </details> Updated [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/dotnet) from 10.0.11 to 10.0.12. <details> <summary>Release notes</summary> _Sourced from [Microsoft.Extensions.Logging.Abstractions's releases](https://github.com/dotnet/dotnet/releases)._ No release notes found for this version range. Commits viewable in [compare view](https://github.com/dotnet/dotnet/commits). </details> Updated [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 18.9.0 to 18.10.0. <details> <summary>Release notes</summary> _Sourced from [Microsoft.NET.Test.Sdk's releases](https://github.com/microsoft/vstest/releases)._ ## 18.10.0 ## What's Changed * Drop Mono fallback, run .NET Framework tests on Windows only by @nohwnd in microsoft/vstest#16158 * Run Microsoft.Testing.Platform test apps under `vstest.console` and datacollector by @nohwnd in microsoft/vstest#16201 * Fix test output eaten by MSBuild terminal logger by @nohwnd in microsoft/vstest#16223 * Remove the experimental test session feature by @nohwnd in microsoft/vstest#16231 * Skip a single bad executor instead of failing all executor loading by @nohwnd in microsoft/vstest#16239 * Assert apartment state instead of using Clipboard in UI tests by @nohwnd in microsoft/vstest#16270 * Surface test host crashes during protocol negotiation by @nohwnd in microsoft/vstest#16285 * Pass the inferred target platform to the host in run settings by @nohwnd in microsoft/vstest#16271 * Report raw invalid IsTargetPlatformInferred value, cover host x64 forcing by @nohwnd in microsoft/vstest#16295 * Disable the MTP testhost by default (#16337) by @nohwnd in microsoft/vstest#16341 **Full Changelog**: microsoft/vstest@v18.9.0...v18.10.0 Commits viewable in [compare view](microsoft/vstest@v18.9.0...v18.10.0). </details> Updated [Microsoft.SourceLink.GitHub](https://github.com/dotnet/dotnet) from 10.0.400 to 10.0.401. <details> <summary>Release notes</summary> _Sourced from [Microsoft.SourceLink.GitHub's releases](https://github.com/dotnet/dotnet/releases)._ ## 10.0.401 [Release](https://github.com/dotnet/core/releases/tag/v10.0.12) ## What's Changed * [release/10.0.4xx] Source code updates from dotnet/sdk by @dotnet-maestro[bot] in dotnet/dotnet#8011 * [release/10.0.4xx] Source code updates from dotnet/sdk by @dotnet-maestro[bot] in dotnet/dotnet#8037 * [release/10.0.4xx] Source code updates from dotnet/sdk by @dotnet-maestro[bot] in dotnet/dotnet#8038 * Update Source-Build SDK Diff Tests Baselines and Exclusions by @dotnet-sb-bot in dotnet/dotnet#7754 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8101 * [release/10.0.4xx] Source code updates from dotnet/source-build-assets by @dotnet-maestro[bot] in dotnet/dotnet#8104 * [release/10.0.4xx] Source code updates from dotnet/msbuild by @dotnet-maestro[bot] in dotnet/dotnet#8142 * [release/10.0.4xx] Source code updates from dotnet/sdk by @dotnet-maestro[bot] in dotnet/dotnet#8132 * [release/10.0.4xx] Source code updates from dotnet/source-build-assets by @dotnet-maestro[bot] in dotnet/dotnet#8127 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8156 * [release/10.0.4xx] Source code updates from dotnet/roslyn by @dotnet-maestro[bot] in dotnet/dotnet#8148 * [release/10.0.4xx] Source code updates from dotnet/sdk by @dotnet-maestro[bot] in dotnet/dotnet#8176 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8171 * [release/10.0.4xx] Source code updates from dotnet/scenario-tests by @dotnet-maestro[bot] in dotnet/dotnet#8092 * [release/10.0.4xx] Fix IdentityModel shared-components source build by @mthalman in dotnet/dotnet#8189 * [release/10.0.4xx] Source code updates from nuget/nuget.client by @dotnet-maestro[bot] in dotnet/dotnet#8201 * [release/10.0.4xx] Allow submodule changes when reseting submodules by @github-actions[bot] in dotnet/dotnet#8223 * [release/10.0.4xx] Source code updates from dotnet/roslyn by @dotnet-maestro[bot] in dotnet/dotnet#8215 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8210 * [release/10.0.4xx] Cloak SignatureCycle2 binary from VMR by @mthalman in dotnet/dotnet#8226 * [release/10.0.4xx] Ignore spurious SBoM warnings by @akoeplinger in dotnet/dotnet#8165 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8231 * Update to the 10.0.11 August runtimes from build 324376 by @mthalman in dotnet/dotnet#8259 * Merging internal commits for release/10.0.4xx by @dotnet-bot in dotnet/dotnet#8242 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8278 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8304 * [release/10.0.4xx] Source code updates from dotnet/roslyn by @dotnet-maestro[bot] in dotnet/dotnet#8347 * [release/10.0.4xx] Remove duplicate dependency from scenario-tests by @dkurepa in dotnet/dotnet#8350 * [release/10.0.4xx] Source code updates from dotnet/sourcelink by @dotnet-maestro[bot] in dotnet/dotnet#8344 * [release/10.0.4xx] Source code updates from dotnet/templating by @dotnet-maestro[bot] in dotnet/dotnet#8354 * [release/10.0.4xx] Fix SignCheckExclusionsFile.txt to allow signed hotreload .js file by @github-actions[bot] in dotnet/dotnet#8383 * [release/10.0.4xx] Remove TSA bug filing from pipelines by @akoeplinger in dotnet/dotnet#8389 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8396 * [release/10.0.4xx] [release/10.0.1xx] Update binskim lastModifiedDate in PipelineAutobaseliningConfig.yml by @github-actions[bot] in dotnet/dotnet#8408 * [release/10.0.4xx] Fix SignCheckExclusionsFile.txt for .js in source-build artifacts by @github-actions[bot] in dotnet/dotnet#8405 * [release/10.0.4xx] Source code updates from dotnet/templating by @dotnet-maestro[bot] in dotnet/dotnet#8419 * [release/10.0.4xx] Source code updates from dotnet/templating by @dotnet-maestro[bot] in dotnet/dotnet#8422 * [release/10.0.4xx] Source code updates from dotnet/msbuild by @dotnet-maestro[bot] in dotnet/dotnet#8429 * [release/10.0.4xx] Source code updates from dotnet/source-build-assets by @dotnet-maestro[bot] in dotnet/dotnet#8313 * [release/10.0.4xx] Source code updates from dotnet/templating by @dotnet-maestro[bot] in dotnet/dotnet#8452 * [release/10.0.4xx] Source code updates from dotnet/source-build-assets by @dotnet-maestro[bot] in dotnet/dotnet#8453 * [release/10.0.4xx] Source code updates from dotnet/msbuild by @dotnet-maestro[bot] in dotnet/dotnet#8469 * [release/10.0.4xx] Source code updates from dotnet/fsharp by @dotnet-maestro[bot] in dotnet/dotnet#8521 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8574 * [release/10.0.4xx] Bump patch version to 10.0.401 by @vseanreesermsft in dotnet/dotnet#8577 ... (truncated) Commits viewable in [compare view](dotnet/dotnet@v10.0.400...v10.0.401). </details> Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore <dependency name> major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore <dependency name> minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore <dependency name>` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore <dependency name>` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore <dependency name> <ignore condition>` will remove the ignore condition of the specified dependency and ignore conditions </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Initial commit for subscription e79518cd-e118-46fe-b7ff-1cae03a85e29

2616714

dotnet-policy-service Bot requested a review from a team August 14, 2026 17:59

Fix conflicts

6470047

wtgodbe requested a review from mthalman August 19, 2026 17:06

mthalman approved these changes Aug 19, 2026

View reviewed changes

mthalman enabled auto-merge (squash) August 19, 2026 17:39

mthalman merged commit 1a25b8e into release/10.0.4xx Aug 19, 2026
7 checks passed

mthalman deleted the darc-release/10.0.4xx-d4c9b4d0-5e8b-4117-90aa-e33e8f4440eb branch August 19, 2026 18:08

This was referenced Sep 10, 2026

Bump the nuget-dependencies group with 6 updates demaconsulting/DocDown#1

Open

Bump the all-deps group with 7 updates AlamoEngine-Tools/EaW-Modinfo-Implementation#324

Open

Bump the nuget-deps group with 4 updates ptr727/Utilities#473

Merged

Navigation Menu

Uh oh!

[release/10.0.4xx] Source code updates from dotnet/source-build-assets - #8313

[release/10.0.4xx] Source code updates from dotnet/source-build-assets#8313
mthalman merged 2 commits into
release/10.0.4xxfrom
darc-release/10.0.4xx-d4c9b4d0-5e8b-4117-90aa-e33e8f4440eb

dotnet-maestro Bot commented Aug 14, 2026

Uh oh!

dotnet-maestro Bot commented Aug 14, 2026

🚨 Action Required — Conflict detected

ℹ️ To resolve the conflicts, please follow these steps:

Uh oh!

dotnet-maestro Bot commented Aug 14, 2026

Uh oh!

dotnet-maestro Bot commented Aug 14, 2026

Uh oh!

azure-pipelines Bot commented Aug 14, 2026

Uh oh!

akoeplinger commented Aug 18, 2026

Uh oh!

wtgodbe commented Aug 19, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

dotnet-maestro Bot commented Aug 14, 2026

From https://github.com/dotnet/source-build-assets

Uh oh!

dotnet-maestro Bot commented Aug 14, 2026

🚨 Action Required — Conflict detected

ℹ️ To resolve the conflicts, please follow these steps:

Uh oh!

dotnet-maestro Bot commented Aug 14, 2026

Uh oh!

dotnet-maestro Bot commented Aug 14, 2026

Uh oh!

azure-pipelines Bot commented Aug 14, 2026

Uh oh!

akoeplinger commented Aug 18, 2026

Uh oh!

wtgodbe commented Aug 19, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants