Visitar URL original
Update .NET SDK to unblock NativeAOT restore by abonie · Pull Request #20929 · dotnet/fsharp · GitHub
Skip to content

Update .NET SDK to unblock NativeAOT restore - #20929

Merged
abonie merged 1 commit into
dotnet:mainfrom
abonie:fix/nativeaot-sdk-security-update
Nov 4, 2026
Merged

Update .NET SDK to unblock NativeAOT restore#20929
abonie merged 1 commit into
dotnet:mainfrom
abonie:fix/nativeaot-sdk-security-update

Conversation

@abonie

@abonie abonie commented Nov 4, 2026

Copy link
Copy Markdown
Member

Description

Update to .NET SDK 11.0.100-rc.3.26522.148 so net10.0 NativeAOT uses the patched Microsoft.DotNet.ILCompiler 10.0.14 instead of 10.0.13, which fails restore with NU1903. NuGet auditing and warnings-as-errors remain enabled.

Checklist

  • Test cases added

  • Performance benchmarks added in case of performance changes

  • Release notes entry updated:

    Please make sure to add an entry with short succinct description of the change as well as link to this pull request to the respective release notes file, if applicable.

    Release notes files:

    • If anything under src/Compiler has been changed, please make sure to make an entry in docs/release-notes/.FSharp.Compiler.Service/<version>.md, where <version> is usually "highest" one, e.g. 42.8.200
    • If language feature was added (i.e. LanguageFeatures.fsi was changed), please add it to docs/release-notes/.Language/preview.md
    • If a change to FSharp.Core was made, please make sure to edit docs/release-notes/.FSharp.Core/<version>.md where version is "highest" one, e.g. 8.0.200.

    Information about the release notes entries format can be found in the documentation.
    Example:

    If you believe that release notes are not necessary for this PR, please add NO_RELEASE_NOTES label to the pull request.

@abonie
Update .NET SDK to unblock NativeAOT restore
e99cc87 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 490c9e24-6626-47cf-a24a-266fc29bd1d2
@abonie
abonie requested a review from a team as a code owner November 4, 2026 15:00
@abonie abonie added the NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes label Nov 4, 2026
@abonie
abonie enabled auto-merge (squash) November 4, 2026 16:58
@abonie
abonie disabled auto-merge November 4, 2026 18:35
@abonie
abonie enabled auto-merge (squash) November 4, 2026 18:36
@github-project-automation github-project-automation Bot moved this from New to In Progress in F# Compiler and Tooling Nov 4, 2026
@abonie
abonie merged commit 23950a9 into dotnet:main Nov 4, 2026
56 of 57 checks passed
@github-project-automation github-project-automation Bot moved this from In Progress to Done in F# Compiler and Tooling Nov 4, 2026
This was referenced Nov 5, 2026
Merged
Merged
This was referenced Nov 5, 2026
Closed
Open
Open
@abonie

abonie commented Nov 9, 2026

Copy link
Copy Markdown
Member Author

/backport to release/11.0.1xx

@github-actions

github-actions Bot commented Nov 9, 2026

Copy link
Copy Markdown
Contributor

Started backporting to release/11.0.1xx (link to workflow run)

@github-actions

github-actions Bot commented Nov 9, 2026

Copy link
Copy Markdown
Contributor

@abonie backporting to release/11.0.1xx failed, the patch most likely resulted in conflicts. Please backport manually!

git am output 
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch --exclude=docs/release-notes/* --exclude=eng/common/* --whitespace=fix changes.patch

Applying: Update .NET SDK to unblock NativeAOT restore
Using index info to reconstruct a base tree...
M	global.json
Falling back to patching base and 3-way merge...
Auto-merging global.json
CONFLICT (content): Merge conflict in global.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Update .NET SDK to unblock NativeAOT restore
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

@abonie abonie mentioned this pull request Nov 9, 2026
Merged
3 tasks
abonie added a commit to abonie/fsharp that referenced this pull request Nov 9, 2026
@abonie
Update .NET SDK to unblock NativeAOT restore (dotnet#20929)
634757f 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 490c9e24-6626-47cf-a24a-266fc29bd1d2
Backport-of: 23950a9
Copilot-Session: 3ea3661e-bfd2-4eab-ae53-dffca4d40576
T-Gro pushed a commit that referenced this pull request Nov 9, 2026
@abonie
Backport NativeAOT SDK security update to release/11.0.1xx (#20955)
b0e2f85 
Backport #20929 (e99cc87).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: abb07d87-867a-4906-83e3-946f6fcf58c6
abonie added a commit that referenced this pull request Nov 11, 2026
@abonie
[release/dev18.11] Backport package security updates (#20956)
e22bcda 
* Update cryptography dependency to 10.0.13 (#20783)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: d8b637c2-ce3f-47e0-bf7f-ea6809e16eb6
Backport-of: 6c79b63
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 3ea3661e-bfd2-4eab-ae53-dffca4d40576

* Update MessagePack package version to 2.5.303 (#20854)

Backport-of: fe180de
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 3ea3661e-bfd2-4eab-ae53-dffca4d40576

* Update .NET SDK to unblock NativeAOT restore (#20929)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 490c9e24-6626-47cf-a24a-266fc29bd1d2
Backport-of: 23950a9
Copilot-Session: 3ea3661e-bfd2-4eab-ae53-dffca4d40576

* Adapt floating-point conversion tests for .NET 11 (#20400)

Backport the numeric-conversion test adaptations from #20400, retaining older-runtime expectations.

Source-commit: 0b2dec7

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 3ea3661e-bfd2-4eab-ae53-dffca4d40576

* Publish ILVerify actual baselines on CI failure (#20585)

Backport the pipeline artifact publishing and its regression tests from #20585. Keep verifier failures unchanged and diagnostic collection and publishing non-blocking.

Source-commit: c593bdb

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 3ea3661e-bfd2-4eab-ae53-dffca4d40576

* Adapt String completion expectations for .NET 11 (#20400)

Backport the remaining EditorTests.fs compatibility hunk from #20400. Include ToLowerOrdinal and ToUpperOrdinal only for .NET 11 and newer, preserving older-framework completion expectations.

Source-commit: 0b2dec7

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 3ea3661e-bfd2-4eab-ae53-dffca4d40576

* Bump servicing package versions after publication

Advance the shared build number to 102 for FSharp.Core 11.0.102 and FSharp.Compiler.Service 43.13.102.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 3ea3661e-bfd2-4eab-ae53-dffca4d40576

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: d8b637c2-ce3f-47e0-bf7f-ea6809e16eb6
Copilot-Session: 3ea3661e-bfd2-4eab-ae53-dffca4d40576
Copilot-Session: 490c9e24-6626-47cf-a24a-266fc29bd1d2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@T-Gro T-Gro T-Gro approved these changes

Assignees

No one assigned

Labels

NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes

Projects

F# Compiler and Tooling
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@abonie @T-Gro