[main] Source code updates from dotnet/dotnet

[dotnet-maestro[bot]]

[!NOTE] This is a codeflow update. It may contain both source code changes from the VMR as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/dotnet

• Subscription: 68bcfd48-e237-4022-9011-da7f2d2b96e6
• Build: 20251209.8 (294068)
• Date Produced: December 9, 2025 11:15:07 PM UTC
• Commit: d65136bfc1cc606d916ceaa102a4c1925e2b5d59
• Commit Diff: e9a2ab6...d65136b
• Branch: main

Updated Dependencies

• From 3.0.0-alpha.1.25570.101 to 3.0.0-alpha.1.25609.108
  • System.CommandLine

Associated changes in source repos

• https://github.com/dotnet/arcade/compare/d0dd6fd98074a55efc1bfe63297467c706058a56...17c915fe8e3094d636fb256f2c2860f38ea7b121
• https://github.com/dotnet/aspnetcore/compare/24ac6d1b50bfd3aabf0e17eee4599bb7bede6796...344dc33bb839a72e781a5e57beeb67659297c6df
• https://github.com/dotnet/cecil/compare/f015d3e84f7d8187a73ab78ff30a868e5e3c3018...82f47fc2ff84b3d94e910147d52f2e6795f6ae21
• https://github.com/dotnet/command-line-api/compare/c7cc2a976b4afbdfba1021d8551c3e391ede2065...cf5fd8d696450a48d3cc75a7a1792d34b5303f88
• https://github.com/dotnet/deployment-tools/compare/84ccc0553245e90355f32ea8ddcf169d9bd8f640...56c3d96916e1b2bb065732ffedd6b9e0285a6ed4
• https://github.com/dotnet/efcore/compare/44e26052aca686cd939a3e018cc2046067ebec6a...a6111ceed1629b89554664074b9214054a54c552
• https://github.com/dotnet/emsdk/compare/93402626168dc7a690c73dcec059fb5bdd84f5de...f8b85873c9157f00b4951a78977fa87e3ab7c628
• https://github.com/dotnet/fsharp/compare/4396154347e812cffb31b5b5b95fdc2028bb4c8c...89d788641914c5d0b87fddfa11f4df0b5cfaa73d
• https://github.com/dotnet/msbuild/compare/ad915a4f47346b746998dabaa541a7e3bab1d6cd...228caa11ad0046ccb599530abd9aba4e1979b5e9
• https://github.com/dotnet/runtime/compare/efb3990a9668fbdf22551ee93ffee9332086e052...bce6119e41ecfbcf630c369836770669604c22c6
• https://github.com/dotnet/sdk/compare/65384c6536d6c6f6afa9c13dc023b1848f0ef69e...6a6992f5fc42dbd06cd24f3a7db40013035d3965
• https://github.com/dotnet/source-build-reference-packages/compare/a3edc677e7df447fe8a38854fbd7a2b0bc327dc5...1c0ba39805434d3be12679eb7fe5deb9a221e32c
• https://github.com/dotnet/sourcelink/compare/25fdaee99efa095bdeeb1c0f7bda13a10ed7c8d5...d656e7bc73c28d039e6baf6d591c905ea8b76ee1
• https://github.com/dotnet/templating/compare/f38b39e3f8655d82baf8fe142b89503adecf6eb2...41ef93aacf72633b58372a9841d8940f6d87ae26
• https://github.com/microsoft/vstest/compare/81d120f85fbdddc7b981e910a127bd6ef913cd42...154e8babf0b97312a403b6ccf84cf1498a32ecea
• https://github.com/dotnet/windowsdesktop/compare/9d90f3f51f618c68d2af7ed75564599b37bf2a65...132afbade9e2ce626f26e27c136f34af73dde2f1
• https://github.com/dotnet/winforms/compare/c3534d40dea348b8381be3a18567632946b5ad79...1a8c138be340d80c7e288e044e8a80b7f4adeb1b
• https://github.com/dotnet/wpf/compare/92841b9f489654b1b59d8639623e8f678228aebd...6e486f4f1e48f2729f707f2b93d915214a7d6f6e

Diff the source with this PR branch

darc vmr diff --name-only https://github.com/dotnet/dotnet:d65136bfc1cc606d916ceaa102a4c1925e2b5d59..https://github.com/dotnet/roslyn:darc-main-60909bcd-c997-40f0-9639-28e0b23cb639

[dotnet-maestro[bot]]

[!CAUTION]

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/dotnet/tree/a00271037957320337a6ad2c3a74261ed8c3f85d.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

• eng/Versions.props 🔍 View file in dotnet/roslyn vs VMR
• eng/targets/TargetFrameworks.props 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/CSharpResources.resx 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorCode.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj 🔍 View file in dotnet/roslyn vs VMR

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

1. Clone the current repository

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

2. ~Make sure your darc is up-to-date and run~ ⚠️ Temporarily please install and use the following darc version:

   # Linux / MacOS
   ./eng/common/darc-init.sh --darcversion 1.1.0-beta.25578.3
   # or on Windows
   .\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25578.3
   

3. Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally

   darc vmr resolve-conflict --subscription 68bcfd48-e237-4022-9011-da7f2d2b96e6
   

   This should apply the build 292561 with sources from a002710
4. Commit & push the changes
5. 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.

[premun]

@jjonescz can you try here? I tried and had some conflicts so don't know if these are good.

[premun]

@jjonescz it seems to be conflicting with that reset you did

[premun]

So maybe we first merge the FF PR (https://github.com/dotnet/dotnet/pull/3147) and then restart this one

[jjonescz]

it seems to be conflicting with that reset you did

You mean this one https://github.com/dotnet/dotnet/pull/2668? That is surprising to me, that reset was done a while ago and there were successful flows since then, e.g., https://github.com/dotnet/roslyn/pull/81389.

[dotnet-maestro[bot]]

[!CAUTION]

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/dotnet/tree/3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

• eng/Versions.props 🔍 View file in dotnet/roslyn vs VMR
• eng/targets/TargetFrameworks.props 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/CSharpResources.resx 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorCode.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj 🔍 View file in dotnet/roslyn vs VMR

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

1. Clone the current repository

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

2. ~Make sure your darc is up-to-date and run~ ⚠️ Temporarily please install and use the following darc version:

   # Linux / MacOS
   ./eng/common/darc-init.sh --darcversion 1.1.0-beta.25578.3
   # or on Windows
   .\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25578.3
   

3. Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally

   darc vmr resolve-conflict --subscription 68bcfd48-e237-4022-9011-da7f2d2b96e6
   

   This should apply the build 292651 with sources from 3b5d49b
4. Commit & push the changes
5. 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[bot]]

[!CAUTION]

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/dotnet/tree/5b183502227a7fe4bec508d1513c016f6eb9783e.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

• eng/Versions.props 🔍 View file in dotnet/roslyn vs VMR
• eng/targets/TargetFrameworks.props 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/CSharpResources.resx 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorCode.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj 🔍 View file in dotnet/roslyn vs VMR

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

1. Clone the current repository

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

2. ~Make sure your darc is up-to-date and run~ ⚠️ Temporarily please install and use the following darc version:

   # Linux / MacOS
   ./eng/common/darc-init.sh --darcversion 1.1.0-beta.25601.6
   # or on Windows
   .\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25601.6
   

3. Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally

   darc vmr resolve-conflict --subscription 68bcfd48-e237-4022-9011-da7f2d2b96e6
   

   This should apply the build 292866 with sources from 5b18350
4. Commit & push the changes
5. 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[bot]]

[!CAUTION]

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/dotnet/tree/78c39718bb6e8008ba9d2dbd00d550bee6be9f59.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

• eng/Versions.props 🔍 View file in dotnet/roslyn vs VMR
• eng/targets/TargetFrameworks.props 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/CSharpResources.resx 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorCode.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj 🔍 View file in dotnet/roslyn vs VMR

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

1. Clone the current repository

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

2. ~Make sure your darc is up-to-date and run~ ⚠️ Temporarily please install and use the following darc version:

   # Linux / MacOS
   ./eng/common/darc-init.sh --darcversion 1.1.0-beta.25601.6
   # or on Windows
   .\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25601.6
   

3. Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally

   darc vmr resolve-conflict --subscription 68bcfd48-e237-4022-9011-da7f2d2b96e6
   

   This should apply the build 293020 with sources from 78c3971
4. Commit & push the changes
5. 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[bot]]

[!CAUTION]

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/dotnet/tree/29eefe27a350eb8b0bcbababa7863a0d1086295d.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

• eng/Versions.props 🔍 View file in dotnet/roslyn vs VMR
• eng/targets/TargetFrameworks.props 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/CSharpResources.resx 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorCode.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj 🔍 View file in dotnet/roslyn vs VMR

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

1. Clone the current repository

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

2. ~Make sure your darc is up-to-date and run~ ⚠️ Temporarily please install and use the following darc version:

   # Linux / MacOS
   ./eng/common/darc-init.sh --darcversion 1.1.0-beta.25602.3
   # or on Windows
   .\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25602.3
   

3. Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally

   darc vmr resolve-conflict --subscription 68bcfd48-e237-4022-9011-da7f2d2b96e6
   

   This should apply the build 293166 with sources from 29eefe2
4. Commit & push the changes
5. 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[bot]]

[!CAUTION]

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/dotnet/tree/5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

• eng/Versions.props 🔍 View file in dotnet/roslyn vs VMR
• eng/targets/TargetFrameworks.props 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/CSharpResources.resx 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorCode.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj 🔍 View file in dotnet/roslyn vs VMR

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

1. Clone the current repository

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

2. ~Make sure your darc is up-to-date and run~ ⚠️ Temporarily please install and use the following darc version:

   # Linux / MacOS
   ./eng/common/darc-init.sh --darcversion 1.1.0-beta.25602.3
   # or on Windows
   .\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25602.3
   

3. Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally

   darc vmr resolve-conflict --subscription 68bcfd48-e237-4022-9011-da7f2d2b96e6
   

   This should apply the build 293255 with sources from 5bb147b
4. Commit & push the changes
5. 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[bot]]

[!CAUTION]

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/dotnet/tree/5a69737e6f6447fe397d552503a3909ea49f6f34.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

• eng/Versions.props 🔍 View file in dotnet/roslyn vs VMR
• eng/targets/TargetFrameworks.props 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/CSharpResources.resx 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorCode.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj 🔍 View file in dotnet/roslyn vs VMR

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

1. Clone the current repository

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

2. ~Make sure your darc is up-to-date and run~ ⚠️ Temporarily please install and use the following darc version:

   # Linux / MacOS
   ./eng/common/darc-init.sh --darcversion 1.1.0-beta.25602.3
   # or on Windows
   .\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25602.3
   

3. Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally

   darc vmr resolve-conflict --subscription 68bcfd48-e237-4022-9011-da7f2d2b96e6
   

   This should apply the build 293565 with sources from 5a69737
4. Commit & push the changes
5. 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[bot]]

[!CAUTION]

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/dotnet/tree/ce3dea8b1d1c12cf4b85999f834052d942d84a6d.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

• eng/Versions.props 🔍 View file in dotnet/roslyn vs VMR
• eng/targets/TargetFrameworks.props 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/CSharpResources.resx 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorCode.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj 🔍 View file in dotnet/roslyn vs VMR

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

1. Clone the current repository

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

2. ~Make sure your darc is up-to-date and run~ ⚠️ Temporarily please install and use the following darc version:

   # Linux / MacOS
   ./eng/common/darc-init.sh --darcversion 1.1.0-beta.25602.3
   # or on Windows
   .\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25602.3
   

3. Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally

   darc vmr resolve-conflict --subscription 68bcfd48-e237-4022-9011-da7f2d2b96e6
   

   This should apply the build 293750 with sources from ce3dea8
4. Commit & push the changes
5. 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[bot]]

[!CAUTION]

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/dotnet/tree/d65136bfc1cc606d916ceaa102a4c1925e2b5d59.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

• eng/Versions.props 🔍 View file in dotnet/roslyn vs VMR
• eng/targets/TargetFrameworks.props 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/CSharpResources.resx 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorCode.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj 🔍 View file in dotnet/roslyn vs VMR

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

1. Clone the current repository

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

2. ~Make sure your darc is up-to-date and run~ ⚠️ Temporarily please install and use the following darc version:

   # Linux / MacOS
   ./eng/common/darc-init.sh --darcversion 1.1.0-beta.25609.2
   # or on Windows
   .\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25609.2
   

3. Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally

   darc vmr resolve-conflict --subscription 68bcfd48-e237-4022-9011-da7f2d2b96e6
   

   This should apply the build 294068 with sources from d65136b
4. Commit & push the changes
5. 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[bot]]

[!CAUTION]

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/dotnet/tree/a137035987f8faebec182016349982241a2eebd1.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

• eng/Versions.props 🔍 View file in dotnet/roslyn vs VMR
• eng/targets/TargetFrameworks.props 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/CSharpResources.resx 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorCode.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs 🔍 View file in dotnet/roslyn vs VMR
• src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj 🔍 View file in dotnet/roslyn vs VMR

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

1. Clone the current repository

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

2. ~Make sure your darc is up-to-date and run~ ⚠️ Temporarily please install and use the following darc version:

   # Linux / MacOS
   ./eng/common/darc-init.sh --darcversion 1.1.0-beta.25609.2
   # or on Windows
   .\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25609.2
   

3. Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally

   darc vmr resolve-conflict --subscription 68bcfd48-e237-4022-9011-da7f2d2b96e6
   

   This should apply the build 294309 with sources from a137035
4. Commit & push the changes
5. 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.

[premun]

Closing because it keeps pinging our team. A new PR will open