Skip to content

Merge from dev18 to main #18625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 70 commits into
base: main
Choose a base branch
from
Draft

Merge from dev18 to main #18625

wants to merge 70 commits into from

Conversation

T-Gro
Copy link
Member

@T-Gro T-Gro commented May 28, 2025

No description provided.

KevinRansom and others added 30 commits March 24, 2025 15:18
)

* Versioning for 17.14 and 9.0.300 (#18222)

* more code flow

* Update fantomas to 7.0.1 (#18400)

* Update fantomas

* Update fantomas - vsintegration

* Investigate.nuget (#18393)

* initial

* testing

* temp

* Fantomas, readme

* temp

* nowarn quotes for fantomas

* tests

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250320.3 (#18398)

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.25163.3 -> To Version 9.0.0-alpha.1.25170.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Fantomas (#18404)

* Fix false negative [<TailCall>] warning (#18399)

* Update dependencies from https://github.com/dotnet/msbuild build 20250324.8 (#18405)

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core
 From Version 17.13.21-preview-25169-06 -> To Version 17.13.22-preview-25174-08

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>

* Fix GC test that is flaky on Linux (#18408)

* update runtime to 9.0.3 (#18406)

---------

Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Co-authored-by: Petr <psfinaki@users.noreply.github.com>
Co-authored-by: Petr Pokorny <petrpokorny@microsoft.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dawe <dawedawe@posteo.de>
Co-authored-by: Jakub Majocha <1760221+majocha@users.noreply.github.com>
[automated] Merge branch 'main' => 'release/dev18.0'
* Fix a copypaste checking bug in unpickling (#18430)

* Tooltips: fix `null` annotation highlighting (#18457)

* Tooltips: fix `null` annotation highlighting

* Release notes

---------

Co-authored-by: Petr <psfinaki@users.noreply.github.com>
Co-authored-by: Eugene Auduchinok <eugene.auduchinok@gmail.com>
[automated] Merge branch 'main' => 'release/dev18.0'
[automated] Merge branch 'main' => 'release/dev18.0'
[automated] Merge branch 'main' => 'release/dev18.0'
Fix PM

----
#### AI description  (iteration 1)
#### PR Classification
Bug fix

#### PR Summary
This pull request addresses issues with the package manager for the release `/dev17.14`, ensuring proper handling of script project options and text view caret positions.
- `FSharpProjectOptionsManager.fs`: Refactored handling of `textViewAndCaret` to improve script project options retrieval.
- `ScriptClosure.fs`: Fixed filtering logic for package manager lines.
- `Extensions.fs`: Corrected parameter in `GetActiveView` method to ensure proper text buffer handling.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
* [VMR] Codeflow 547a1ca-547a1ca

[[ commit created by automation ]]

* Update dependencies from https://github.com/dotnet/dotnet

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Consolidated two `SynExpr.LetOrUseBang` patterns with `isUse = true` (#18472)

* `and!` support in TaskBulder (#18451)

* Update package Category (#18479)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250423.3 (#18494)

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.25209.1 -> To Version 9.0.0-alpha.1.25223.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

---------

Co-authored-by: Edgar Gonzalez <egonzalez@totallymoney.com>
Co-authored-by: Vladimir Shchur <odindafna2006@rambler.ru>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
[automated] Merge branch 'main' => 'release/dev18.0'
* [VMR] Codeflow e8bfd35-e8bfd35

[[ commit created by automation ]]

* Update dependencies from https://github.com/dotnet/dotnet build 267041

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…se/dev18.0

[automated] Merge branch 'release/dev17.14' => 'release/dev18.0'
[[ commit created by automation ]]
dotnet-maestro bot and others added 9 commits May 24, 2025 02:03
Removed Dependencies:
Microsoft.SourceBuild.Intermediate.source-build-reference-packages (Version 9.0.0-alpha.1.25223.3)
Microsoft.SourceBuild.Intermediate.msbuild (Version 17.13.24-preview-25209-01)
optimization.windows_nt-x64.MIBC.Runtime, optimization.windows_nt-x86.MIBC.Runtime, optimization.linux-x64.MIBC.Runtime, optimization.windows_nt-arm64.MIBC.Runtime, optimization.linux-arm64.MIBC.Runtime (Version 1.0.0-prerelease.24462.2)
Removed Dependencies:
Microsoft.SourceBuild.Intermediate.source-build-reference-packages (Version 9.0.0-alpha.1.25223.3)
Microsoft.SourceBuild.Intermediate.msbuild (Version 17.13.24-preview-25209-01)
optimization.windows_nt-x64.MIBC.Runtime, optimization.windows_nt-x86.MIBC.Runtime, optimization.linux-x64.MIBC.Runtime, optimization.windows_nt-arm64.MIBC.Runtime, optimization.linux-arm64.MIBC.Runtime (Version 1.0.0-prerelease.24462.2)
[[ commit created by automation ]]
Removed Dependencies:
Microsoft.SourceBuild.Intermediate.source-build-reference-packages (Version 9.0.0-alpha.1.25223.3)
Microsoft.SourceBuild.Intermediate.msbuild (Version 17.13.24-preview-25209-01)
optimization.windows_nt-x64.MIBC.Runtime, optimization.windows_nt-x86.MIBC.Runtime, optimization.linux-x64.MIBC.Runtime, optimization.windows_nt-arm64.MIBC.Runtime, optimization.linux-arm64.MIBC.Runtime (Version 1.0.0-prerelease.24462.2)
Removed Dependencies:
Microsoft.SourceBuild.Intermediate.source-build-reference-packages (Version 9.0.0-alpha.1.25223.3)
Microsoft.SourceBuild.Intermediate.msbuild (Version 17.13.24-preview-25209-01)
optimization.windows_nt-x64.MIBC.Runtime, optimization.windows_nt-x86.MIBC.Runtime, optimization.linux-x64.MIBC.Runtime, optimization.windows_nt-arm64.MIBC.Runtime, optimization.linux-arm64.MIBC.Runtime (Version 1.0.0-prerelease.24462.2)
* [VMR] Codeflow 13ad646-13ad646

[[ commit created by automation ]]

* Update dependencies from https://github.com/dotnet/dotnet build 269418
No dependency updates to commit

* Update dependencies from https://github.com/dotnet/dotnet build 269499
Removed Dependencies:
Microsoft.SourceBuild.Intermediate.source-build-reference-packages (Version 9.0.0-alpha.1.25223.3)
Microsoft.SourceBuild.Intermediate.msbuild (Version 17.13.24-preview-25209-01)
optimization.windows_nt-x64.MIBC.Runtime, optimization.windows_nt-x86.MIBC.Runtime, optimization.linux-x64.MIBC.Runtime, optimization.windows_nt-arm64.MIBC.Runtime, optimization.linux-arm64.MIBC.Runtime (Version 1.0.0-prerelease.24462.2)

* Update dependencies from https://github.com/dotnet/dotnet build 269610
Removed Dependencies:
Microsoft.SourceBuild.Intermediate.source-build-reference-packages (Version 9.0.0-alpha.1.25223.3)
Microsoft.SourceBuild.Intermediate.msbuild (Version 17.13.24-preview-25209-01)
optimization.windows_nt-x64.MIBC.Runtime, optimization.windows_nt-x86.MIBC.Runtime, optimization.linux-x64.MIBC.Runtime, optimization.windows_nt-arm64.MIBC.Runtime, optimization.linux-arm64.MIBC.Runtime (Version 1.0.0-prerelease.24462.2)

* Update DotNetBuild.props

* [VMR] Codeflow f5705c8-b53264c

[[ commit created by automation ]]

* Update dependencies from https://github.com/dotnet/dotnet build 269628
Removed Dependencies:
Microsoft.SourceBuild.Intermediate.source-build-reference-packages (Version 9.0.0-alpha.1.25223.3)
Microsoft.SourceBuild.Intermediate.msbuild (Version 17.13.24-preview-25209-01)
optimization.windows_nt-x64.MIBC.Runtime, optimization.windows_nt-x86.MIBC.Runtime, optimization.linux-x64.MIBC.Runtime, optimization.windows_nt-arm64.MIBC.Runtime, optimization.linux-arm64.MIBC.Runtime (Version 1.0.0-prerelease.24462.2)

* Update dependencies from https://github.com/dotnet/dotnet build 269724
Removed Dependencies:
Microsoft.SourceBuild.Intermediate.source-build-reference-packages (Version 9.0.0-alpha.1.25223.3)
Microsoft.SourceBuild.Intermediate.msbuild (Version 17.13.24-preview-25209-01)
optimization.windows_nt-x64.MIBC.Runtime, optimization.windows_nt-x86.MIBC.Runtime, optimization.linux-x64.MIBC.Runtime, optimization.windows_nt-arm64.MIBC.Runtime, optimization.linux-arm64.MIBC.Runtime (Version 1.0.0-prerelease.24462.2)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Copy link
Contributor

github-actions bot commented May 28, 2025

❗ Release notes required

@T-Gro,

Caution

No release notes found for the changed paths (see table below).

Please make sure to add an entry with an informative description of the change as well as link to this pull request, issue and language suggestion if applicable. Release notes for this repository are based on Keep A Changelog format.

The following format is recommended for this repository:

* <Informative description>. ([PR #XXXXX](https://github.com/dotnet/fsharp/pull/XXXXX))

See examples in the files, listed in the table below or in th full documentation at https://fsharp.github.io/fsharp-compiler-docs/release-notes/About.html.

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

You can open this PR in browser to add release notes: open in github.dev

Change path Release notes path Description
src/Compiler docs/release-notes/.FSharp.Compiler.Service/10.0.100.md No release notes found or release notes format is not correct

T-Gro and others added 18 commits May 28, 2025 21:43
[automated] Merge branch 'main' => 'release/dev18.0'
[automated] Merge branch 'main' => 'release/dev18.0'
[automated] Merge branch 'main' => 'release/dev18.0'
[automated] Merge branch 'main' => 'release/dev18.0'
… Build ID 2724828 (#18662)

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2723736

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2723736
[automated] Merge branch 'main' => 'release/dev18.0'
* Update copilot-setup-steps.yml with dotnet tool restore (#18675)

Make copilot run dotnet tool restore during setup so it can use fantomas

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250609.1 (#18676)

optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime
 From Version 1.0.0-prerelease.25304.1 -> To Version 1.0.0-prerelease.25309.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Restore language server sln in copilot-setup-steps.yml (#18677)

Add a build step in copilot setup

* Fix roslyn versions to resolve NGEN issues (#18678)

---------

Co-authored-by: Adam Boniecki <20281641+abonie@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
* Add new sln file for LSP proj on ubuntu

Create a solution file to be run by copilot on a non-windows machine.
Exclude Editor project from it due to windows dependencies. The LSP
project itself targets net8.0-windows - TODO investigate if this is
needed, we have to either conditionally change the target framework for
copilot or just drop "-windows" part

* Change target on non-windows platform

Point is to enable agents running on ubuntu to build - might not work
properly on non-windows though.

---------

Co-authored-by: Adam Boniecki <20281641+abonie@users.noreply.github.com>
Co-authored-by: Adam Boniecki <abonie@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: New
Development

Successfully merging this pull request may close these issues.

5 participants