Release v.1.6.3

- Fixed #22: folder `runtimes` (of the syntaxer) is added to the package

CHANGELOG.md

@@ -1,11 +1,13 @@
 # Change Log
 
-## 1.6.0-1 (8 Apr, 2020)
+## 1.6.0-3 (11 Apr, 2020)
 
 #### _This release delivers hosting script execution under .NET Core. Meaning that raw VSCode deployment with the extension extension "ms-dotnettools.csharp" is enough to edit, run and debug C# script. Mono and Mono extension are no longer required. Mono support is still available via settings but it will be eventually phased out._ 
 
-- _v.1.6.1_
-  - Removed unnecessary check for presence of Mono
+- _v.1.6.3_
+  - Fixed #22: folder `runtimes` (of the syntaxer) is added to the package
+- _v.1.6.2_
+  - Fixed #21: Removed unnecessary check for presence of Mono
 - _v.1.6.0_
   - Migrated on .NET Core
   - Hosting on Mono is still supported. If required it needs to be enabled via settings specific for the type of the activity:

package.json

@@ -2,7 +2,7 @@
     "name": "cs-script",
     "displayName": "CS-Script",
     "description": "Execution, debugging and editing C# code that targets .NET and Mono (no .NET Core required)",
-    "version": "1.6.1",
+    "version": "1.6.3",
     "license": "MIT",
     "publisher": "oleg-shilo",
     "icon": "images/css_logo.png",

src/cs-script.ts

@@ -983,7 +983,12 @@ export async function save_script_project(dependencies_only: boolean): Promise<v
         editor.document.save();
     }
 
-    let command = build_command(`"${cscs_exe}" -proj:dbg "${file}"`);
+    let command = "";
+    if (is_dotnet_run())
+        command = `dotnet "${core_engine}" -proj:dbg "${file}"`;
+    else
+        command = build_command(`"${cscs_exe}" -proj:dbg "${file}"`);
+
     let response = Utils.RunSynch(command);
 
     let dependencies = response.lines()

src/utils.ts

@@ -13,8 +13,16 @@ import * as fsx from "fs-extra";
 import * as child_process from "child_process"
 import { StatusBarAlignment, StatusBarItem, TextEditor, window, Disposable, commands, MarkdownString, ParameterInformation, SignatureInformation } from "vscode";
 import { start_syntaxer, Syntaxer } from "./syntaxer";
+
 // import { Syntax } from "./cs-script";
 
+export class vsc_config {
+    public static get<T>(section_value: string, defaultValue?: T): T {
+        let tokens = section_value.split('.')
+        return vscode.workspace.getConfiguration(tokens[0]).get(tokens[1], defaultValue);
+    }
+}
+
 let ext_dir = path.join(__dirname, "..");
 let exec = require('child_process').exec;
 let execSync = require('child_process').execSync;
@@ -41,7 +49,12 @@ export let diagnosticCollection: vscode.DiagnosticCollection;
 let sources_temp_dir = path.join(os.tmpdir(), "Roslyn.Intellisense", "sources");
 create_dir(sources_temp_dir);
 
-
+function need_mono(): Boolean {
+    return
+    !vsc_config.get("cs-script.engine_debug.dotnet", true) ||
+        !vsc_config.get("cs-script.engine_debug.dotnet", true) ||
+        !vsc_config.get("cs-script.engine_run.dotnet", true);
+}
 
 
 declare global {
@@ -263,6 +276,15 @@ export function copy_file_to_sync(fileName: string, srcDir: string, destDir: str
     }
 }
 
+export function copy_dir_to_sync(srcDir: string, destDir: string): void {
+
+    try {
+        fsx.copySync(srcDir, destDir);
+    } catch (error) {
+        console.log(error.toString());
+    }
+}
+
 export function copy_file_to_sync2(fileName: string, newFileName: string, srcDir: string, destDir: string): void {
 
     try {
@@ -405,13 +427,15 @@ export function deploy_engine(): void {
             run_async(deploy_files);
         }
         else {
-            ensure_default_config(path.join(user_dir(), 'mono', 'cscs.exe'));
-            _ready = true;
-            run_async(preload_roslyn);
-            run_async(() => {
-                start_syntaxer();
-                check_syntaxer_ready(5);
-            });
+            if (need_mono) {
+                ensure_default_config(path.join(user_dir(), 'mono', 'cscs.exe'));
+                _ready = true;
+                run_async(preload_roslyn);
+                run_async(() => {
+                    start_syntaxer();
+                    check_syntaxer_ready(5);
+                });
+            }
         }
     } catch (error) {
         console.log(error);
@@ -492,23 +516,10 @@ function deploy_files(): void {
     try {
 
         // dotnet
-        let dotnet_dir_root = path.join(user_dir(), "dotnet");
-        let src_dir_root = path.join(ext_dir, 'bin', 'dotnet');
-
-        let dotnet_dir = dotnet_dir_root;
-        let src_dir = src_dir_root;
-        fsx.readdirSync(src_dir)
-            .forEach(file => copy_file_to_sync(file, src_dir, dotnet_dir));
-
-        dotnet_dir = path.join(dotnet_dir_root, "syntaxer");
-        src_dir = path.join(src_dir_root, "syntaxer");
-        fsx.readdirSync(src_dir)
-            .forEach(file => copy_file_to_sync(file, src_dir, dotnet_dir));
+        let dotnet_dir = path.join(user_dir(), "dotnet");
+        let src_dir = path.join(ext_dir, 'bin', 'dotnet');
+        copy_dir_to_sync(src_dir, dotnet_dir);
 
-        dotnet_dir = path.join(dotnet_dir_root, ".vscode");
-        src_dir = path.join(src_dir_root, '.vscode');
-        fsx.readdirSync(src_dir)
-            .forEach(file => copy_file_to_sync(file, src_dir, dotnet_dir));
 
         // mono
         let mono_dir = path.join(user_dir(), "mono");
@@ -620,7 +631,8 @@ export function deploy_roslyn(): void {
     copy_file_to_sync("syntaxer.exe", path.join(ext_dir, 'bin', 'mono'), dest_dir);
 
     // the following will extract roslyn from syntaxer and place it in the destination folder
-    if (_environment_ready) {
+    if (_environment_ready && need_mono()) {
+
         let command = 'mono "' + path.join(dest_dir, 'syntaxer.exe') + '" -dr';
         execSync(command);
     }
@@ -823,12 +835,6 @@ export class ErrorInfo {
     }
 }
 
-export class vsc_config {
-    public static get<T>(section_value: string, defaultValue?: T): T {
-        let tokens = section_value.split('.')
-        return vscode.workspace.getConfiguration(tokens[0]).get(tokens[1], defaultValue);
-    }
-}
 
 // Writable extension settings
 export class Settings {