Skip to content
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

[automated] Merge branch 'main' => 'feature/lsp' #18297

Open
wants to merge 12 commits into
base: feature/lsp
Choose a base branch
from

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Feb 7, 2025

I detected changes in the main branch which have not been merged yet to feature/lsp. I'm a robot and am configured to help you automatically keep feature/lsp up to date, so I've opened this PR.

This PR merges commits made on main by the following committers:

  • T-Gro

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout main
git pull --ff-only
git checkout feature/lsp
git pull --ff-only
git merge --no-ff main

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/fsharp HEAD:merge/main-to-feature/lsp
or if you are using SSH
git push [email protected]:dotnet/fsharp HEAD:merge/main-to-feature/lsp

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-to-feature/lsp'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/main-to-feature/lsp origin/feature/lsp
git pull https://github.com/dotnet/fsharp merge/main-to-feature/lsp
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/fsharp HEAD:merge/main-to-feature/lsp
or if you are using SSH
git fetch
git checkout -b merge/main-to-feature/lsp origin/feature/lsp
git pull [email protected]:dotnet/fsharp merge/main-to-feature/lsp
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/fsharp HEAD:merge/main-to-feature/lsp

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

T-Gro added 2 commits February 6, 2025 12:02
…uagePrimitves into instance method calls (#18296)

* Handle |null types when optimizing away eqals/hash/compare from function call to instance method

* Set propper test assert

* fantomas and notes

* remove comment
@github-actions github-actions bot requested a review from a team as a code owner February 7, 2025 13:43
@github-actions github-actions bot force-pushed the merge/main-to-feature/lsp branch from 25db8cf to ee55997 Compare February 7, 2025 13:43
@github-actions github-actions bot requested a review from a team as a code owner February 8, 2025 19:02
T-Gro and others added 9 commits February 10, 2025 11:38
Contributes to dotnet/sdk#46642

NuGet added a new feature that automatically prunes package and project references that are provided by the shared framework that is targeted.
* trace test run activity

* declutter StackGuard.Guard traces

* add otel to debug vsix

* ref otel in debug only

* delay tags allocation

* fix opens

* format

* better naming
* Cancellable: fix leaking cancellation token

* Release notes

Update docs/release-notes/.FSharp.Compiler.Service/9.0.300.md

* Set Cancellable.Token in transparent compiler

* Review fixes

* Move setting the token

* Fantomas

* Transparent compiler

* il bsl

---------

Co-authored-by: Petr <[email protected]>
…211.5 (#18310)

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
 From Version 9.0.0-beta.25077.4 -> To Version 9.0.0-beta.25111.5

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

* Resolve `nameof` in `nameof<'T>`

* Resolve `nameof` in `match … with nameof ident -> …`

* Add `nameof` classification tests

* Update release notes

* Might as well make them compilable

* Show `nameof` as keyword in `nameof<…>` even when the type parameter is invalid

* Touchup
* simplify

* add comment

* already shipped
NuGet added a new feature that automatically prunes package and project references that are provided by the shared framework that is targeted.

Resolve the one warning that got emitted when building the repository in non-source-only mode.
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.

7 participants