Skip to content

Commit

Permalink
Merge pull request #204 from unoplatform/dev/jela/monoupdate
Browse files Browse the repository at this point in the history
feat: Update to mono, enable IDBFS by default for interpreter builds
  • Loading branch information
jeromelaban authored May 6, 2020
2 parents 3020bd0 + e0607d9 commit 4ccfd1d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/Uno.Wasm.Bootstrap/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ namespace Uno.Wasm.Bootstrap
internal class Constants
{
// NOTE: The SDK version may be overriden by an installation of the https://www.nuget.org/packages/Uno.Wasm.MonoRuntime nuget package
public const string DefaultSdkUrl = @"https://unowasmbootstrap.blob.core.windows.net/runtime/mono-wasm-88cae11c6b7.zip";
public const string DefaultAotSDKUrl = @"https://unowasmbootstrap.blob.core.windows.net/runtime/wasm-release-Linux-88cae11c6b7a212b1ddcc3aa4dc8f83d06a702ca.zip";
public const string DefaultSdkUrl = @"https://unowasmbootstrap.blob.core.windows.net/runtime/mono-wasm-0b57d723c10.zip";
public const string DefaultAotSDKUrl = @"https://unowasmbootstrap.blob.core.windows.net/runtime/wasm-release-Linux-0b57d723c1092311669dd5f4d36f3ade4b2a66eb.zip";

/// <summary>
/// Min version of the emscripten SDK. Must be aligned with mono's SDK build in <see cref="DefaultAotSDKUrl"/>.
Expand Down
3 changes: 1 addition & 2 deletions src/Uno.Wasm.Bootstrap/ShellTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -710,14 +710,13 @@ private string TryConvertLongPath (string path)

private string ValidateEmscripten()
{

if (Environment.OSVersion.Platform == PlatformID.Win32NT)
{
var emsdkBaseFolder = BaseIntermediateOutputPath + $"\\emsdk-{Constants.EmscriptenMinVersion}";

if(!File.Exists(Environment.GetEnvironmentVariable("WINDIR") + "\\sysnative\\bash.exe"))
{
throw new InvalidCastException("The is not installed, please install Ubuntu 18.04 by visiting https://docs.microsoft.com/en-us/windows/wsl/install-win10.");
throw new InvalidCastException("The Windows Subsystem for Linux is not installed, please install Ubuntu 18.04 by visiting https://docs.microsoft.com/en-us/windows/wsl/install-win10.");
}

// Enable compression for the emsdk folder
Expand Down

0 comments on commit 4ccfd1d

Please sign in to comment.