Skip to content

[main] Source code updates from dotnet/dotnet #123182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
dotnet-maestro wants to merge 2 commits into from
Closed

[main] Source code updates from dotnet/dotnet #123182

dotnet-maestro wants to merge 2 commits into from

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jan 14, 2026

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

Updated Dependencies

Associated changes in source repos

Diff the source with this PR branch 
darc vmr diff --name-only https://github.com/dotnet/dotnet:887f3d5a26e1001ee2777afde10cadcacb8cc735..https://github.com/dotnet/runtime:darc-main-6b204046-5888-46cb-951f-194e9d2e8aa7

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jan 14, 2026

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 297286 of https://github.com/dotnet/dotnet/tree/887f3d5a26e1001ee2777afde10cadcacb8cc735.

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

  • src/native/corehost/browserhost/host/cross-linked.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/corehost/browserhost/host/host.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/corehost/browserhost/host/index.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/corehost/browserhost/libBrowserHost.footer.js
    🔍 View file in dotnet/runtime vs VMR
  • src/native/corehost/browserhost/loader/assets.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/corehost/browserhost/loader/bootstrap.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/corehost/browserhost/loader/config.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/corehost/browserhost/loader/exit.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/corehost/browserhost/loader/host-builder.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/corehost/browserhost/loader/run.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/corehost/browserhost/sample/index.html
    🔍 View file in dotnet/runtime vs VMR
  • src/native/libs/Common/JavaScript/CMakeLists.txt
    🔍 View file in dotnet/runtime vs VMR
  • src/native/libs/Common/JavaScript/cross-module/index.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/libs/Common/JavaScript/types/exchange.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/libs/Common/JavaScript/types/internal.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/libs/System.Native.Browser/diagnostics/console-proxy.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/libs/System.Native.Browser/diagnostics/exit.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/libs/System.Native.Browser/diagnostics/index.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/libs/System.Native.Browser/libSystem.Native.Browser.Utils.footer.js
    🔍 View file in dotnet/runtime vs VMR
  • src/native/libs/System.Native.Browser/native/cross-linked.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/libs/System.Native.Browser/native/timer.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/libs/System.Native.Browser/utils/host.ts
    🔍 View file in dotnet/runtime vs VMR
  • src/native/rollup.config.defines.js
    🔍 View file in dotnet/runtime vs VMR
  • src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj
    🔍 View file in dotnet/runtime vs VMR
  • src/tasks/installer.tasks/installer.tasks.csproj
    🔍 View file in dotnet/runtime vs VMR
  • src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.cs
    🔍 View file in dotnet/runtime vs VMR
  • src/tests/async/reflection/reflection-simple.cs
    🔍 View file in dotnet/runtime vs VMR
  • src/tools/ilasm/src/ILAssembler/Diagnostic.cs
    🔍 View file in dotnet/runtime vs VMR
  • src/tools/ilasm/src/ILAssembler/EntityRegistry.cs
    🔍 View file in dotnet/runtime vs VMR
  • src/tools/ilasm/src/ILAssembler/GrammarVisitor.cs
    🔍 View file in dotnet/runtime vs VMR
  • src/tools/ilasm/src/ILAssembler/PreprocessedTokenSource.cs
    🔍 View file in dotnet/runtime vs VMR
  • src/tools/ilasm/tests/ILAssembler.Tests/DocumentCompilerTests.cs
    🔍 View file in dotnet/runtime vs VMR

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

  1. Clone the current repository 
    git clone https://github.com/dotnet/runtime
cd runtime
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26062.6 or higher) 
    # Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1
  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 f7901f87-9f24-40d6-9bc1-564863937237
    This should apply the build 297286 with sources from 887f3d5
  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.

@github-actions github-actions bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jan 14, 2026
@ViktorHofer
[runtime] Source update 887f3d5 → 887f3d5
bbdb2ee 
Diff: https://github.com/dotnet/dotnet/compare/887f3d5a26e1001ee2777afde10cadcacb8cc735..887f3d5a26e1001ee2777afde10cadcacb8cc735

From: dotnet/dotnet@887f3d5
To: dotnet/dotnet@887f3d5

The following files had conflicts that were resolved by a user:

- src/native/corehost/browserhost/host/cross-linked.ts
- src/native/corehost/browserhost/host/host.ts
- src/native/corehost/browserhost/host/index.ts
- src/native/corehost/browserhost/libBrowserHost.footer.js
- src/native/corehost/browserhost/loader/assets.ts
- src/native/corehost/browserhost/loader/bootstrap.ts
- src/native/corehost/browserhost/loader/config.ts
- src/native/corehost/browserhost/loader/exit.ts
- src/native/corehost/browserhost/loader/host-builder.ts
- src/native/corehost/browserhost/loader/run.ts
- src/native/corehost/browserhost/sample/index.html
- src/native/libs/Common/JavaScript/CMakeLists.txt
- src/native/libs/Common/JavaScript/cross-module/index.ts
- src/native/libs/Common/JavaScript/types/exchange.ts
- src/native/libs/Common/JavaScript/types/internal.ts
- src/native/libs/System.Native.Browser/diagnostics/console-proxy.ts
- src/native/libs/System.Native.Browser/diagnostics/exit.ts
- src/native/libs/System.Native.Browser/diagnostics/index.ts
- src/native/libs/System.Native.Browser/libSystem.Native.Browser.Utils.footer.js
- src/native/libs/System.Native.Browser/native/cross-linked.ts
- src/native/libs/System.Native.Browser/native/timer.ts
- src/native/libs/System.Native.Browser/utils/host.ts
- src/native/rollup.config.defines.js
- src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj
- src/tasks/installer.tasks/installer.tasks.csproj
- src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.cs
- src/tests/async/reflection/reflection-simple.cs
- src/tools/ilasm/src/ILAssembler/Diagnostic.cs
- src/tools/ilasm/src/ILAssembler/EntityRegistry.cs
- src/tools/ilasm/src/ILAssembler/GrammarVisitor.cs
- src/tools/ilasm/src/ILAssembler/PreprocessedTokenSource.cs
- src/tools/ilasm/tests/ILAssembler.Tests/DocumentCompilerTests.cs
@ViktorHofer ViktorHofer deleted the darc-main-6b204046-5888-46cb-951f-194e9d2e8aa7 branch January 14, 2026 17:24
@dotnet-policy-service dotnet-policy-service bot added the linkable-framework Issues associated with delivering a linker friendly framework label Jan 14, 2026
@ericstj
Copy link
Member

ericstj commented Jan 14, 2026

Why close this one? prefer a newer codeflow?

This was referenced Jan 14, 2026
Open
Open
@ViktorHofer
Copy link
Member

ViktorHofer commented Jan 14, 2026 •
edited
Loading

Mentioned offline. Needs the merged runtime forward flow to produce a build and backflow. Otherwise we get this huge diff with 800 files.

@build-analysis build-analysis bot mentioned this pull request Jan 14, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jeffhandley jeffhandley Awaiting requested review from jeffhandley jeffhandley is a code owner

@marek-safar marek-safar Awaiting requested review from marek-safar marek-safar is a code owner

@sbomer sbomer Awaiting requested review from sbomer sbomer is a code owner

@akoeplinger akoeplinger Awaiting requested review from akoeplinger akoeplinger is a code owner

@maraf maraf Awaiting requested review from maraf maraf is a code owner

@ilonatommy ilonatommy Awaiting requested review from ilonatommy ilonatommy is a code owner

@lewing lewing Awaiting requested review from lewing lewing is a code owner

@pavelsavara pavelsavara Awaiting requested review from pavelsavara pavelsavara is a code owner

@BrzVlad BrzVlad Awaiting requested review from BrzVlad BrzVlad is a code owner

@kotlarmilos kotlarmilos Awaiting requested review from kotlarmilos kotlarmilos is a code owner

@steveisok steveisok Awaiting requested review from steveisok steveisok is a code owner

@vitek-karas vitek-karas Awaiting requested review from vitek-karas vitek-karas is a code owner

@thaystg thaystg Awaiting requested review from thaystg thaystg is a code owner

@MichalStrehovsky MichalStrehovsky Awaiting requested review from MichalStrehovsky MichalStrehovsky is a code owner

@janvorli janvorli Awaiting requested review from janvorli janvorli is a code owner

@kg kg Awaiting requested review from kg kg is a code owner

Assignees

@dotnet-maestro dotnet-maestro[bot]

Labels

linkable-framework Issues associated with delivering a linker friendly framework needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ericstj @ViktorHofer