[release/dev18.0] Source code updates from dotnet/dotnet - #20086
Conversation
|
Caution 🚨 Action Required — Conflict detectedA conflict was detected when trying to update this PR with changes from build The conflicts in the following files need to be manually resolved:
ℹ️ To resolve the conflicts, please follow these steps:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
Note VMR PRs included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
✅ No release notes required |
|
Caution 🚨 Action Required — Conflict detectedA conflict was detected when trying to update this PR with changes from build The conflicts in the following files need to be manually resolved:
ℹ️ To resolve the conflicts, please follow these steps:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
Note VMR PRs included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
Caution 🚨 Action Required — Conflict detectedA conflict was detected when trying to update this PR with changes from build The conflicts in the following files need to be manually resolved:
ℹ️ To resolve the conflicts, please follow these steps:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
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>
…se/dev18.0-c6412d54-1ee4-41db-b743-400e8d8c2113
|
Caution 🛑 Codeflow Paused — Conflict detectedA conflict was detected when trying to update this PR with changes from build 💡 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:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
Note VMR PRs included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
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>
bb52d9e to
05bc7ef
Compare
…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>
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
Associated changes in source repos
Diff the source with this PR branch