Merge remote-tracking branch 'upstream/main' into lsp_editor_features

Author: dibarbet

.vscode/tasks.json

@@ -2,6 +2,16 @@
   // See https://go.microsoft.com/fwlink/?LinkId=733558
   // for the documentation about the tasks.json format
   "version": "2.0.0",
+  "windows": {
+    "options": {
+        "shell": {
+            "executable": "cmd.exe",
+            "args": [
+                "/d", "/c"
+            ]
+        }
+    }
+  },
   "tasks": [
     {
         "label": "build",
@@ -10,7 +20,7 @@
         "args": [
         ],
         "windows": {
-          "command": "./build.cmd",
+          "command": "${workspaceFolder}/build.cmd",
         },
         "problemMatcher": "$msCompile",
         "group": "build"
@@ -23,7 +33,7 @@
           "--runAnalyzers"
         ],
         "windows": {
-          "command": "./build.cmd",
+          "command": "${workspaceFolder}/build.cmd",
           "args": [
             "-runAnalyzers"
           ],
@@ -33,7 +43,7 @@
     },
     {
         "label": "build csc",
-        "command": "./.dotnet/dotnet",
+        "command": "${workspaceFolder}/.dotnet/dotnet",
         "type": "shell",
         "args": [
           "msbuild",
@@ -47,10 +57,10 @@
     {
         "label": "build current project",
         "type": "shell",
-        "command": "./.dotnet/dotnet",
+        "command": "${workspaceFolder}/.dotnet/dotnet",
         "args": [
           "pwsh",
-          "${workspaceRoot}/scripts/vscode-build.ps1",
+          "${workspaceFolder}/scripts/vscode-build.ps1",
           "-filePath",
           "${file}",
           "-msbuildEngine",
@@ -59,7 +69,7 @@
         "windows": {
           "command": "powershell",
           "args": [
-            "${workspaceRoot}/scripts/vscode-build.ps1",
+            "${workspaceFolder}/scripts/vscode-build.ps1",
             "-filePath",
             "${file}",
             "-msbuildEngine",
@@ -76,7 +86,7 @@
         "windows": {
           "command": "powershell",
           "args": [
-            "${workspaceRoot}/scripts/vscode-build.ps1",
+            "${workspaceFolder}/scripts/vscode-build.ps1",
             "-filePath",
             "${file}",
             "-msbuildEngine",
@@ -88,11 +98,11 @@
     },
     {
         "label": "generate compiler code",
-        "command": "./.dotnet/dotnet",
+        "command": "${workspaceFolder}/.dotnet/dotnet",
         "type": "shell",
         "args": [
           "pwsh",
-          "${workspaceRoot}/eng/generate-compiler-code.ps1"
+          "${workspaceFolder}/eng/generate-compiler-code.ps1"
         ],
         "problemMatcher": "$msCompile",
         "group": "build"
@@ -102,7 +112,7 @@
         "command": "./build.sh",
         "type": "shell",
         "windows": {
-          "command": "./build.cmd"
+          "command": "${workspaceFolder}/build.cmd"
         },
         "options": {
           "env": { "UpdateXlfOnBuild": "true" }
@@ -112,11 +122,11 @@
     },
     {
         "label": "run tests in current file (netcoreapp3.1)",
-        "command": "./.dotnet/dotnet",
+        "command": "${workspaceFolder}/.dotnet/dotnet",
         "type": "shell",
         "args": [
           "pwsh",
-          "${workspaceRoot}/scripts/vscode-run-tests.ps1",
+          "${workspaceFolder}/scripts/vscode-run-tests.ps1",
           "-filePath",
           "${file}",
           "-msbuildEngine",
@@ -131,11 +141,11 @@
     },
     {
         "label": "run tests in current project (netcoreapp3.1)",
-        "command": "./.dotnet/dotnet",
+        "command": "${workspaceFolder}/.dotnet/dotnet",
         "type": "shell",
         "args": [
           "pwsh",
-          "${workspaceRoot}/scripts/vscode-run-tests.ps1",
+          "${workspaceFolder}/scripts/vscode-run-tests.ps1",
           "-filePath",
           "${file}",
           "-msbuildEngine",
@@ -148,11 +158,11 @@
     },
     {
         "label": "run tests in current file (all frameworks)",
-        "command": "./.dotnet/dotnet",
+        "command": "${workspaceFolder}/.dotnet/dotnet",
         "type": "shell",
         "args": [
           "pwsh",
-          "${workspaceRoot}/scripts/vscode-run-tests.ps1",
+          "${workspaceFolder}/scripts/vscode-run-tests.ps1",
           "-filePath",
           "${file}",
           "-filter",
@@ -163,11 +173,11 @@
     },
     {
         "label": "run tests in current project (all frameworks)",
-        "command": "./.dotnet/dotnet",
+        "command": "${workspaceFolder}/.dotnet/dotnet",
         "type": "shell",
         "args": [
           "pwsh",
-          "${workspaceRoot}/scripts/vscode-run-tests.ps1",
+          "${workspaceFolder}/scripts/vscode-run-tests.ps1",
           "-filePath",
           "${file}"
         ],

azure-pipelines-integration.yml

@@ -17,7 +17,7 @@ pr:
 jobs:
 - job: VS_Integration
   pool:
-    name: NetCorePublic-Pool
+    name: $(poolName)
     queue: $(queueName)
   strategy:
     maxParallel: 4

azure-pipelines.yml

@@ -117,7 +117,7 @@ jobs:
     jobName: Build_Unix_Debug
     testArtifactName: Transport_Artifacts_Unix_Debug
     configuration: Debug
-    vmImageName: 'ubuntu-18.04'
+    queueName: BuildPool.Ubuntu.1804.Amd64.Open
 
 - template: eng/pipelines/test-unix-job.yml
   parameters:

docs/Language Feature Status.md

@@ -13,7 +13,7 @@ efforts behind them.
 | [nameof(parameter)](https://github.com/dotnet/csharplang/issues/373) | main | [In Progress](https://github.com/dotnet/roslyn/issues/40524) | [jcouv](https://github.com/jcouv) | TBD | [jcouv](https://github.com/jcouv) |
 | [Relax ordering of `ref` and `partial` modifiers](https://github.com/dotnet/csharplang/issues/946) | [ref-partial](https://github.com/dotnet/roslyn/tree/features/ref-partial) | In Progress | [alrz](https://github.com/alrz) | [gafter](https://github.com/gafter) | [jcouv](https://github.com/jcouv) |
 | [Parameter null-checking](https://github.com/dotnet/csharplang/issues/2145) | [param-nullchecking](https://github.com/dotnet/roslyn/tree/features/param-nullchecking) | [In Progress](https://github.com/dotnet/roslyn/issues/36024) | [fayrose](https://github.com/fayrose) | [agocke](https://github.com/agocke) | [jaredpar](https://github.com/jaredpar) |
-| [Generic attributes](https://github.com/dotnet/csharplang/issues/124) | [generic-attributes](https://github.com/dotnet/roslyn/tree/features/generic-attributes) | [In Progress](https://github.com/dotnet/roslyn/issues/36285) | [AviAvni](https://github.com/AviAvni) | [agocke](https://github.com/agocke) | [mattwar](https://github.com/mattwar) |
+| [Generic attributes](https://github.com/dotnet/csharplang/issues/124) | [generic-attributes](https://github.com/dotnet/roslyn/tree/features/generic-attributes) | [Merged into 17.0p4 (preview langver)](https://github.com/dotnet/roslyn/issues/36285) | [AviAvni](https://github.com/AviAvni) | [RikkiGibson](https://github.com/RikkiGibson), [jcouv](https://github.com/jcouv) | [mattwar](https://github.com/mattwar) |
 | [Default in deconstruction](https://github.com/dotnet/roslyn/pull/25562) | [decon-default](https://github.com/dotnet/roslyn/tree/features/decon-default) | [Implemented](https://github.com/dotnet/roslyn/issues/25559) | [jcouv](https://github.com/jcouv) | [gafter](https://github.com/gafter) | [jcouv](https://github.com/jcouv) |
 | [List patterns](https://github.com/dotnet/csharplang/issues/3435) | [list-patterns](https://github.com/dotnet/roslyn/tree/features/list-patterns) | [In Progress](https://github.com/dotnet/roslyn/issues/51289) | [alrz](https://github.com/alrz) | [jcouv](https://github.com/jcouv), [333fred](https://github.com/333fred) | [333fred](https://github.com/333fred) |
 | [Raw string literals](https://github.com/dotnet/csharplang/issues/4304) | [RawStringLiterals](https://github.com/dotnet/roslyn/tree/features/features/RawStringLiterals) | [In Progress](https://github.com/dotnet/roslyn/issues/55306) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [jcouv](https://github.com/jcouv) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |

docs/compilers/CSharp/Compiler Breaking Changes - DotNet 6.md

@@ -0,0 +1,9 @@
+## This document lists known breaking changes in Roslyn in C# 10.0 which will be introduced with .NET 6.
+
+1. Beginning with C# 10.0, null suppression operator is no longer allowed in patterns.
+    ```csharp
+    void M(object o)
+    {
+        if (o is null!) {} // error
+    }
+    ```

docs/compilers/CSharp/Compiler Breaking Changes - post DotNet 5.md

@@ -48,9 +48,9 @@ record Derived(int I) // The positional member 'Base.I' found corresponding to t
 }
 ```
 
-4. In C# 10, method groups are implicitly convertible to `System.Delegate`, and lambda expressions are implicitly convertible to `System.Delegate` and `System.Linq.Expressions.Expression`.
+4. In C# 10, lambda expressions and method groups are implicitly convertible to `System.MulticastDelegate`, or any base classes or interfaces of `System.MulticastDelegate` including `object`, and lambda expressions are implicitly convertible to `System.Linq.Expressions.Expression`.
 
-    This is a breaking change to overload resolution if there exists an overload with a `System.Delegate` or `System.Linq.Expressions.Expression` parameter that is applicable and the closest applicable overload with a strongly-typed delegate parameter is in an enclosing namespace.
+    This is a breaking change to overload resolution if there exists an applicable overload with a parameter of type `System.MulticastDelegate`, or a parameter of a type in the base types or interfaces of `System.MulticastDelegate`, or a parameter of type `System.Linq.Expressions.Expression`, and the closest applicable extension method overload with a strongly-typed delegate parameter is in an enclosing namespace.
 
     ```C#
     class C
@@ -85,3 +85,16 @@ partial class Program
 }
 ```
 
+6. https://github.com/dotnet/roslyn/issues/53021 C# will now report an error for a misplaced ```::``` token in explicit interface implementation. In this example code:
+
+    ``` C#
+    void N::I::M()
+    {
+    }
+    ```
+
+    Previous versions of Roslyn wouldn't report any errors.
+
+    We now report an error for a ```::``` token before M.
+
+

docs/contributing/Building, Debugging, and Testing on Windows.md

@@ -20,7 +20,7 @@ The minimal required version of .NET Framework is 4.7.2.
     - Ensure Visual Studio is on Version "17.0" or greater
     - Ensure "Use previews of the .NET Core SDK" is checked in Tools -> Options -> Environment -> Preview Features
     - Restart Visual Studio
-1. [.NET 6.0 Preview 6 SDK](https://dotnet.microsoft.com/download/dotnet-core/6.0) [Windows x64 installer](https://dotnet.microsoft.com/download/dotnet/thank-you/sdk-6.0.100-preview.6-windows-x64-installer)
+1. [.NET 6.0 Preview 7 SDK](https://dotnet.microsoft.com/download/dotnet-core/6.0) [Windows x64 installer](https://dotnet.microsoft.com/download/dotnet/thank-you/sdk-6.0.100-preview.7-windows-x64-installer)
 1. [PowerShell 5.0 or newer](https://docs.microsoft.com/en-us/powershell/scripting/setup/installing-windows-powershell). If you are on Windows 10, you are fine; you'll only need to upgrade if you're on earlier versions of Windows. The download link is under the ["Upgrading existing Windows PowerShell"](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-windows-powershell?view=powershell-6#upgrading-existing-windows-powershell) heading.
 1. Run Restore.cmd
 1. Open Roslyn.sln

docs/contributing/Compiler Test Plan.md

@@ -319,6 +319,7 @@ __makeref( x )
 - Tuple
 - Default literal
 - Implicit object creation (target-typed new)
+- Function type (in type inference comparing function types of lambdas or method groups)
 
 ## Types 
 

docs/features/ExpressionVariables.md

@@ -6,12 +6,12 @@ containing expression variables (out variable declarations and declaration patte
 initializers, property initializers, ctor-initializers, and query clauses.
 
 See https://github.com/dotnet/csharplang/issues/32 and 
-https://github.com/dotnet/csharplang/blob/main/proposals/expression-variables-in-initializers.md 
+https://github.com/dotnet/csharplang/blob/main/proposals/csharp-7.3/expression-variables-in-initializers.md 
 for more information.
 
 Current state of the feature:
 
 [X] Permit in field initializers
 [X] Permit in property initializers
 [ ] Permit in ctor-initializers
-[X] Permit in query clauses
+[X] Permit in query clauses

docs/features/local-functions.test.md

@@ -47,7 +47,7 @@ Code:
 - [ ] Target typing (var, lambdas, integrals)
 - [ ] Type inference
 - [ ] Conversions
-    - [ ] Implicit (identity, implicit numeric, implicit enumeration, implicit nullable, null litaral, implicit reference, boxing, implicit dynamic, implicit constant, user-defined implicit conversion, anonymous function, method group)
+    - [ ] Implicit (identity, implicit numeric, implicit enumeration, implicit nullable, null literal, implicit reference, boxing, implicit dynamic, implicit constant, user-defined implicit conversion, anonymous function, method group)
     - [ ] Explicit (numeric, enumeration, nullable, reference, unboxing, dynamic, user-defined)
     - [ ] Anonymous functions
 - [ ] nullable (wrapping, unwrapping)