diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a8f02b8b08e837ef9da4c711303d1619dfdf73f..527ecb99f58def4d82b7d3ce296d10c963b17d1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/icu - 5416401e2e54d6ce9bef7f0c4a5fe25088c42652 + d3c9d26f8e787253536d38504d3ac9e307573bfb https://github.com/dotnet/msquic 4fe73fcad4b0af91cc49fd1f5576f0111f15f6fd - + https://github.com/dotnet/emsdk - d2be7d0bf644d9608bf8180d706483238d85f13a + b8e71431b3eaa024afad7886699f8ac6bca2ba01 https://github.com/dotnet/wcf diff --git a/eng/Versions.props b/eng/Versions.props index d4c3214f4e06c0e276a1adb3e4e8e63907cdf704..b6050011cee1fd4a09cf633beabaf544332953a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -171,7 +171,7 @@ 7.0.100-1.22168.6 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-preview.3.22157.1 + 7.0.0-preview.3.22121.1 7.0.0-alpha.1.22160.2 @@ -184,7 +184,7 @@ 11.1.0-alpha.1.22164.2 11.1.0-alpha.1.22164.2 - 7.0.0-preview.3.22167.1 + 7.0.0-preview.3.22121.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) 1.1.87-gba258badda diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 22fa0be43584d6fb6aa576beb8a5ebcb7267b26e..a31f595580cf57547ad16f566794c7e5d44635a9 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -303,7 +303,7 @@ jobs: targetRid: browser-wasm platform: Browser_wasm container: - image: ubuntu-18.04-webassembly-20210707133424-12f133e + image: ubuntu-18.04-webassembly-20220118141522-180197c registry: mcr jobParameters: hostedOs: Linux diff --git a/eng/pipelines/common/templates/wasm-library-tests.yml b/eng/pipelines/common/templates/wasm-library-tests.yml index 539e2ffa69359044170b4897e260dce26e0cce19..8ebf5646fc7e5670c453aafaeec6e19ea063bfa2 100644 --- a/eng/pipelines/common/templates/wasm-library-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-tests.yml @@ -35,7 +35,7 @@ jobs: testGroup: innerloop nameSuffix: LibraryTests${{ parameters.nameSuffix }} buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=$(_hostedOs) ${{ parameters.runSmokeOnlyArg }} ${{ parameters.extraBuildArgs }} - timeoutInMinutes: 180 + timeoutInMinutes: 240 # always run for runtime-wasm builds (triggered manually) # Always run for rolling builds # Else run on path changes diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index ef1cdc9ebab0da73ce6145dfbd84b5d050dbe120..df537fdc8699d3bb611403d5554a9564482899ca 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -182,6 +182,6 @@ jobs: # WebAssembly windows - ${{ if eq(parameters.platform, 'Browser_wasm_win') }}: - - (Windows.Server.Core.1909.Amd64.Open)windows.10.amd64.server20h2.open@mcr.microsoft.com/dotnet-buildtools/prereqs:windowsservercore-2004-helix-webassembly-amd64-20210702131541-6837048 + - (Windows.Amd64.Server2022.Open)windows.amd64.server2022.open@mcr.microsoft.com/dotnet-buildtools/prereqs:windowsservercore-ltsc2022-helix-webassembly-20220118164817-dc6e6f1 ${{ insert }}: ${{ parameters.jobParameters }} diff --git a/src/mono/mono/component/debugger-agent.c b/src/mono/mono/component/debugger-agent.c index 7451304a4b51d1ddac10d301cb64caffa95887fb..a57c7cb9ea0cf7bdaf473522274b5f024398611e 100644 --- a/src/mono/mono/component/debugger-agent.c +++ b/src/mono/mono/component/debugger-agent.c @@ -414,6 +414,7 @@ static gboolean buffer_replies; DebuggerTlsData *tls; \ tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id); #else +/* the thread argument is omitted on wasm, to avoid compiler warning */ #define GET_TLS_DATA_FROM_THREAD(...) \ DebuggerTlsData *tls; \ tls = &debugger_wasm_thread; diff --git a/src/mono/wasm/README.md b/src/mono/wasm/README.md index 2fd07e682ad72b290d20128fa055dccb204781e2..841af5b07303ba9efc4c8941f9f1ae41f986c05c 100644 --- a/src/mono/wasm/README.md +++ b/src/mono/wasm/README.md @@ -188,6 +188,7 @@ Bumping Emscripten version involves these steps: * update https://github.com/dotnet/runtime/blob/main/src/mono/wasm/emscripten-version.txt * bump emscripten versions in docker images in https://github.com/dotnet/dotnet-buildtools-prereqs-docker * bump emscripten in https://github.com/dotnet/emsdk +* bump docker images in https://github.com/dotnet/icu, update emscripten files in eng/patches/ * update version number in docs * update `Microsoft.NET.Runtime.Emscripten..Node.win-x64` package name, version and sha hash in https://github.com/dotnet/runtime/blob/main/eng/Version.Details.xml and in https://github.com/dotnet/runtime/blob/main/eng/Versions.props. the sha is the commit hash in https://github.com/dotnet/emsdk and the package version can be found at https://dev.azure.com/dnceng/public/_packaging?_a=feed&feed=dotnet6 * update packages in the workload manifest https://github.com/dotnet/runtime/blob/main/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in diff --git a/src/mono/wasm/build/README.md b/src/mono/wasm/build/README.md index c6fb0a8681944bb59f3c5b7c0d6de780aca48c2c..3e1d8902550aa498126092a20f6a3098b03afc6e 100644 --- a/src/mono/wasm/build/README.md +++ b/src/mono/wasm/build/README.md @@ -137,7 +137,7 @@ them for the new task assembly. If encountering build performance issues, you can use the rollup `--perf` option and the typescript compiler `--generateCpuProfile` option to get build profile data, like so: -```../emsdk/node/14.15.5_64bit/bin/npm run rollup --perf -- --perf --environment Configuration:Release,NativeBinDir:./rollup-test-data,ProductVersion:12.3.4``` +```../emsdk/node/14.18.2_64bit/bin/npm run rollup --perf -- --perf --environment Configuration:Release,NativeBinDir:./rollup-test-data,ProductVersion:12.3.4``` ```node node_modules/typescript/lib/tsc.js --generateCpuProfile dotnet-tsc.cpuprofile -p tsconfig.json ``` diff --git a/src/mono/wasm/build/WasmApp.Native.targets b/src/mono/wasm/build/WasmApp.Native.targets index 5fb4c12e36fba1f381cb1e6cdddbd9e9d07bff06..bea1676405c9665668094980fdb24a5746725e45 100644 --- a/src/mono/wasm/build/WasmApp.Native.targets +++ b/src/mono/wasm/build/WasmApp.Native.targets @@ -255,6 +255,7 @@ <_WasmNativeFileForLinking Include="@(NativeFileReference)" /> + diff --git a/src/mono/wasm/emscripten-version.txt b/src/mono/wasm/emscripten-version.txt index 8fe1046e01fc8e40519bb5ca5b5fb1118167071a..94ff29cc4de4fe0be04331a1eb51f5c515b728a9 100644 --- a/src/mono/wasm/emscripten-version.txt +++ b/src/mono/wasm/emscripten-version.txt @@ -1 +1 @@ -2.0.23 \ No newline at end of file +3.1.1 diff --git a/src/mono/wasm/wasm.proj b/src/mono/wasm/wasm.proj index df423fbf994b8059fbb21317029d967e96403dca..13b99eae4edb6117be643e4bf5a43b9166f3166b 100644 --- a/src/mono/wasm/wasm.proj +++ b/src/mono/wasm/wasm.proj @@ -119,7 +119,7 @@ <_EmccLinkFlags Include="-s FORCE_FILESYSTEM=1" /> <_EmccLinkFlags Include="-s EXPORTED_RUNTIME_METHODS="['FS','print','ccall','cwrap','setValue','getValue','UTF8ToString','UTF8ArrayToString','FS_createPath','FS_createDataFile','removeRunDependency','addRunDependency', 'FS_readFile']"" /> - <_EmccLinkFlags Include="-s EXPORTED_FUNCTIONS=_free,_malloc,_memalign,_memset" Condition="$([MSBuild]::VersionGreaterThan('$(_EmccVersion)', '3.0'))" /> + <_EmccLinkFlags Include="-s EXPORTED_FUNCTIONS=_free,_malloc,_memalign,_memset,_htons,_ntohs,__get_daylight,__get_timezone,__get_tzname" Condition="$([MSBuild]::VersionGreaterThan('$(_EmccVersion)', '3.0'))" /> <_EmccLinkFlags Include="-s EXPORTED_FUNCTIONS=_free,_malloc,_htons,_ntohs,__get_daylight,__get_timezone,__get_tzname,_memalign" Condition="$([MSBuild]::VersionLessThan('$(_EmccVersion)', '3.0'))" /> <_EmccLinkFlags Include="--source-map-base http://example.com" /> <_EmccLinkFlags Include="-s STRICT_JS=1" />