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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 78 commits into from
Jul 4, 2025
Merged

Merge from dev18 to main #18625

merged 78 commits into from
Jul 4, 2025
+12,966 −12,946

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
@KevinRansom
new branch
713b113
@T-Gro
Merge branch 'release/dev18.0' into merge/release/dev17.14-to-release…
6f34f38 
…/dev18.0
@T-Gro @vzarytovskii
@psfinaki @0101 @KevinRansom @ViktorHofer @dotnet-maestro @dawedawe @majocha
[automated] Merge branch 'release/dev17.14' => 'release/dev18.0' (#18409
7f44b41 
)

* 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) <[email protected]>

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

* update runtime to 9.0.3 (#18406)

---------

Co-authored-by: Vlad Zarytovskii <[email protected]>
Co-authored-by: Petr <[email protected]>
Co-authored-by: Petr Pokorny <[email protected]>
Co-authored-by: Kevin Ransom (msft) <[email protected]>
Co-authored-by: Tomas Grosup <[email protected]>
Co-authored-by: Viktor Hofer <[email protected]>
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 <[email protected]>
Co-authored-by: Jakub Majocha <[email protected]>
@KevinRansom
Merge branch 'release/dev18.0' into merge/main-to-release/dev18.0
608145d
@KevinRansom
Merge pull request #18456 from dotnet/merge/main-to-release/dev18.0
a973a86 
[automated] Merge branch 'main' => 'release/dev18.0'
@KevinRansom
Merge branch 'release/dev18.0' into merge/main-to-release/dev18.0
0cb37ab
@T-Gro @psfinaki @auduchinok
[automated] Merge branch 'main' => 'release/dev18.0' (#18458)
0d8fedb 
* 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 <[email protected]>
Co-authored-by: Eugene Auduchinok <[email protected]>
@KevinRansom
Merge branch 'release/dev18.0' into merge/main-to-release/dev18.0
21ba49d
@T-Gro
Merge pull request #18464 from dotnet/merge/main-to-release/dev18.0
ba3700e 
[automated] Merge branch 'main' => 'release/dev18.0'
@KevinRansom
Merge branch 'release/dev18.0' into merge/main-to-release/dev18.0
f21ea05
@T-Gro
Merge pull request #18470 from dotnet/merge/main-to-release/dev18.0
e1d447b 
[automated] Merge branch 'main' => 'release/dev18.0'
@T-Gro
Merge branch 'release/dev18.0' into merge/main-to-release/dev18.0
773039a
@T-Gro
Merge pull request #18477 from dotnet/merge/main-to-release/dev18.0
547a1ca 
[automated] Merge branch 'main' => 'release/dev18.0'
@KevinRansom
Fix PM
e3bbfae
Merged PR 49218: Fix Package manager for release /dev17.14
f75efc3 
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 -->
@dotnet-maestro
[release/dev18.0] Source code updates from dotnet/dotnet (#18498)
4c9a512 
* [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>
@T-Gro
Merge branch 'release/dev18.0' into merge/main-to-release/dev18.0
3a2c7ae
@T-Gro @edgarfgp
@Lanayx @mmitche @dotnet-maestro
[automated] Merge branch 'main' => 'release/dev18.0' (#18481)
40712f2 
* 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 <[email protected]>
Co-authored-by: Vladimir Shchur <[email protected]>
Co-authored-by: Matt Mitchell <[email protected]>
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>
@T-Gro
Merge branch 'release/dev18.0' into merge/main-to-release/dev18.0
dbf0fc9
@T-Gro
Merge pull request #18501 from dotnet/merge/main-to-release/dev18.0
e8bfd35 
[automated] Merge branch 'main' => 'release/dev18.0'
@KevinRansom
Merge pull request #18504 from KevinRansom/UpdateNuget_14.0
c1ce3ce 
Update nuget
@T-Gro
Merge branch 'release/dev18.0' into merge/main-to-release/dev18.0
4ecc5e0
@abonie
Merge branch 'release/dev18.0' into merge/release/dev17.14-to-release…
40f8114 
…/dev18.0
@dotnet-maestro
[release/dev18.0] Source code updates from dotnet/dotnet (#18539)
46b6077 
* [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>
@T-Gro
Merge branch 'release/dev18.0' into merge/release/dev17.14-to-release…
215c131 
…/dev18.0
@T-Gro
Merge pull request #18505 from dotnet/merge/release/dev17.14-to-relea…
7279d47 
…se/dev18.0

[automated] Merge branch 'release/dev17.14' => 'release/dev18.0'
@dotnet-maestro
[VMR] Codeflow 025e4e5-ad85650
c9b99ae 
[[ commit created by automation ]]
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 268384
7a1459a 
No dependency updates to commit
@T-Gro
VS insertion - release branch (#18549)
479d5ae
@T-Gro
Merge branch 'release/dev18.0' into darc-release/dev18.0-c4a91a4a-6b2…
fa20313 
…3-4543-a459-8c2f00f0a7fd
T-Gro and others added 13 commits June 10, 2025 12:12
@T-Gro
Merge branch 'release/dev18.0' into merge/main-to-release/dev18.0
ead66e4
@T-Gro
Merge pull request #18665 from dotnet/merge/main-to-release/dev18.0
fcca759 
[automated] Merge branch 'main' => 'release/dev18.0'
@T-Gro
Merge branch 'release/dev18.0' into merge/main-to-release/dev18.0
2044c79
@T-Gro @abonie @dotnet-maestro
[automated] Merge branch 'main' => 'release/dev18.0' (#18685)
733acd8 
* 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 <[email protected]>
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 <[email protected]>
@T-Gro
Merge branch 'release/dev18.0' into merge/main-to-release/dev18.0
866fcad
@T-Gro @abonie
Add new sln file for LSP proj on ubuntu (#18692) (#18694)
83a3323 
* 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 <[email protected]>
Co-authored-by: Adam Boniecki <[email protected]>
@mmitche
Include FSharp pre-release packages in the SDK transport package (#18701
fc212af 
)

* Include FSharp pre-release packages in the SDK transport package
- Enable the SDK to publish the stable-preview packages
- Add a pre-release iteration so that previews can be differentiated.
- Remove the version substitution in the shims project. There was no replacement happening.
@T-Gro
Merge branch 'release/dev18.0' into merge/main-to-release/dev18.0
e4d1f95
@T-Gro @edgarfgp
@dotnet-maestro @Smaug123 @abonie @Copilot
[automated] Merge branch 'main' => 'release/dev18.0' (#18711)
44a24dc 
* More test for error recovery  (#18669)

* [main] Update dependencies from dnceng/internal/dotnet-optimization (#18683)

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250610.1

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.25309.1 -> To Version 1.0.0-prerelease.25310.1

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250611.1

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.25309.1 -> To Version 1.0.0-prerelease.25311.1

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250616.1

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.25309.1 -> To Version 1.0.0-prerelease.25316.1

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250617.1

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.25309.1 -> To Version 1.0.0-prerelease.25317.1

---------

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

* [main] Update dependencies from dotnet/arcade (#18643)

* Expand docstring on SynModuleDecl.Types (#18698)

* Update dependencies from https://github.com/dotnet/arcade build 20250620.5 (#18703)

Microsoft.DotNet.Arcade.Sdk
 From Version 10.0.0-beta.25316.2 -> To Version 10.0.0-beta.25320.5

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

* Remove feature/lsp merge from branch-merge.yml (#18705)

Cleaning up, sicne we've merged feature/lsp to main some time ago

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

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.25317.1 -> To Version 1.0.0-prerelease.25323.1

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

* Update dependencies from https://github.com/dotnet/arcade build 20250623.3 (#18709)

Microsoft.DotNet.Arcade.Sdk
 From Version 10.0.0-beta.25320.5 -> To Version 10.0.0-beta.25323.3

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

* Remove ActivityDisposable conditional directives and replace with System.IDisposable | null (#18707)

---------

Co-authored-by: Edgar Gonzalez <[email protected]>
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 <[email protected]>
Co-authored-by: Patrick Stevens <[email protected]>
Co-authored-by: Adam Boniecki <[email protected]>
Co-authored-by: Copilot <[email protected]>
@T-Gro
Merge branch 'release/dev18.0' into merge/main-to-release/dev18.0
5fdb5b6
@T-Gro @abonie
Turn off dumping mermaid graphs in FSharpWorkspace (#18717) (#18719)
7346d84 
This was added to debug FSharpWorkspace tests on the LSP branch, should
only run in debug mode if at all and we don't need it at the moment

Co-authored-by: Adam Boniecki <[email protected]>
Co-authored-by: Adam Boniecki <[email protected]>
@T-Gro
Merge branch 'release/dev18.0' into merge/main-to-release/dev18.0
57a3279
@T-Gro
Merge pull request #18723 from dotnet/merge/main-to-release/dev18.0
58c7971 
[automated] Merge branch 'main' => 'release/dev18.0'
@T-Gro T-Gro added the NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes label Jul 3, 2025
T-Gro
T-Gro commented Jul 3, 2025
View reviewed changes
T-Gro
T-Gro commented Jul 3, 2025
View reviewed changes
T-Gro
T-Gro commented Jul 3, 2025
View reviewed changes
T-Gro
T-Gro commented Jul 3, 2025
View reviewed changes
T-Gro
T-Gro commented Jul 3, 2025
View reviewed changes
@T-Gro T-Gro marked this pull request as ready for review July 3, 2025 14:34
@T-Gro T-Gro requested a review from a team as a code owner July 3, 2025 14:34
@github-project-automation github-project-automation bot moved this from New to In Progress in F# Compiler and Tooling Jul 3, 2025
@T-Gro
Copy link
Member Author

T-Gro commented Jul 4, 2025

/azp run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@T-Gro T-Gro merged commit 3f48cd6 into main Jul 4, 2025
42 of 43 checks passed
@dotnet-bot dotnet-bot mentioned this pull request Jul 26, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ViktorHofer ViktorHofer ViktorHofer approved these changes

@abonie abonie abonie 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.
6 participants
@T-Gro @ViktorHofer @abonie @KevinRansom @dotnet-bot @mmitche