Skip to content

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

Merged
T-Gro merged 10 commits into
release/dev18.0from
darc-release/dev18.0-c6412d54-1ee4-41db-b743-400e8d8c2113
Aug 5, 2026
Merged

[release/dev18.0] Source code updates from dotnet/dotnet#20086
T-Gro merged 10 commits into
release/dev18.0from
darc-release/dev18.0-c6412d54-1ee4-41db-b743-400e8d8c2113

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Jul 28, 2026

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:fa946937d18098cdb873c8d1bfdaa91c49e11c8d..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

github-actions Bot commented Jul 28, 2026

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
@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 325096 of https://github.com/dotnet/dotnet/tree/0a8a86acf3fcddd4fc60df4d60c4be5a4f84f64b.

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 325096 with sources from 0a8a86a

  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.

@dotnet-maestro

dotnet-maestro Bot commented Aug 1, 2026

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 325130 of https://github.com/dotnet/dotnet/tree/859dbf297ab10ef1ff20d30becdd6ff69eb258ff.

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 325130 with sources from 859dbf2

  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

dotnet-maestro Bot commented Aug 1, 2026

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.

The codeflow flowed eng/common files from Arcade 10.0.0-beta.26379.2
(c5d54a9), but Version.Details and global.json still pinned the older
10.0.0-beta.26371.2 (c38c50f5), causing Maestro codeflow verification to
fail. Bump the Arcade SDK version/sha to match the flowed eng/common.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@T-Gro
T-Gro requested a review from a team as a code owner August 3, 2026 19:01
…se/dev18.0-c6412d54-1ee4-41db-b743-400e8d8c2113
@dotnet-maestro

dotnet-maestro Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🛑 Codeflow Paused — Conflict detected

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

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

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 325432 with sources from fa94693

  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

dotnet-maestro Bot commented Aug 4, 2026

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.

Copilot and others added 4 commits August 4, 2026 08:02
Apply darc back-flow of dotnet/dotnet build 325432 and resolve the eng/Versions.props conflict by taking the VMR value FSBuildVersion=112. Brings in System.Security.Cryptography.Xml 9.0.18 (transitive vuln fix), warnNotAsError build-script support, and NuGet auditSources. Unblocks the paused Maestro codeflow / Codeflow verification check.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
OpenTelemetry.Api and OpenTelemetry.Exporter.OpenTelemetryProtocol 1.11.2 have known moderate severity vulnerabilities (GHSA-g94r-2vxg-569j, GHSA-4625-4j76-fww9) that fail the CI build via NuGetAudit warnAsError. Bump to patched version 1.15.3.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The codeflow from VMR build 325432 added <auditSources> to NuGet.config, enabling NuGetAudit against nuget.org. This surfaced NU1902 errors for OpenTelemetry.Api (GHSA-g94r-2vxg-569j) and OpenTelemetry.Exporter.OpenTelemetryProtocol (GHSA-4625-4j76-fww9) at 1.11.2, which are only used by test/telemetry infrastructure and are pinned at 1.11.2 in the VMR. Acknowledge these advisories via NuGetAuditSuppress to unblock CI without diverging package versions from the VMR.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The vsintegration/src change (OpenTelemetry bump) requires a Visual Studio release-notes entry; the check_release_notes CI job was failing because docs/release-notes/.VisualStudio/18.vNext.md did not exist. Add it with an entry linking PR #20086.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@T-Gro
T-Gro force-pushed the darc-release/dev18.0-c6412d54-1ee4-41db-b743-400e8d8c2113 branch from bb52d9e to 05bc7ef Compare August 4, 2026 08:18
Copilot and others added 3 commits August 4, 2026 10:49
…e audit advisories

The codeflow enabled NuGet audit (auditSources in NuGet.config). Two problems broke the Windows/VisualFSharp.sln build:

1. NU1605 package downgrades: OpenTelemetry 1.15.3 pulls Microsoft.Extensions.Diagnostics.Abstractions 10.0.0, which requires System.Diagnostics.DiagnosticSource >=10.0.0 and System.Buffers/Memory/Unsafe >=4.6.1/4.6.3/6.1.2, but this servicing branch pins the 9.0.0-era versions the VMR flows. Revert OpenTelemetry to 1.11.2 (the VMR-pinned version), which is compatible and eliminates the downgrades. Audit suppression cannot fix NU1605, so the revert is required.

2. NU1903/NU1902 audit errors for transitive packages in Windows-only test/VS-integration projects (System.Net.Http 4.3.0, System.Text.RegularExpressions 4.3.0, MessagePack, OpenTelemetry). None ship in FSharp.Core or the compiler. Acknowledge them via NuGetAuditSuppress in Directory.Build.props.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The ILVerify job runs build.cmd without -ci, so the XliffTasks UpdateXlfOnBuild property defaults to true. The netcore product TFM (net10.0) inner build of FSharp.Compiler.Service does not define the UpdateXlf target, so the build failed with MSB4057 'The target UpdateXlf does not exist in the project'. Set UpdateXlfOnBuild=false in ilverify.ps1 (matching main) since xlf updates are not needed for IL verification.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…st env var

The prior env-var-only approach did not take effect: MSBuild environment variables are the lowest-precedence property source and are overridden by Arcade's own default (UpdateXlfOnBuild defaults true without -ci). Pass /p:UpdateXlfOnBuild=false on the build command line (highest precedence) so it propagates to the net10.0 inner build of FSharp.Compiler.Service, which does not define the UpdateXlf target. Resolves MSB4057 'The target UpdateXlf does not exist in the project.'

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@T-Gro
T-Gro merged commit 0b34196 into release/dev18.0 Aug 5, 2026
44 checks passed
@T-Gro
T-Gro deleted the darc-release/dev18.0-c6412d54-1ee4-41db-b743-400e8d8c2113 branch August 5, 2026 08:13
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

Archived in project

Development

Successfully merging this pull request may close these issues.

2 participants