Skip to content

Conversation

@github-actions
Copy link
Contributor

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:

  • JoeRobich
  • brianrourkeboll
  • majocha
  • mmitche
  • Thorium
  • vzarytovskii
  • 0101
  • T-Gro
  • edgarfgp
  • ncave
  • dotnet-maestro[bot]
  • KevinRansom
  • progressive-galib
  • teo-tsirpanis
  • isaacabraham
  • psfinaki
  • dotnet-bot

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 git@github.com: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 git@github.com:dotnet/fsharp merge/main-to-feature/lsp
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com: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.

vzarytovskii and others added 30 commits October 8, 2024 14:46
…ase/dev17.13

Merge release/dev17.12 to release/dev17.13
…ase/dev17.13

Merge release/dev17.12 to release/dev17.13
…ase/dev17.13

Merge release/dev17.12 to release/dev17.13
… Build ID 2567162 (#17912)

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

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2567162
@github-actions github-actions bot requested review from a team as code owners January 27, 2025 13:08
KevinRansom and others added 16 commits January 29, 2025 11:25
…ated static fields (#18280)

* Fix optimizer bug where field.Index included compiler generated static fields

* notes added
* Support for 'use' on a nullable IDisposable

* release notes
#18281)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250128.6

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.25066.1 -> To Version 9.0.0-alpha.1.25078.6

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250131.6

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.25066.1 -> To Version 9.0.0-alpha.1.25081.6

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Petr <psfinaki@users.noreply.github.com>
…127.4 (#18282)

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

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

* Warn when upcast drops nullness via FindUniqueFeasibleSupertype

* temporary null shutuops  before `use` is softened

* notes added
* Remove Cancellable.UsingToken from tests

The token is now always set inside the cancellable computation

* Release notes

---------

Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
* Add missing project reference from FSharpSuite to fsc project

* fix
* Symbols: add FSharpAssembly.IsFSharp

* Surface area

* Release notes
@0101 0101 merged commit f6477bf into feature/lsp Feb 6, 2025
28 of 31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.