Merge branch 'dotnet:main' into main

Author: reinux

.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/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

@@ -14,7 +14,7 @@ permissions:
 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
     - 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).