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' #18273

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

Conversation

github-actions[bot]
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 [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.

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
majocha and others added 28 commits January 9, 2025 16:46
* fix AsyncLazy cancellation

* baselines
* otel instrumentation for xunit test runs

* wip

* sort out deps version conflict

* disable for desktop
…ence-packages build 20250110.3 (#18226)

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.24619.1 -> To Version 9.0.0-alpha.1.25060.3

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

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Kevin Ransom (msft) <[email protected]>
…ic arguments (#17877)

* tests

* code

* baseline

* fantomas

* release notes

* ilverify baselines

* Update tests/FSharp.Compiler.ComponentTests/Conformance/LexicalAnalysis/SymbolicOperators.fs

Yeah the comments are pointless.

Co-authored-by: Tomas Grosup <[email protected]>

* Feedback pt 1

* temp

* tests

* release notes

* debug

* Update DEVGUIDE.md

Co-authored-by: Petr <[email protected]>

---------

Co-authored-by: Tomas Grosup <[email protected]>
Co-authored-by: Petr <[email protected]>
…nager/DependencyProvider.fs and refactored. (#18207)

* /Compiler/TypedTree/TypedTreePickle.fs refactored.
"#if" directive around nullness removed from src
Related: #18061 (partially addresses)

- [x] Release notes entry updated: in
    `docs/release-notes/.FSharp.Compiler.Service/9.0.200.md`,

* try 2

* refactoring

* .

* .

* lets hope this works

* .

* fantomas tried with a bit of tricks DependencyProvider.fs

* fantomas ignore

* unformat

---------

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

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

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

* OverallHintExperienceTests
…ence-packages build 20250116.1 (#18242)

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

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

* Updated release notes
* Versioning for 17.14 and 9.0.300 (#18222)

* Pass restore config file arg to bootstrap build

---------

Co-authored-by: Vlad Zarytovskii <[email protected]>
Co-authored-by: Petr <[email protected]>
Co-authored-by: Petr Pokorny <[email protected]>
@github-actions github-actions bot requested review from a team as code owners January 27, 2025 13:08
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.