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

Author: davidwengier

package.json

@@ -36,7 +36,7 @@
     }
   },
   "defaults": {
-    "roslyn": "4.7.0-3.23326.2",
+    "roslyn": "4.7.0-3.23328.5",
     "omniSharp": "1.39.6",
     "razor": "7.0.0-preview.23328.2"
   },
@@ -1293,6 +1293,38 @@
             "description": "Show regular expressions in completion list.",
             "order": 20
           },
+          "dotnet.backgroundAnalysis.analyzerDiagnosticsScope": {
+            "type": "string",
+            "enum": [
+              "openFiles",
+              "fullSolution",
+              "none"
+            ],
+            "default": "openFiles",
+            "enumDescriptions": [
+              "Open documents",
+              "Entire solution",
+              "None"
+            ],
+            "description": "Run background code analysis for:",
+            "order": 30
+          },
+          "dotnet.backgroundAnalysis.compilerDiagnosticsScope": {
+            "type": "string",
+            "enum": [
+              "openFiles",
+              "fullSolution",
+              "none"
+            ],
+            "default": "openFiles",
+            "enumDescriptions": [
+              "Open documents",
+              "Entire solution",
+              "None"
+            ],
+            "description": "Show compiler errors and warnings for:",
+            "order": 30
+          },
           "dotnet.highlighting.highlightRelatedRegexComponents": {
             "type": "boolean",
             "default": "true",

test/unitTests/lspToolHost/configurationMiddleware.test.ts

@@ -189,6 +189,26 @@ const testData = [
         vsCodeConfiguration: 'codeStyle.formatting.newLine.insertFinalNewline',
         declareInPackageJson: false,
     },
+    {
+        serverOption: 'csharp|background_analysis.dotnet_analyzer_diagnostics_scope',
+        vsCodeConfiguration: 'dotnet.backgroundAnalysis.analyzerDiagnosticsScope',
+        declareInPackageJson: true,
+    },
+    {
+        serverOption: 'mystery_language|background_analysis.dotnet_analyzer_diagnostics_scope',
+        vsCodeConfiguration: null,
+        declareInPackageJson: false,
+    },
+    {
+        serverOption: 'csharp|background_analysis.dotnet_compiler_diagnostics_scope',
+        vsCodeConfiguration: 'dotnet.backgroundAnalysis.compilerDiagnosticsScope',
+        declareInPackageJson: true,
+    },
+    {
+        serverOption: 'mystery_language|background_analysis.dotnet_compiler_diagnostics_scope',
+        vsCodeConfiguration: null,
+        declareInPackageJson: false,
+    },
 ];
 
 suite('Server option name to vscode configuration name test', () => {