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

.config/service-branch-merge.json

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

.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.202",
+    "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,

.github/CODEOWNERS

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

.github/copilot-instructions.md

@@ -1,34 +1,65 @@
 # GitHub Copilot Instructions for F# Compiler
 
-## Language and Environment
+## 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` 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 [coding standards](docs/coding-standards.md), especially:
+### 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 [overview](docs/overview.md) for key compiler data formats and representations
+- Follow docs/overview.md for key compiler data formats and representations
 
-## Type System Handling
+### 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
+### 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
+### Documentation and Naming
 - Document public APIs with XML comments
 - Use descriptive function names that indicate transformation direction
-- Follow established naming conventions in error messages
+- 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/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

NuGet.config

@@ -8,7 +8,6 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-7ad4e1c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-7ad4e1c7/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -20,6 +19,8 @@
     <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
     <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
+    <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
+    <add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
     <add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />

README.md

@@ -132,3 +132,13 @@ If you're curious about F# itself, check out these links:
 * [Get started with F#](https://learn.microsoft.com/dotnet/fsharp/get-started/)
 * [F# Software Foundation](https://fsharp.org)
 * [F# Testimonials](https://fsharp.org/testimonials)
+
+## Contributors ✨
+
+F# exists because of these wonderful people:
+
+<a href="https://github.com/dotnet/fsharp/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=dotnet/fsharp" />
+</a>
+
+Made with [contrib.rocks](https://contrib.rocks).