Apply PR feedback

Author: maryamariyan

l10n/bundle.l10n.json

@@ -48,7 +48,7 @@
   "Cannot load Razor language server because the directory was not found: '{0}'": "Cannot load Razor language server because the directory was not found: '{0}'",
   "Could not find '{0}' in or above '{1}'.": "Could not find '{0}' in or above '{1}'.",
   "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'",
-  "Could not find Razor Language Server executable within directory '{0}'": "Could not find Razor Language Server executable within directory '{0}'",
+  "Could not find Razor Language Server executable '{0}' within directory": "Could not find Razor Language Server executable '{0}' within directory",
   "Server failed to start after retrying 5 times.": "Server failed to start after retrying 5 times.",
   "Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.": "Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.",
   "Tried to send requests while server is not started.": "Tried to send requests while server is not started.",

src/razor/src/razorLanguageServerOptionsResolver.ts

@@ -35,18 +35,16 @@ export function resolveRazorLanguageServerOptions(
 }
 
 function findLanguageServerExecutable(withinDir: string) {
-    const isSelfContained = fs.existsSync(path.join(withinDir, 'coreclr.dll'));
-    let fullPath = '';
-    if (isSelfContained) {
-        const fileName = isWindows() ? 'rzls.exe' : 'rzls';
-        fullPath = path.join(withinDir, fileName);
-    } else {
+    // Prefer using executable over fallback to dll.
+    const fileName = isWindows() ? 'rzls.exe' : 'rzls';
+    let fullPath = path.join(withinDir, fileName);
+    if (!fs.existsSync(fullPath)) {
         fullPath = path.join(withinDir, 'rzls.dll');
     }
 
     if (!fs.existsSync(fullPath)) {
         throw new Error(
-            vscode.l10n.t("Could not find Razor Language Server executable within directory '{0}'", withinDir)
+            vscode.l10n.t("Could not find Razor Language Server executable '{0}' within directory", fullPath)
         );
     }