Merge branch 'release/dev17.4' into merges/release/dev17.3-to-release/dev17.4

Author: vzarytovskii

.config/dotnet-tools.json

@@ -3,11 +3,10 @@
   "isRoot": true,
   "tools": {
     "fantomas": {
-      "version": "5.0.0-alpha-008",
+      "version": "5.0.0-beta-005",
       "commands": [
         "fantomas"
       ]
     }
   }
 }
-

.devcontainer/Dockerfile

@@ -3,8 +3,8 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-ARG VARIANT=6.0-focal
-FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
+ARG VARIANT=7.0-bullseye-slim
+FROM mcr.microsoft.com/dotnet/sdk:${VARIANT}
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive

.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# (.NET 6)",
+    "name": "F# (.NET 7)",
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
-            // Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0
-            // Append -bullseye or -focal to pin to an OS version.
-            "VARIANT": "6.0-focal"
+            // Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0, 7.0
+            // Append -bullseye(-slim), -focal, or -jammy to pin to an OS version.
+            "VARIANT": "7.0-bullseye-slim"
         }
     },
     "hostRequirements": {
@@ -20,19 +20,16 @@
 
     // Add the IDs of extensions you want installed when the container is created.
     "extensions": [
-        "ms-vscode.test-adapter-converter",
-        "hbenl.vscode-test-explorer",
-        "formulahendry.dotnet-test-explorer",
         "ms-dotnettools.csharp",
         "Ionide.Ionide-fsharp",
         "tintoy.msbuild-project-tools"
     ],
-    "onCreateCommand": [
-        "/bin/bash",
-        "-c",
-        "./build.sh",
-        "-c",
-        "Debug"
-    ],
+    //"onCreateCommand": [ // It is a bit buggy in codespaces, so for now, need to run it manually.
+    //    "/bin/bash",
+    //    "-c",
+    //    "./build.sh",
+    //    "-c",
+    //    "Debug"
+    //],
     "waitFor": "onCreateCommand"
 }

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,69 @@
+name: Bug report
+description: Create a report to help us improve F#
+title: "`Bug`: "
+labels: [Needs Triage]
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: Please search to see if an issue already exists for the bug you encountered.
+    options:
+    - label: I have searched the existing issues
+      required: true
+- type: textarea
+  attributes:
+    label: Issue description
+    description: Please provide a succinct description of the issue you're experiencing.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Steps To Reproduce
+    description: Provide the steps required to reproduce the problem.
+    placeholder: |
+      1. Step A
+      2. Step B...
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Expected Behavior
+    description: Provide a description of the expected behavior.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Actual Behavior
+    description: Provide a description of the actual behaviour observed. 
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Known workarounds
+    description: Provide a description of the actual behaviour observed. 
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Related information
+    description: |
+      Provide any related information (optional), examples:
+        - **OS**: Windows 11
+        - **.NET Runtime Kind and version**: .NET Framework 4.8 and .NET 7
+        - **Tooling**: Visual Studio 2022
+    value: |
+        - OS:
+        - .NET Runtime Kind and version:
+        - Tooling:
+    render: markdown
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Anything else?
+    description: |
+      Links? References? Anything that will give us more context about the issue you are encountering!
+
+      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+  validations:
+    required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: true
+contact_links:
+  - name: F# Discussions
+    url: https://github.com/dotnet/fsharp/discussions
+    about: Please ask and answer questions here.
+  - name: F# Language Suggestions
+    url: https://github.com/fsharp/fslang-suggestions
+    about: Language features discussions here.
+  - name: F# Language Design
+    url: https://github.com/fsharp/fslang-design
+    about: Language design RFCs here.

.gitignore

@@ -123,3 +123,5 @@ nCrunchTemp_*
 
 /test.fs
 /test.fsx
+
+tests/FSharp.Compiler.Service.Tests/FSharp.CompilerService.SurfaceArea.netstandard.actual

.vscode/launch.json

@@ -17,13 +17,13 @@
             // TODO: Shall we assume that it's already been built, or build it every time we debug?
             // "preLaunchTask": "Build (Debug)",
             // If you have changed target frameworks, make sure to update the program p
-            "program": "${workspaceFolder}/artifacts/bin/fsi/Debug/net6.0/fsi.dll",
+            "program": "${workspaceFolder}/artifacts/bin/fsi/Debug/net7.0/fsi.dll",
             "cwd": "${workspaceFolder}/src",
             "console": "integratedTerminal", // This is the default to be able to run in Codespaces.
             "internalConsoleOptions": "neverOpen",
             "suppressJITOptimizations": true,
             "stopAtEntry": false,
-            "justMyCode": false,
+            "justMyCode": true,
             "enableStepFiltering": true,
             "symbolOptions": {
                 "searchMicrosoftSymbolServer": true,
@@ -42,7 +42,7 @@
             // TODO: Shall we assume that it's already been built, or build it every time we debug?
             // "preLaunchTask": "Build (Debug)",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/artifacts/bin/fsc/Debug/net6.0/fsc.dll",
+            "program": "${workspaceFolder}/artifacts/bin/fsc/Debug/net7.0/fsc.dll",
             "args": [
                 "${input:argsPrompt}"
             ],
@@ -73,7 +73,7 @@
                     "enabled": true
                 }
             },
-            "justMyCode": false,
+            "justMyCode": true,
             "enableStepFiltering": false,
         }
     ]

.vscode/settings.json

@@ -16,7 +16,7 @@
         "*.fs": "${capture}.fsi"
     },
     "FSharp.suggestGitignore": false,
-    "FSharp.enableMSBuildProjectGraph": false,
+    "FSharp.enableMSBuildProjectGraph": true,
     "FSharp.workspacePath": "FSharp.Compiler.Service.sln",
     "FSharp.workspaceModePeekDeepLevel": 1,
     "FSharp.enableBackgroundServices": false,
@@ -34,7 +34,7 @@
     "csharp.suppressDotnetInstallWarning": true,
     "csharp.suppressDotnetRestoreNotification": true,
     "csharp.suppressHiddenDiagnostics": true,
-    "omnisharp.autoStart": false,
+    "omnisharp.autoStart": true,
     "omnisharp.defaultLaunchSolution": "FSharp.Compiler.Service.sln",
     "omnisharp.enableMsBuildLoadProjectsOnDemand": true,
     "omnisharp.disableMSBuildDiagnosticWarning": true,
@@ -45,10 +45,6 @@
     "powershell.promptToUpdatePowerShell": false,
     "powershell.integratedConsole.showOnStartup": false,
     "powershell.startAutomatically": false,
-    "dotnet-test-explorer.testProjectPath": "tests/+(FSharp.Compiler.Service.Tests|FSharp.Compiler.UnitTests|FSharp.Core.UnitTests|FSharp.Build.UnitTests|FSharp.Compiler.ComponentTests)/*Tests.fsproj",
-    "dotnet-test-explorer.addProblems": true,
-    "dotnet-test-explorer.autoWatch": false,
-    "dotnet-test-explorer.treeMode": "merged",
     "testExplorer.useNativeTesting": true,
     "markdownlint.config": {
         "MD028": false,

DEVGUIDE.md

@@ -121,6 +121,18 @@ You can find all test options as separate flags. For example `build -testAll`:
 
 Running any of the above will build the latest changes and run tests against them.
 
+## Using your custom compiler to build other projects
+
+Building the compiler using `build.cmd` or `build.sh` will output artifacts in `artifacts\bin`. 
+
+To use your custom build of `Fsc`, add the `DotnetFscCompilerPath` property to your project's `.fsproj` file, adjusted to point at your local build directory, build configuration, and target framework as appropriate:
+
+```xml
+<PropertyGroup>
+    <DotnetFscCompilerPath>D:\Git\fsharp\artifacts\bin\fsc\Debug\net7.0\fsc.dll</DotnetFscCompilerPath>
+</PropertyGroup>
+```
+
 ## Updating FSComp.fs, FSComp.resx and XLF
 
 If your changes involve modifying the list of language keywords in any way, (e.g. when implementing a new keyword), the XLF localization files need to be synced with the corresponding resx files. This can be done automatically by running

Directory.Build.props

@@ -3,4 +3,18 @@
   <Import Project="FSharpBuild.Directory.Build.props" Condition = " '$(FSharpTestCompilerVersion)' == '' "/>
   <Import Project="FSharpTests.Directory.Build.props" Condition = " '$(FSharpTestCompilerVersion)' != '' "/>
 
+  <!-- 
+   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.
+   -->
+  <PropertyGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' == ''">
+    <FSHARPCORE_USE_PACKAGE Condition="'$(SolutionName)' == 'FSharp.Compiler.Service'">true</FSHARPCORE_USE_PACKAGE>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- If there is a README.md next to a project file, include it (for easier access in the IDE) -->
+    <None Include="README.md" Condition="Exists('README.md')" />
+  </ItemGroup>
+
 </Project>