Merge from dev18 to main #18625
Merged
Merge from dev18 to main #18625
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
) * 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]>
[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 <[email protected]> Co-authored-by: Eugene Auduchinok <[email protected]>
[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 <[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>
[automated] Merge branch 'main' => 'release/dev18.0'
Update nuget
* [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 ]]
No dependency updates to commit
…3-4543-a459-8c2f00f0a7fd
* 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]>
* 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]>
* 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]>
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]>
[automated] Merge branch 'main' => 'release/dev18.0'
T-Gro
added
the
NO_RELEASE_NOTES
T-Gro
commented
Jul 3, 2025
T-Gro
commented
Jul 3, 2025
T-Gro
commented
Jul 3, 2025
T-Gro
commented
Jul 3, 2025
T-Gro
commented
Jul 3, 2025
ViktorHofer
approved these changes
Jul 3, 2025
abonie
approved these changes
Jul 3, 2025
github-project-automation
bot
moved this from New
to In Progress
in F# Compiler and Tooling
ViktorHofer
approved these changes
Jul 3, 2025
|
/azp run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
brianrourkeboll
pushed a commit
to brianrourkeboll/fsharp
that referenced
this pull request
Sep 11, 2025
* 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. Co-authored-by: Matt Mitchell <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.