forked from dotnet/fsharp
-
Notifications
You must be signed in to change notification settings - Fork 0
[automated] Merge branch 'main' => 'feature/lsp' #3
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
Open
github-actions
wants to merge
191
commits into
feature/lsp
Choose a base branch
from
merge/main-to-feature/lsp
base: feature/lsp
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…v17.14 Merge main to release/dev17.14
…v17.14 Merge main to release/dev17.14
…v17.14 Merge main to release/dev17.14
…v17.14 Merge main to release/dev17.14
…v17.14 Merge main to release/dev17.14
…17.14 [automated] Merge branch 'main' => 'release/dev17.14'
…17.14 [automated] Merge branch 'main' => 'release/dev17.14'
…be `not null` typar (dotnet#18343)
* msbuild * Update Versions.props * Revert "Update Versions.props" This reverts commit c1c61eb. * Update SourceBuildPrebuiltBaseline.xml --------- Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
…kProject (dotnet#18366) * added test that fails with transparent compiler only * fix for missing parse diagnostics in TransparentCompiler.ComputeParseAndCheckProject * Fantomas * release notes * ilverify baseline updated
…ion (dotnet#18352) (dotnet#18353) - Update test, release note and comment for Array.InsertManyAt Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
…17.14 [automated] Merge branch 'main' => 'release/dev17.14'
…"T:null and T:struct" dummy constraint (dotnet#18345)
…eady loaded, 2) Use ConcurrentDictionary in thread-safe way (dotnet#18377)
* cherrypick 18355 * revert attributes feature (dotnet#18355) * revert attributes * release notes
…otnet-optimization build 20250506.1 (dotnet#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 <Tomas.Grosup@gmail.com>
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.
* Update dependencies from https://github.com/dotnet/arcade build 20250521.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25271.1 -> To Version 10.0.0-beta.25271.2 * Remove obsolete infra * PR builds - without publish --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com> Co-authored-by: Tomas Grosup <Tomas.Grosup@gmail.com> Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
With the move to latest arcade, we can occassionaly be getting updates to global.json which specify a preview version of .NET. As of now, such pushes will crash CI jobs that happen to use the `UseDotNet@2` task. The ones using build script work just fine as of now already. This changes the config `includePreviewVersions` for the task to allow preview versions
…ar (dotnet#18642) * Add test for active pattern w/fun ty w/unsolved range typar * Treat `(|P|) : 'a -> 'b` similarly to `(|P|) : 'a` That is, for an active pattern whose type is known to be a function type but whose range type is not yet solved, assume that it _could_ be solved to, e.g., another function type. This can show up in, e.g., an active pattern that is defined mutually-recursively with `and`, has no type annotations, and returns a lambda with `fun` or `function`. * Update release notes
…otnet-optimization build 20250602.1 (dotnet#18650) 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.25256.1 -> To Version 1.0.0-prerelease.25302.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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:
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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
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.
or if you are using SSH
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.