VSCode improvements

Author: tgjones

scripts/build.ps1

@@ -96,7 +96,7 @@ function Test-UnitTests-NetFramework() {
 
 function Package-LanguageServer() {
     $runtimes =
-        "win10-x64"
+        "win-x64"
         #"osx-x64"
 
     Write-Host "Packaging Language Server"
@@ -106,7 +106,12 @@ function Package-LanguageServer() {
         $outputDir = Join-Path $rootDir "src/ShaderTools.VSCode/bin/$runtime"
         Create-Directory $outputDir
         $outputBinary = "$outputDir/ShaderTools.LanguageServer.exe"
-        $args = "warp src/ShaderTools.LanguageServer/ShaderTools.LanguageServer.csproj --output $outputBinary --verbose"
+        $args = ""
+        if ($config -eq "Debug") {
+            $args = "publish --configuration $config --output $outputDir /p:PublishSingleFile=true /p:PublishTrimmed=false src/ShaderTools.LanguageServer/ShaderTools.LanguageServer.csproj"
+        } else {
+            $args = "warp src/ShaderTools.LanguageServer/ShaderTools.LanguageServer.csproj --output $outputBinary --verbose"
+        }
         Exec-Console "dotnet" $args
     }
 

src/ShaderTools.LanguageServer/ShaderTools.LanguageServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>exe</OutputType>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <PublishTrimmed>true</PublishTrimmed>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>

src/ShaderTools.VSCode/README.md

@@ -8,7 +8,7 @@ HLSL Tools provides enhanced support for editing High Level Shading Language (HL
 
 ### System requirements
 
-HLSL Tools currently only works on Windows 10 x64. There are plans to support macOS and Linux in future versions.
+HLSL Tools currently only works on Windows x64. There are plans to support macOS and Linux in future versions.
 
 ### Why use HLSL Tools?
 

src/ShaderTools.VSCode/src/session.ts

@@ -1,3 +1,4 @@
+import os = require('os');
 import path = require('path');
 import vscode = require('vscode');
 
@@ -22,8 +23,10 @@ export class SessionManager {
     private statusBarItem: vscode.StatusBarItem;
     private registeredCommands: vscode.Disposable[] = [];
     private languageServerClient: LanguageClient = undefined;
+    private platform: NodeJS.Platform;
 
     constructor() {
+        this.platform = os.platform();
         this.registerCommands();
     }
 
@@ -66,14 +69,13 @@ export class SessionManager {
     }
 
     private startEditorServices() {
-        try
-        {
+        try {
             this.setSessionStatus(
                 "Starting HLSL Tools...",
                 SessionStatus.Initializing);
 
-            // TODO: Change path depending on current platform.
-            var serverExe = path.resolve(__dirname, '../bin/win10-x64/ShaderTools.LanguageServer.exe');
+            var serverPath = this.getServerPath();
+            var serverExe = path.resolve(__dirname, `../bin/${serverPath}`);
 
             var startArgs = [ ];
             //startArgs.push("--logfilepath", editorServicesLogPath);
@@ -110,13 +112,22 @@ export class SessionManager {
                 });
 
             this.languageServerClient.start();
-        }
-        catch (e)
+        } catch (e)
         {
             this.setSessionFailure("The language service could not be started: ", e);
         }
     }
 
+    private getServerPath() {
+        switch (this.platform) {
+            case "win32":
+                return "win-x64/ShaderTools.LanguageServer.exe";
+
+            default:
+                throw `Platform ${this.platform} is not currently supported by HLSL Tools.`;
+        }
+    }
+
     private restartSession() {
         this.stop();
         this.start();