Use dotnet dnx to run dotnet tools

Author: JoeRobich

l10n/bundle.l10n.json

@@ -190,26 +190,6 @@
     ]
   },
   "You can modify the default arguments if needed": "You can modify the default arguments if needed",
-  "Install": "Install",
-  "{0} not found, run \"{1}\" to install it?/{0} is the tool name and should not be localized{1} is the install command": {
-    "message": "{0} not found, run \"{1}\" to install it?",
-    "comment": [
-      "{0} is the tool name and should not be localized",
-      "{1} is the install command"
-    ]
-  },
-  "Installing {0}.../{0} is the tool name and should not be localized": {
-    "message": "Installing {0}...",
-    "comment": [
-      "{0} is the tool name and should not be localized"
-    ]
-  },
-  "Failed to install {0}, it may need to be manually installed. See C# output for details./{0} is the tool name and should not be localized": {
-    "message": "Failed to install {0}, it may need to be manually installed. See C# output for details.",
-    "comment": [
-      "{0} is the tool name and should not be localized"
-    ]
-  },
   "Language server process not found, ensure the server is running.": "Language server process not found, ensure the server is running.",
   "Failed to collect logs: {0}/{0} is the error message": {
     "message": "Failed to collect logs: {0}",
@@ -229,24 +209,6 @@
   "Captures managed heap information for investigating memory issues.": "Captures managed heap information for investigating memory issues.",
   "Collect C# Logs": "Collect C# Logs",
   "Select additional logging to collect": "Select additional logging to collect",
-  "Verifying dotnet-trace.../dotnet-trace is a command name and should not be localized": {
-    "message": "Verifying dotnet-trace...",
-    "comment": [
-      "dotnet-trace is a command name and should not be localized"
-    ]
-  },
-  "Verifying dotnet-dump.../dotnet-dump is a command name and should not be localized": {
-    "message": "Verifying dotnet-dump...",
-    "comment": [
-      "dotnet-dump is a command name and should not be localized"
-    ]
-  },
-  "Verifying dotnet-gcdump.../dotnet-gcdump is a command name and should not be localized": {
-    "message": "Verifying dotnet-gcdump...",
-    "comment": [
-      "dotnet-gcdump is a command name and should not be localized"
-    ]
-  },
   "Save Logs": "Save Logs",
   "Output folder {0} does not exist/{0} is the folder path": {
     "message": "Output folder {0} does not exist",

src/common.ts

@@ -78,6 +78,29 @@ ${stderr}`)
     });
 }
 
+export async function execFileChildProcess(
+    file: string,
+    args: string[],
+    workingDirectory: string | undefined,
+    env: NodeJS.ProcessEnv
+): Promise<string> {
+    return new Promise<string>((resolve, reject) => {
+        cp.execFile(file, args, { cwd: workingDirectory, maxBuffer: 500 * 1024, env: env }, (error, stdout, stderr) => {
+            if (error) {
+                reject(
+                    new Error(`${error}
+${stdout}
+${stderr}`)
+                );
+            } else if (stderr && !stderr.includes('screen size is bogus')) {
+                reject(new Error(stderr));
+            } else {
+                resolve(stdout);
+            }
+        });
+    });
+}
+
 export async function getUnixChildProcessIds(pid: number): Promise<number[]> {
     return new Promise<number[]>((resolve, reject) => {
         cp.exec('ps -A -o ppid,pid', (error, stdout, stderr) => {

src/lsptoolshost/commands.ts

@@ -92,5 +92,12 @@ function registerExtensionCommands(
     context.subscriptions.push(
         vscode.commands.registerCommand('csharp.showOutputWindow', async () => outputChannel.show())
     );
-    registerCollectLogsCommand(context, languageServer, outputChannel, csharpTraceChannel, razorLogger);
+    registerCollectLogsCommand(
+        context,
+        languageServer,
+        hostExecutableResolver,
+        outputChannel,
+        csharpTraceChannel,
+        razorLogger
+    );
 }

src/lsptoolshost/dotnetRuntime/dotnetRuntimeExtensionResolver.ts

@@ -66,10 +66,7 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
         };
 
         if (usingDevkit) {
-            const toolingRuntimeHostInfo = await this.tryGetToolingRuntimeHostInfo({
-                ...findPathRequest,
-                rejectPreviews: false,
-            });
+            const toolingRuntimeHostInfo = await this.tryGetToolingRuntimeHostInfo();
             if (toolingRuntimeHostInfo) {
                 this.hostInfo = toolingRuntimeHostInfo;
                 return toolingRuntimeHostInfo;
@@ -98,9 +95,7 @@ export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
         return hostInfo;
     }
 
-    private async tryGetToolingRuntimeHostInfo(
-        findPathRequest: IDotnetFindPathContext
-    ): Promise<HostExecutableInformation | undefined> {
+    private async tryGetToolingRuntimeHostInfo(): Promise<HostExecutableInformation | undefined> {
         // get vscode setting value for dotnet.toolingRuntimePath
         const toolingRuntimePath = languageServerOptions.toolingRuntimePath;
         if (toolingRuntimePath.length === 0) {