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

.config/dotnet-tools.json

@@ -45,7 +45,7 @@
       "rollForward": true
     },
     "fantomas": {
-      "version": "6.2.3",
+      "version": "7.0.1",
       "commands": [
         "fantomas"
       ],

.config/service-branch-merge.json

@@ -1,13 +1,21 @@
 {
     "merge-flow-configurations": {
         // regular branch flow
+        "release/dev17.12": {
+            "MergeToBranch": "release/dev17.13",
+            "ExtraSwitches": "-QuietComments"
+        },
         "release/dev17.13": {
+            "MergeToBranch": "release/dev17.14",
+            "ExtraSwitches": "-QuietComments"
+        },
+        "release/dev17.14": {
             "MergeToBranch": "main",
             "ExtraSwitches": "-QuietComments"
         },
         "main": {
-            "MergeToBranch": "release/dev17.14",
+            "MergeToBranch": "release/dev18.0",
             "ExtraSwitches": "-QuietComments"
         }
     }
-}
+}

.devcontainer/devcontainer.json

@@ -1,12 +1,12 @@
 // For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
 {
     "name": "F#",
-    "image": "mcr.microsoft.com/dotnet/sdk:9.0.200",
+    "image": "mcr.microsoft.com/dotnet/sdk:10.0.100-preview.3",
     "features": {
-        "ghcr.io/devcontainers/features/common-utils:2.5.2": {},
-        "ghcr.io/devcontainers/features/git:1.3.2": {},
-        "ghcr.io/devcontainers/features/github-cli:1.0.13": {},
-        "ghcr.io/devcontainers/features/dotnet:2.2.0": {}
+        "ghcr.io/devcontainers/features/common-utils:2.5.3": {},
+        "ghcr.io/devcontainers/features/git:1.3.3": {},
+        "ghcr.io/devcontainers/features/github-cli:1.0.14": {},
+        "ghcr.io/devcontainers/features/dotnet:2.2.1": {}
     },
     "hostRequirements": {
         "cpus": 2,

.fantomasignore

@@ -40,19 +40,6 @@ src/Compiler/Checking/SignatureConformance.fs
 src/Compiler/Checking/TypeHierarchy.fs
 src/Compiler/Checking/TypeRelations.fs
 
-# nullness-related problems
-src/Compiler/Utilities/lib.fsi
-src/Compiler/Utilities/Cancellable.fsi
-src/FSharp.Core/tasks.fsi
-src/FSharp.Core/tasks.fs
-src/FSharp.Core/resumable.fs
-src/Compiler/DependencyManager/DependencyProvider.fs
-src/FSharp.Core/fslib-extra-pervasives.fs
-src/FSharp.Core/fslib-extra-pervasives.fsi
-
-# Incorrectly formatted: https://github.com/dotnet/fsharp/pull/14645/commits/49443a67ea8a17670c8a7c80c8bdf91f82231e91 or https://github.com/fsprojects/fantomas/issues/2733
-# This CompilerImports.fs behavior is not fixed yet, following up in  https://github.com/fsprojects/fantomas/issues/2733
-src/Compiler/Driver/CompilerImports.fs
 # The following files were formatted, but the "format, --check" loop is not stable.
 # Fantomas formats them, but still thinks they need formatting
 src/Compiler/Optimize/DetupleArgs.fs
@@ -96,44 +83,6 @@ src/FSharp.Core/printf.fs
 src/FSharp.Core/Query.fs
 src/FSharp.Core/seqcore.fs
 
-
-# fsharp  (to investigate)
-
-**/TypeProviders.fsi
-**/tainted.fsi
-
-# uses nullness features
-
-**/DependencyProvider.fsi
-src/FSharp.Core/array.fs
-src/FSharp.Core/option.fsi
-src/FSharp.Core/option.fs
-src/fsi/console.fs
-src/FSharp.Build/FSharpCommandLineBuilder.fs
-
-src/Compiler/Utilities/Activity.fs
-src/Compiler/Utilities/sformat.fs
-src/Compiler/Utilities/illib.fsi
-src/Compiler/Utilities/illib.fs
-
-
-src/Compiler/Utilities/NullnessShims.fs
-src/Compiler/Utilities/DependencyGraph.fs
-src/Compiler/Utilities/LruCache.fsi
-src/Compiler/Utilities/LruCache.fs
-src/Compiler/Utilities/HashMultiMap.fsi
-src/Compiler/Utilities/HashMultiMap.fs
-src/Compiler/Facilities/AsyncMemoize.fsi
-src/Compiler/Facilities/AsyncMemoize.fs
-src/Compiler/AbstractIL/il.fs
-src/Compiler/SyntaxTree/LexerStore.fs
-
-src/Compiler/Driver/GraphChecking/Graph.fsi
-src/Compiler/Driver/GraphChecking/Graph.fs
-
-src/Compiler/DependencyManager/NativeDllResolveHandler.fsi
-src/Compiler/DependencyManager/AssemblyResolveHandler.fsi
-
 # Fantomas limitations on implementation files  (to investigate)
 
 src/Compiler/AbstractIL/ilwrite.fs

.github/CODEOWNERS

@@ -1,3 +1 @@
 * @dotnet/fsharp-team-msft
-/eng/DotNetBuild.props @dotnet/product-construction
-/eng/SourceBuild* @dotnet/source-build

.github/ISSUE_TEMPLATE/nullness_issue.yml

@@ -13,7 +13,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Please check at [Nullable Reference Types RFC](https://github.com/fsharp/fslang-design/blob/main/RFCs/FS-1060-nullable-reference-types.md) if this issue isn't a known limitation, such as missing flow-control analysis after branching constructs like `if` or `while`. Also check at [existing nullness issues](https://github.com/dotnet/fsharp/issues?q=is%3Aissue+label%3AArea-Nullness+) if it hasn't been reported already.
+        Please check at [Nullable Reference Types RFC](https://github.com/fsharp/fslang-design/blob/main/FSharp-9.0/FS-1060-nullable-reference-types.md) if this issue isn't a known limitation, such as missing flow-control analysis after branching constructs like `if` or `while`. Also check at [existing nullness issues](https://github.com/dotnet/fsharp/issues?q=is%3Aissue+label%3AArea-Nullness+) if it hasn't been reported already.
         Please provide a succinct description of the issue and choose 1 or more from the following categories of impact
   - type: checkboxes
     id: categories
@@ -73,4 +73,4 @@ body:
         Are there any language constructs (typically pattern matching, library constructs, Null/NonNull active patterns, explicit type annotations) allowing the same logic be expressed differently in order to mitigate the experienced nullness issue?
       placeholder: Possible workaround
     validations:
-      required: false
+      required: false

.github/copilot-instructions.md

@@ -0,0 +1,65 @@
+# GitHub Copilot Instructions for F# Compiler
+
+## Build and test steps (Linux)
+
+Always build and test the project before submitting your solution.
+
+1. As an initial smoke test for a quick build, run `dotnet build ./FSharp.Compiler.Service.sln --verbosity quiet --no-restore` from the repository root. 
+Only if this succeeds, move on.
+2. From the repository root, run `./build.sh -c Release --norestore`. This creates a prototype compiler, and then the proto compiler builds itself again.
+3. Only if two previous steps suceed, run automated tests with `./build.sh -c Release --testcoreclr --norestore`.
+
+
+If the build fails with errors or non-zero exit code, fix it based on the error messages given and repeat the build step.
+
+If either of the steps 1/2/3 fails, fix the errors and repeat from step 1 - up to 3 times.
+After that, report all relevant build errors, error messages and specific details about failing tests and their test test failure details.
+
+### Fixing tests
+
+- If any of the tests fail: Check if the test, test expectation (either inline in the test or a reference file configured for the test) or implementation needs updating, and fix it
+- If you see test failures for Surface area baselines: Refer to "Updating FCS surface area baselines" in devguide.md
+- If you see test failures for IL baselines: Refer to "Updating ILVerify baselines" in devguide.md
+
+
+## Acceptance criteria
+
+- Code is formatted using `dotnet fantomas .` executed at the repo root.
+- Builds without errors.
+- Runs tests without errors. If some tests needed adjustments, those test expectations/baseline adjustments were done.
+- If the acceptance criteria was not met, collect the error messages (build failures or failing tests) and report them.
+
+## Coding standards
+
+### Language and Environment
+- Use modern F# with functional-first approach
+- Target .NET Standard 2.0 for compatibility
+- Avoid external dependencies - the codebase is self-contained
+
+### Code Style and Standards
+- Follow docs/coding-standards.md, especially:
+  - Prefer immutability and pure functions
+  - Use consistent naming (see abbreviation guide)
+  - Process complex types recursively with pattern matching
+  - Avoid single-character identifiers except in established patterns
+- This project uses .fsi signature files. When adding a new public API to a namespace/module which will be consumed from other file, add it to the respective .fsi signature file as well
+- Follow docs/overview.md for key compiler data formats and representations
+
+### Type System Handling
+- When working with `TType` instances, use appropriate stripping functions:
+  - `stripTyparEqns` - Removes inference equations from type parameters
+  - `stripTyEqns` - Removes type equations and type abbreviations
+  - `stripTyEqnsAndErase` - Also erases compilation representations
+  - Match the appropriate stripper to the context (e.g., display vs compilation)
+  - Check equality with `typeEquiv` after stripping rather than direct comparison
+
+### Core Data Structures
+- Use F# discriminated unions for type representations
+- Respect representation hiding through access control
+- Use `remapX` functions when transforming types across boundaries
+- Be aware of performance implications for recursive type operations
+
+### Documentation and Naming
+- Document public APIs with XML comments
+- Use descriptive function names that indicate transformation direction
+- Follow established naming conventions for error messages based on FSComp.txt file. Put all error messages into the FSComp.txt file to ensure localisation

.github/policies/resourceManagement.yml

@@ -0,0 +1,43 @@
+id: 
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+owner: 
+resource: repository
+disabled: false
+where: 
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+    - if:
+      - payloadType: Issues
+      - labelAdded:
+          label: Breaking-change
+      then:
+      - addReply:
+          reply: >-
+            Refer to the [.NET SDK breaking change guidelines](https://github.com/dotnet/sdk/blob/main/documentation/project-docs/breaking-change-guidelines.md#required-process-for-all-net-sdk-breaking-changes)
+      description: Add breaking change doc instructions to issue
+    - if:
+      - payloadType: Pull_Request
+      - labelAdded:
+          label: Breaking-change
+      then:
+      - addLabel:
+          label: needs-breaking-change-doc-created
+      - addReply:
+          reply: >-
+            Added `needs-breaking-change-doc-created` label because this PR has the `breaking-change` label. 
+
+
+            When you commit this breaking change:
+
+
+            1. [ ] Create and link to this PR and the issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://aka.ms/dotnet/docs/new-breaking-change-issue), then remove this `needs-breaking-change-doc-created` label.
+
+            2. [ ] Ask a committer to mail the `.NET SDK Breaking Change Notification` email list.
+
+
+            You can refer to the [.NET SDK breaking change guidelines](https://github.com/dotnet/sdk/blob/main/documentation/project-docs/breaking-change-guidelines.md)
+      description: Add breaking change instructions to PR.
+onFailure: 
+onSuccess: 

.github/workflows/add_to_project.yml

@@ -16,7 +16,7 @@ permissions:
 
 jobs:
   cleanup_old_runs:
-      runs-on: ubuntu-20.04
+      runs-on: ubuntu-latest
       if: github.event_name != 'pull_request_target'
       permissions:
         actions: write

.github/workflows/commands.yml

@@ -9,12 +9,12 @@ on:
 permissions:
   contents: write
   issues: write
-  pull-requests: write
+  pull-requests: read
 
 jobs:
   cleanup_old_runs:
     if: github.event.schedule == '0 13 * * *'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       actions: write
     env:
@@ -33,7 +33,7 @@ jobs:
 
   run_command:
     if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/run')
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - name: Extract command to run
       uses: actions/github-script@v3
@@ -75,31 +75,40 @@ jobs:
     - name: Process fantomas command
       if: steps.command-extractor.outputs.result == 'fantomas'
       id: fantomas
-      run: dotnet fantomas . -r
-    - name: Process fantomas command
+      run: dotnet fantomas .
+    - name: Process xlf command
       if: steps.command-extractor.outputs.result == 'xlf'
       id: xlf
       run: dotnet build src/Compiler /t:UpdateXlf
+
     - name: Commit and push changes
-      if: steps.fantomas.outcome == 'success' || steps.xlf.outcome == 'success'
+      if: steps.fantomas.outcome == 'success' || steps.xlf.outcome == 'success' || steps.ilverify.outcome == 'success'
       run: |
+        # Only commit if there are actual changes
+        if git diff --quiet; then
+          echo "No changes to commit, skipping."
+          exit 0
+        fi
+
         git config --local user.name "github-actions[bot]"
         git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
         git commit -a -m 'Automated command ran: ${{ steps.command-extractor.outputs.result }}
 
           Co-authored-by: ${{ github.event.comment.user.login }} <${{ github.event.comment.user.id }}+${{ github.event.comment.user.login }}@users.noreply.github.com>'
-        git push
+        git push origin HEAD:"refs/heads/$PR_HEAD_REF"\
     - name: Post command comment
-      if: steps.fantomas.outcome == 'success' || steps.xlf.outcome == 'success'
+      if: steps.fantomas.outcome == 'success' || steps.xlf.outcome == 'success' || steps.ilverify.outcome == 'success'
       uses: actions/github-script@v3
       with:
         script: |
           // Probably, there's more universal way of getting outputs, but my gh-actions-fu is not that good.
           var output = ""
           if ("${{steps.command-extractor.outputs.result}}" == 'fantomas') {
             output = "${{steps.fantomas.outputs.result}}"
-          } else if("${{steps.command-extractor.outputs.result}}" == 'xlf') {
+          } else if ("${{steps.command-extractor.outputs.result}}" == 'xlf') {
             output = "${{steps.xlf.outputs.result}}"
+          } else if ("${{steps.command-extractor.outputs.result}}" == 'ilverify') {
+            output = "${{steps.ilverify.outputs.result}}"
           }
           const body = `Ran ${{ steps.command-extractor.outputs.result }}: https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${process.env.GITHUB_RUN_ID}\n${output}`;
           await github.issues.createComment({

.github/workflows/copilot-setup-steps.yml

@@ -0,0 +1,24 @@
+name: "Copilot Setup Steps"
+
+# Allow testing of the setup steps from your repository's "Actions" tab.
+on: workflow_dispatch
+
+jobs:
+  # The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
+  copilot-setup-steps:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+
+    # You can define any steps you want, and they will run before the agent starts.
+    # If you do not check out your code, Copilot will do this for you.
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json
+      - name: Restore solution
+        env:
+          CI: false
+        run: dotnet build ./FSharp.Compiler.Service.sln --verbosity quiet

.gitignore

@@ -134,4 +134,6 @@ positive.exe
 /tests/FSharp.Compiler.ComponentTests/FSharpChecker/StandardOutput.txt
 
 # ilverify baseline result files
-*.bsl.actual
+*.bsl.actual
+/src/FSharp.DependencyManager.Nuget/StandardError.txt
+/src/FSharp.DependencyManager.Nuget/StandardOutput.txt

DEVGUIDE.md

@@ -252,6 +252,15 @@ For example:
 module TimeCritical =
 ```
 
+For stress testing async code you can use a custom `FSharp.Test.StressAttribute`.
+For example, applied to a single xUnit test case:
+```fsharp
+[<Theory; Stress(Count = 1000)>]
+```
+it will start it many times at the same time, and execute in parallel.
+
+
+
 
 ### Updating FCS surface area baselines
 

Directory.Build.props

@@ -10,11 +10,6 @@
     <IgnoreMibc Condition="'$(IgnoreMibc)' == ''">$(DotNetBuildSourceOnly)</IgnoreMibc>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- TODO: These need to be removed once we merge/release the new SDK with noward and line fixes. -->
-    <NoWarn>$(NoWarn);FS0064;FS1182</NoWarn>
-  </PropertyGroup>
-
   <!--
    When developers load the FSharp.Compiler.Service solution we set FSHARPCORE_USE_PACKAGE to true if it hasn't already been set to a value.
    This option ensures that building and testing uses the specified FSharp.Core nuget package instead of the local FSharp.Core project.
@@ -62,7 +57,7 @@
          since it's a non-arcade and non-sourcebuild scenario -->
     <FsLexPath>$(ArtifactsDir)/bin/fslex/$(Configuration)/$(FSharpNetCoreProductDefaultTargetFramework)/$(RuntimeIdentifier)/fslex.dll</FsLexPath>
     <FsYaccPath>$(ArtifactsDir)/bin/fsyacc/$(Configuration)/$(FSharpNetCoreProductDefaultTargetFramework)/$(RuntimeIdentifier)/fsyacc.dll</FsYaccPath>
-    <DefineConstants>NO_CHECKNULLS;BUILDING_WITH_LKG;NO_NULLCHECKING_LIB_SUPPORT;$(DefineConstants)</DefineConstants>
+    <DefineConstants>BUILDING_WITH_LKG;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)/eng/Versions.props" Condition="'$(DISABLE_ARCADE)' == 'true'" />