Skip to content

[prvysoky/demo] Source code updates from dotnet/runtime#4340

Closed
dotnet-maestro[bot] wants to merge 2 commits intoprvysoky/demofrom
darc-prvysoky/demo-409ab417-d347-4ac1-ab3f-14a31227ef20
Closed

[prvysoky/demo] Source code updates from dotnet/runtime#4340
dotnet-maestro[bot] wants to merge 2 commits intoprvysoky/demofrom
darc-prvysoky/demo-409ab417-d347-4ac1-ab3f-14a31227ef20

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

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/runtime

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/runtime:ebae78473acc58e90140d58bf87bcc356305244d..https://github.com/dotnet/dotnet:darc-prvysoky/demo-409ab417-d347-4ac1-ab3f-14a31227ef20

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 298286 of https://github.com/dotnet/runtime/tree/ebae78473acc58e90140d58bf87bcc356305244d.

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

  • src/coreclr/hosts/corerun/wasm/pinvoke_override.cpp
    🔍 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/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26071.3 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 6f1b1305-abbf-4e4d-b33c-482baf6c0d4b
    This should apply the build 298286 with sources from ebae784
  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.

Copy link
Copy Markdown
Member

@premun premun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blocking this PR

Diff: https://github.com/dotnet/runtime/compare/ebae78473acc58e90140d58bf87bcc356305244d..ebae78473acc58e90140d58bf87bcc356305244d

From: dotnet/runtime@ebae784
To: dotnet/runtime@ebae784

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

- src/runtime/src/coreclr/hosts/corerun/wasm/pinvoke_override.cpp
@dotnet-policy-service dotnet-policy-service bot requested a review from a team January 21, 2026 19:34
@premun premun closed this Jan 21, 2026
@premun premun reopened this Jan 21, 2026
@premun premun closed this Jan 21, 2026
@premun premun deleted the darc-prvysoky/demo-409ab417-d347-4ac1-ab3f-14a31227ef20 branch January 21, 2026 19:54
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.

2 participants