Merge remote-tracking branch 'dotnet/main' into addContextProvider

Author: genlu

l10n/bundle.l10n.json

@@ -99,7 +99,7 @@
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.",
   "Privacy Alert! The contents copied to your clipboard may contain personal data. Prior to posting to GitHub, please remove any personal data which should not be publicly viewable.": "Privacy Alert! The contents copied to your clipboard may contain personal data. Prior to posting to GitHub, please remove any personal data which should not be publicly viewable.",
   "Copy issue content again": "Copy issue content again",
-  "Cannot start collecting Razor logs when {0} is set to {1}. Please set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.": "Cannot start collecting Razor logs when {0} is set to {1}. Please set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.",
+  "Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".": "Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the \"Razor Log\", and use the gear icon to ensure the log level is set to \"Debug\" or \"Trace\".",
   "Non Razor file as active document": "Non Razor file as active document",
   "Could not determine CSharp content": "Could not determine CSharp content",
   "Could not determine Html content": "Could not determine Html content",

package.json

@@ -1824,7 +1824,8 @@
       {
         "command": "dotnet.generateAssets",
         "title": "%command.dotnet.generateAssets.currentProject%",
-        "category": ".NET"
+        "category": ".NET",
+        "enablement": "dotnet.server.activationContext == 'Roslyn' || dotnet.server.activationContext == 'OmniSharp'"
       },
       {
         "command": "dotnet.restore.project",

src/coreclrDebug/activate.ts

@@ -21,6 +21,8 @@ import CompositeDisposable from '../compositeDisposable';
 import { BaseVsDbgConfigurationProvider } from '../shared/configurationProvider';
 import { omnisharpOptions } from '../shared/options';
 import { ActionOption, showErrorMessage } from '../shared/observers/utils/showMessage';
+import { getCSharpDevKit } from '../utils/getCSharpDevKit';
+import { Command } from 'vscode-languageserver-types';
 
 export async function activate(
     thisExtension: vscode.Extension<any>,
@@ -222,12 +224,18 @@ function showInstallErrorMessage(eventStream: EventStream) {
 function showDotnetToolsWarning(message: string): void {
     const config = vscode.workspace.getConfiguration('csharp');
     if (!config.get('suppressDotnetInstallWarning', false)) {
-        const getDotNetMessage: ActionOption = {
-            title: vscode.l10n.t('Get the SDK'),
-            action: async () => {
-                await vscode.env.openExternal(vscode.Uri.parse('https://dot.net/core-sdk-vscode'));
-            },
-        };
+        const getDotNetMessage: ActionOption | Command =
+            getCSharpDevKit() !== undefined
+                ? {
+                      title: vscode.l10n.t('Get the SDK'),
+                      command: 'csdevkit.installDotnetSdk',
+                  }
+                : {
+                      title: vscode.l10n.t('Get the SDK'),
+                      action: async () => {
+                          await vscode.env.openExternal(vscode.Uri.parse('https://dot.net/core-sdk-vscode'));
+                      },
+                  };
         const goToSettingsMessage: ActionOption = {
             title: vscode.l10n.t('Disable message in settings'),
             action: async () => {

src/razor/src/diagnostics/reportIssuePanel.ts

@@ -165,7 +165,7 @@ ${privacyAnchor}
             panelBodyContent =
                 '<p>' +
                 vscode.l10n.t(
-                    'Cannot start collecting Razor logs when {0} is set to {1}. Please set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.',
+                    'Cannot start collecting Razor logs when {0} is set to {1}. Please open the output window, choose the "Razor Log", and use the gear icon to ensure the log level is set to "Debug" or "Trace".',
                     verbositySettingName,
                     currentVerbositySettingValue,
                     neededVerbositySettingValue