Skip to content

Conversation

@abonie
Copy link
Member

@abonie abonie commented Jun 23, 2025

Cleaning up, since we've merged feature/lsp to main some time ago, feature-lsp-branch-mege.json has been removed already

Cleaning up, sicne we've merged feature/lsp to main some time ago
@abonie abonie requested a review from a team as a code owner June 23, 2025 12:20
@abonie abonie added the NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes label Jun 23, 2025
@github-actions
Copy link
Contributor

⚠️ Release notes required, but author opted out

Warning

Author opted out of release notes, check is disabled for this pull request.
cc @dotnet/fsharp-team-msft

1 similar comment
@github-actions
Copy link
Contributor

⚠️ Release notes required, but author opted out

Warning

Author opted out of release notes, check is disabled for this pull request.
cc @dotnet/fsharp-team-msft

@github-project-automation github-project-automation bot moved this from New to In Progress in F# Compiler and Tooling Jun 23, 2025
@T-Gro T-Gro merged commit a325ab3 into main Jun 23, 2025
5 checks passed
@github-project-automation github-project-automation bot moved this from In Progress to Done in F# Compiler and Tooling Jun 23, 2025
@T-Gro T-Gro deleted the lsp-branch-merge-cleanup branch June 23, 2025 12:48
T-Gro added a commit that referenced this pull request Jun 24, 2025
* 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 <tomasgrosup@microsoft.com>

* [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 <egonzalez@totallymoney.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>
Co-authored-by: Patrick Stevens <3138005+Smaug123@users.noreply.github.com>
Co-authored-by: Adam Boniecki <20281641+abonie@users.noreply.github.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
brianrourkeboll pushed a commit to brianrourkeboll/fsharp that referenced this pull request Sep 11, 2025
Cleaning up, sicne we've merged feature/lsp to main some time ago
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

3 participants