Skip to content

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

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

Merged
merged 33 commits into from
Apr 28, 2025

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:

  • edgarfgp

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 21 commits January 17, 2025 15:18
[automated] Merge branch 'main' => 'release/dev17.14'
[automated] Merge branch 'main' => 'release/dev17.14'
[automated] Merge branch 'main' => 'release/dev17.14'
[automated] Merge branch 'main' => 'release/dev17.14'
* Use correct TFM for source build when OfficialBuildId isn't set (#18397)

* Update dependencies coming from maintenance-packages (#18329)

* Update dependencies coming from maintenance-packages

* Remove temp feed

* Sort

* Push for real the changes this time

* Update to latest in nuget.org

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

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

* Bring back conditions

* missing space

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Kevin Ransom (msft) <[email protected]>
Co-authored-by: Tomas Grosup <[email protected]>

---------

Co-authored-by: Matt Thalman <[email protected]>
Co-authored-by: Carlos Sánchez López <[email protected]>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Kevin Ransom (msft) <[email protected]>
Co-authored-by: Tomas Grosup <[email protected]>
* update devcontainer sdk (#18412)

* deal with hanging test (#18411)

* typo (#18413)

---------

Co-authored-by: Martin <[email protected]>
Co-authored-by: Jakub Majocha <[email protected]>
Co-authored-by: Kevin Ransom (msft) <[email protected]>
[automated] Merge branch 'main' => 'release/dev17.14'
Lanayx and others added 4 commits April 17, 2025 12:18
…ence-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>
…18491)

* Fix overbuilding fsharp & define solution to build in script

FSharp was building two solutions in the VMR on Windows which resulted
in the inner-build building the same thing but in parallel. The builds
each take 7-8 minutes. Fix that by introducing a productBuild switch
(which is already exposed in the Arcade scripts) and condition
which solution to build on it or the existing source-build switch.

Remove the /p:Projects property from DotNetBuild.props.

* proto fix

* Fix repo source-build

* Fixes

* fix

* Add YML test fix

* try

* fix200

* Fix201

* Update azure-pipelines-PR.yml

* Fixesss
@github-actions github-actions bot requested a review from a team as a code owner April 24, 2025 13:41
T-Gro and others added 7 commits April 24, 2025 16:45
…0414.9 (#18478)

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core
 From Version 17.13.24-preview-25209-01 -> To Version 17.13.25-preview-25214-09

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@abonie abonie merged commit 7ac0a54 into feature/lsp Apr 28, 2025
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.

10 participants