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:

  • T-Gro
  • Martin521
  • majocha
  • Copilot
  • dotnet-maestro[bot]
  • evgTSV
  • edgarfgp
  • brianrourkeboll
  • dawedawe
  • Thorium
  • Lanayx
  • vzarytovskii
  • DedSec256
  • KevinRansom
  • AlexDelepine
  • auduchinok

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.

dotnet-maestro bot and others added 30 commits April 28, 2025 12:07
…425.6 (#18511)

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Fix mixed emit-multi+/- sessions

* fantomas

* ilverify baseline
* Update dependencies from https://github.com/dotnet/arcade build 20250505.3

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

* Disable report prebuilt usage

Remove SB intermediates & prebuilt baseline file

Fixes dotnet/source-build#5085

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <[email protected]>
…505.5 (#18538)

Microsoft.DotNet.Arcade.Sdk
 From Version 9.0.0-beta.25255.3 -> To Version 9.0.0-beta.25255.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Kevin Ransom (msft) <[email protected]>
* make attribute targets mismatches a warning and not an error.

* release notes

* update tests

* update baselines

* Update baselines

* Move attribute form logic to an AP

* Fix merge
* VS Insertion pipeline update

* fs version changed
* Update dependencies from https://github.com/dotnet/arcade build 20250513.5

Microsoft.DotNet.Arcade.Sdk
 From Version 9.0.0-beta.25255.5 -> To Version 9.0.0-beta.25263.5

* Delete wrong src/arcade folder

See dotnet/arcade-services#4837

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Alexander Köplinger <[email protected]>
dotnet-maestro bot and others added 13 commits May 28, 2025 21:30
…otnet-optimization build 20250506.1 (#18615)

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.24462.2 -> To Version 1.0.0-prerelease.25256.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Update dependencies from https://github.com/dotnet/msbuild build 20250526.10

Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core
 From Version 17.13.26 -> To Version 17.15.0-preview-25276-10

* Update dependencies from https://github.com/dotnet/msbuild build 20250527.8

Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core
 From Version 17.13.26 -> To Version 17.15.0-preview-25277-08

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Tomas Grosup <[email protected]>
This special-casing allows us to update FSharp.Core to avoid boxing
when caling the `string` function on enums and signed integral types
going forward while still allowing the updated version of FSharp.Core
to be fully compatible with older compilers.

Adding support for some form of constraint in library-only static
optimizations instead would have been problematic for multiple reasons.
Supporting something like `when 'T : enum<'U>` would have required
additional modifications to the compiler and would not have been
consumable by older compilers. It would also introduce a new type
variable. While something like `when 'T : 'T & #Enum` is already
syntactically valid, it would add that constraint to the entire `string`
function without further modification to the typechecker. It would also
not be consumable by older compilers.

I think adding a special case for enums is justifiable since (1) enums are a
special kind of type to begin with, and (2) static optimization
constraints are only allowed in FSharp.Core, so the change to the
language itself is quite small.
@abonie abonie merged commit 6191e5d into feature/lsp May 29, 2025
30 of 37 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.