diff --git a/.vsts-ci-linux.yml b/.vsts-ci-linux.yml index 501c9b732..ef74c6556 100644 --- a/.vsts-ci-linux.yml +++ b/.vsts-ci-linux.yml @@ -17,7 +17,7 @@ jobs: variables: NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget - EMSCRIPTEN_VERSION: 1.39.9 + EMSCRIPTEN_VERSION: 1.39.11 NETCORE_VERSION: ${{ parameters.netcore_version }} steps: diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b04ae693f..25690243e 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -32,7 +32,7 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - + diff --git a/src/Uno.Wasm.Bootstrap/Constants.cs b/src/Uno.Wasm.Bootstrap/Constants.cs index 76eba6a08..f7822a156 100644 --- a/src/Uno.Wasm.Bootstrap/Constants.cs +++ b/src/Uno.Wasm.Bootstrap/Constants.cs @@ -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-1add5cbc06a.zip"; - public const string DefaultAotSDKUrl = "https://unowasmbootstrap.blob.core.windows.net/runtime/wasm-release-Linux-1add5cbc06abc9e911e33a7bc25c6af60d040643.zip"; + public const string DefaultSdkUrl = "https://unowasmbootstrap.blob.core.windows.net/runtime/mono-wasm-34cccfa2fde.zip"; + public const string DefaultAotSDKUrl = "https://unowasmbootstrap.blob.core.windows.net/runtime/wasm-release-Linux-34cccfa2fde2bf14f3c6da7d68d47773aca0c5f5.zip"; /// /// Min version of the emscripten SDK. Must be aligned with mono's SDK build in . @@ -17,6 +17,6 @@ internal class Constants /// The emscripten version use by mono can be found here: /// https://github.com/mono/mono/blob/master/sdks/builds/wasm.mk#L4 /// - public static Version EmscriptenMinVersion { get; } = new Version("1.39.9"); + public static Version EmscriptenMinVersion { get; } = new Version("1.39.11"); } } diff --git a/src/Uno.Wasm.Bootstrap/Packager/packager.cs b/src/Uno.Wasm.Bootstrap/Packager/packager.cs index 986d9164e..aaee2ff96 100644 --- a/src/Uno.Wasm.Bootstrap/Packager/packager.cs +++ b/src/Uno.Wasm.Bootstrap/Packager/packager.cs @@ -62,7 +62,7 @@ class Driver { const string BINDINGS_ASM_NAME = "WebAssembly.Bindings"; const string BINDINGS_RUNTIME_CLASS_NAME = "WebAssembly.Runtime"; - const string HTTP_ASM_NAME = "WebAssembly.Net.Http"; + const string HTTP_ASM_NAME = "System.Net.Http.WebAssemblyHttpHandler"; const string WEBSOCKETS_ASM_NAME = "WebAssembly.Net.WebSockets"; const string BINDINGS_MODULE = "corebindings.o"; const string BINDINGS_MODULE_SUPPORT = "$tool_prefix/src/binding_support.js"; @@ -1042,7 +1042,7 @@ int Run (string[] args) { ninja.WriteLine ("build $appdir/dotnet.js: cpifdiff $wasm_runtime_dir/dotnet.js"); ninja.WriteLine ("build $appdir/dotnet.wasm: cpifdiff $wasm_runtime_dir/dotnet.wasm"); if (enable_threads) { - ninja.WriteLine ("build $appdir/mono.worker.js: cpifdiff $wasm_runtime_dir/mono.worker.js"); + ninja.WriteLine ("build $appdir/dotnet.worker.js: cpifdiff $wasm_runtime_dir/dotnet.worker.js"); } } if (enable_aot) diff --git a/src/Uno.Wasm.Bootstrap/ShellTask.cs b/src/Uno.Wasm.Bootstrap/ShellTask.cs index 9e63ccacc..6067ebabf 100644 --- a/src/Uno.Wasm.Bootstrap/ShellTask.cs +++ b/src/Uno.Wasm.Bootstrap/ShellTask.cs @@ -618,7 +618,7 @@ string buildRuntimeFlags() var frameworkBindings = new[] { "WebAssembly.Bindings.dll", - "WebAssembly.Net.Http.dll", + "System.Net.Http.WebAssemblyHttpHandler.dll", "WebAssembly.Net.WebSockets.dll", };