Skip to content

[release/dev18.0] Source code updates from dotnet/dotnet - #20086

Open
dotnet-maestro[bot] wants to merge 1 commit into
release/dev18.0from
darc-release/dev18.0-c6412d54-1ee4-41db-b743-400e8d8c2113
Open

[release/dev18.0] Source code updates from dotnet/dotnet#20086
dotnet-maestro[bot] wants to merge 1 commit into
release/dev18.0from
darc-release/dev18.0-c6412d54-1ee4-41db-b743-400e8d8c2113

Conversation

@dotnet-maestro

Copy link
Copy Markdown
Contributor

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

New Dependencies

  • Added 9.0.18
    • System.Security.Cryptography.Xml

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d..https://github.com/dotnet/fsharp:darc-release/dev18.0-c6412d54-1ee4-41db-b743-400e8d8c2113

@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 324500 of https://github.com/dotnet/dotnet/tree/e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d.

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

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

  1. Clone the current repository

    git clone https://github.com/dotnet/fsharp
    cd fsharp
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26374.1 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 stage the conflict locally

    darc vmr resolve-conflict --subscription 9cea8df5-50b3-46a2-bb35-21fe52cf9a77 

    This should apply the build 324500 with sources from e0c9b3f

  4. Resolve the conflicts, 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

Copy link
Copy Markdown
Contributor Author

Note

VMR PRs included in this codeflow update:

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

@github-actions

Copy link
Copy Markdown
Contributor

✅ No release notes required

@github-actions github-actions Bot added the AI-Tooling-Check-Bypassed Tooling check: non-fork PR, not diff-analyzed label Jul 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

AI-Tooling-Check-Bypassed Tooling check: non-fork PR, not diff-analyzed

Projects

Status: New

Development

Successfully merging this pull request may close these issues.

0 participants