From 7bf24d68b432a096a5034c59d5595839a17b6d44 Mon Sep 17 00:00:00 2001 From: Elie Bariche <33458222+ebariche@users.noreply.github.com> Date: Tue, 21 Jul 2020 17:32:53 -0400 Subject: [PATCH 1/2] fix: ForceDisableWSL wasn't honored --- src/Uno.Wasm.Bootstrap/ShellTask.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Uno.Wasm.Bootstrap/ShellTask.cs b/src/Uno.Wasm.Bootstrap/ShellTask.cs index 5d850318f..29d27e9cf 100644 --- a/src/Uno.Wasm.Bootstrap/ShellTask.cs +++ b/src/Uno.Wasm.Bootstrap/ShellTask.cs @@ -416,7 +416,7 @@ as the BrotliStream must be closed in order to signal that no more blocks are be private (int exitCode, string output, string error) RunProcess(string executable, string parameters, string? workingDirectory = null) { - if (IsWSLRequired) + if (IsWSLRequired && !ForceDisableWSL) { var unixPath = AlignPath(executable, escape: true); var monoPath = executable.EndsWith(".exe") ? "mono" : ""; @@ -485,7 +485,7 @@ as the BrotliStream must be closed in order to signal that no more blocks are be private string AlignPath(string path, bool escape = false) { - var output = IsWSLRequired ? $"`wslpath \"{path.Replace("\\\\?\\", "")}\"`" : path; + var output = IsWSLRequired && !ForceDisableWSL ? $"`wslpath \"{path.Replace("\\\\?\\", "")}\"`" : path; if (escape) { From 4c1b298f6c19f662fbac0a36be1bd50839f4c7ee Mon Sep 17 00:00:00 2001 From: Elie Bariche <33458222+ebariche@users.noreply.github.com> Date: Tue, 21 Jul 2020 17:41:32 -0400 Subject: [PATCH 2/2] docs: Typo in Readme --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 5bd1c5474..a3ae1dbd1 100644 --- a/Readme.md +++ b/Readme.md @@ -383,7 +383,7 @@ The Bootstrapper tooling will generate two folders `_compressed_gz` and `_compre When building an application, place [the following file](src/Uno.Wasm.Sample/wwwroot/web.config) in the `wwwroot` folder to automatically enable the use of pre-compressed files. The parameters for the compression are as follows: -- `WasmShellGenerateCompressedFiles` which can be `true` of `false`. This property is ignored when building `MonoRuntimeDebuggerEnabled` is set to `true`. +- `WasmShellGenerateCompressedFiles` which can be `true` or `false`. This property is ignored when building `MonoRuntimeDebuggerEnabled` is set to `true`. - `WasmShellCompressedExtension` is an item group which specifies which files to compress. By default `wasm`, `clr`, `js`, `css` and `html files are pre-compressed. More files can be added as follows: ```xml