From e52f7dff5be3fb3b92102e5bd310bbc167383a85 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 26 Mar 2024 15:13:01 +0100 Subject: [PATCH 01/45] [wasm] Bump emscripten to 3.1.56 --- src/mono/browser/browser.proj | 2 +- src/mono/browser/emscripten-version.txt | 2 +- src/mono/browser/runtime/CMakeLists.txt | 2 +- src/mono/browser/runtime/es6/dotnet.es6.pre.js | 2 +- src/mono/wasm/build/WasmApp.Common.targets | 2 +- src/native/libs/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj index 38d6f035e6cf3..88c5f999f08e6 100644 --- a/src/mono/browser/browser.proj +++ b/src/mono/browser/browser.proj @@ -364,7 +364,7 @@ $(ArtifactsObjDir)wasm/pinvoke-table.h $(ArtifactsObjDir)wasm/wasm_m2n_invoke.g.h - -g -Os -s -DDEBUG=1 -DENABLE_AOT_PROFILER=1 -DENABLE_BROWSER_PROFILER=1 + -g -Os -DDEBUG=1 -DENABLE_AOT_PROFILER=1 -DENABLE_BROWSER_PROFILER=1 -Oz -DENABLE_BROWSER_PROFILER=1 $(CMakeConfigurationEmccFlags) -s ASSERTIONS=1 diff --git a/src/mono/browser/emscripten-version.txt b/src/mono/browser/emscripten-version.txt index 45dd392530866..4a8bd23c1443d 100644 --- a/src/mono/browser/emscripten-version.txt +++ b/src/mono/browser/emscripten-version.txt @@ -1 +1 @@ -3.1.34 \ No newline at end of file +3.1.56 \ No newline at end of file diff --git a/src/mono/browser/runtime/CMakeLists.txt b/src/mono/browser/runtime/CMakeLists.txt index 60570d6deafd6..1b3caa8196a04 100644 --- a/src/mono/browser/runtime/CMakeLists.txt +++ b/src/mono/browser/runtime/CMakeLists.txt @@ -44,7 +44,7 @@ set(ignoreMeEmsdkPath "${EMSDK_PATH}") if(CMAKE_BUILD_TYPE STREQUAL "Release") add_custom_command(TARGET dotnet.native - POST_BUILD COMMAND ${EMSDK_PATH}/upstream/bin/wasm-opt --enable-exception-handling ${CONFIGURATION_WASM_OPT_FLAGS} --strip-dwarf ${NATIVE_BIN_DIR}/dotnet.native.wasm -o ${NATIVE_BIN_DIR}/dotnet.native.wasm + POST_BUILD COMMAND ${EMSDK_PATH}/upstream/bin/wasm-opt --enable-exception-handling --enable-simd --enable-bulk-memory ${CONFIGURATION_WASM_OPT_FLAGS} --strip-dwarf ${NATIVE_BIN_DIR}/dotnet.native.wasm -o ${NATIVE_BIN_DIR}/dotnet.native.wasm COMMENT "Stripping debug symbols from dotnet.native.wasm using wasm-opt") endif() diff --git a/src/mono/browser/runtime/es6/dotnet.es6.pre.js b/src/mono/browser/runtime/es6/dotnet.es6.pre.js index e41bb6dc4af5c..1c134a6ba33ef 100644 --- a/src/mono/browser/runtime/es6/dotnet.es6.pre.js +++ b/src/mono/browser/runtime/es6/dotnet.es6.pre.js @@ -1,3 +1,3 @@ if (_nativeModuleLoaded) throw new Error("Native module already loaded"); _nativeModuleLoaded = true; -createDotnetRuntime = Module = createDotnetRuntime(Module); +createDotnetRuntime = Module = moduleArg(Module); diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets index 5c7e4353fee0a..fa0b528f00732 100644 --- a/src/mono/wasm/build/WasmApp.Common.targets +++ b/src/mono/wasm/build/WasmApp.Common.targets @@ -918,7 +918,7 @@ - diff --git a/src/native/libs/CMakeLists.txt b/src/native/libs/CMakeLists.txt index cba0ce782610e..76915c8734e1a 100644 --- a/src/native/libs/CMakeLists.txt +++ b/src/native/libs/CMakeLists.txt @@ -30,7 +30,7 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI) endif () set(CMAKE_INSTALL_PREFIX $ENV{__CMakeBinDir}) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wno-declaration-after-statement") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wno-declaration-after-statement -Wno-pre-c11-compat") add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common) add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common) From a91ec448003a8b0dc235a1491860df50bb3700c8 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 27 Mar 2024 11:43:02 +0100 Subject: [PATCH 02/45] Replace Module.asm with Module.wasmExports Module.asm was removed, use wasmExports instead. Context: https://github.com/emscripten-core/emscripten/pull/19816 --- src/mono/browser/browser.proj | 4 +++- src/mono/browser/runtime/cwraps.ts | 6 +++--- src/mono/browser/runtime/jiterpreter-jit-call.ts | 2 +- src/mono/browser/runtime/jiterpreter-support.ts | 4 ++-- src/mono/browser/runtime/types/internal.ts | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj index 88c5f999f08e6..b9a4973e54d4e 100644 --- a/src/mono/browser/browser.proj +++ b/src/mono/browser/browser.proj @@ -209,6 +209,8 @@ + + @@ -286,7 +288,7 @@ <_EmccLinkFlags Include="--source-map-base http://example.com" /> <_EmccLinkFlags Include="-s WASM_BIGINT=1" /> <_EmccLinkFlags Include="-s EXPORT_NAME="'createDotnetRuntime'"" /> - <_EmccLinkFlags Include="-s MODULARIZE=1"/> + <_EmccLinkFlags Include="-s MODULARIZE=1" /> <_EmccLinkFlags Include="-s ENVIRONMENT="web,webview,worker,node,shell"" /> - - + diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj index b9a4973e54d4e..92aa43f1c25dc 100644 --- a/src/mono/browser/browser.proj +++ b/src/mono/browser/browser.proj @@ -483,9 +483,9 @@ DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)" SkipUnchangedFiles="true" /> - <_HasDotnetWasm Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.native.wasm'">true - <_HasDotnetJsWorker Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.native.worker.js'">true + <_HasDotnetJsWorker Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.native.worker.mjs'">true <_HasDotnetJsSymbols Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.native.js.symbols'">true <_HasDotnetNativeJs Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.native.js'">true false @@ -87,7 +87,7 @@ - + - + <_WasmAssembliesInternal Remove="$(_WasmDedupAssembly)"/> diff --git a/src/mono/browser/runtime/loader/assets.ts b/src/mono/browser/runtime/loader/assets.ts index 2416f931b52f1..e855c0f1239ed 100644 --- a/src/mono/browser/runtime/loader/assets.ts +++ b/src/mono/browser/runtime/loader/assets.ts @@ -744,6 +744,7 @@ export function preloadWorkers() { const workerNumber = loaderHelpers.workerNextNumber++; const worker: Partial = new Worker(jsModuleWorker.resolvedUrl!, { name: "dotnet-worker-" + workerNumber.toString().padStart(3, "0"), + type: "module", }); worker.info = { workerNumber, diff --git a/src/mono/browser/runtime/pthreads/ui-thread.ts b/src/mono/browser/runtime/pthreads/ui-thread.ts index 9838615cd2163..17d213a3dba40 100644 --- a/src/mono/browser/runtime/pthreads/ui-thread.ts +++ b/src/mono/browser/runtime/pthreads/ui-thread.ts @@ -332,6 +332,7 @@ function allocateUnusedWorker(): PThreadWorker { const workerNumber = loaderHelpers.workerNextNumber++; const worker = new Worker(uri, { name: "dotnet-worker-" + workerNumber.toString().padStart(3, "0"), + type: "module", }) as PThreadWorker; getUnusedWorkerPool().push(worker); worker.loaded = false; diff --git a/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs b/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs index 0ffd223d8e03f..6142128dd500d 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs @@ -170,7 +170,7 @@ runtimeType is RuntimeVariant.SingleThreaded public string GetRuntimeNativeDir(string tfm = BuildTestBase.DefaultTargetFramework, RuntimeVariant runtimeType = RuntimeVariant.SingleThreaded) => Path.Combine(GetRuntimePackDir(tfm, runtimeType), "runtimes", DefaultRuntimeIdentifier, "native"); public bool IsMultiThreadingRuntimePackAvailableFor(string tfm) - => IsWorkload && File.Exists(Path.Combine(GetRuntimeNativeDir(tfm, RuntimeVariant.MultiThreaded), "dotnet.native.worker.js")); + => IsWorkload && File.Exists(Path.Combine(GetRuntimeNativeDir(tfm, RuntimeVariant.MultiThreaded), "dotnet.native.worker.mjs")); public static string WasmOverridePacksTargetsPath = Path.Combine(TestDataPath, "WasmOverridePacks.targets"); diff --git a/src/mono/wasm/Wasm.Build.Tests/TestMainJsProjectProvider.cs b/src/mono/wasm/Wasm.Build.Tests/TestMainJsProjectProvider.cs index 89a1ddc8c132b..caee31ba490f6 100644 --- a/src/mono/wasm/Wasm.Build.Tests/TestMainJsProjectProvider.cs +++ b/src/mono/wasm/Wasm.Build.Tests/TestMainJsProjectProvider.cs @@ -27,7 +27,7 @@ protected override IReadOnlyDictionary GetAllKnownDotnetFilesToFin { "dotnet.native.js", false }, { "dotnet.native.js.symbols", false }, { "dotnet.native.wasm", false }, - { "dotnet.native.worker.js", false }, + { "dotnet.native.worker.mjs", false }, { "dotnet.runtime.js", false }, { "dotnet.runtime.js.map", false } }; @@ -51,13 +51,13 @@ protected override IReadOnlySet GetDotNetFilesExpectedSet(AssertBundleOp res.Add("dotnet.native.wasm"); res.Add("dotnet.native.js"); res.Add("dotnet.runtime.js"); - res.Add("dotnet.native.worker.js"); + res.Add("dotnet.native.worker.mjs"); if (!assertOptions.IsPublish) { res.Add("dotnet.js.map"); res.Add("dotnet.runtime.js.map"); - res.Add("dotnet.native.worker.js.map"); + res.Add("dotnet.native.worker.mjs.map"); } } diff --git a/src/mono/wasm/Wasm.Build.Tests/WasmSdkBasedProjectProvider.cs b/src/mono/wasm/Wasm.Build.Tests/WasmSdkBasedProjectProvider.cs index 9cfbcca73843c..a6d9e53750b2c 100644 --- a/src/mono/wasm/Wasm.Build.Tests/WasmSdkBasedProjectProvider.cs +++ b/src/mono/wasm/Wasm.Build.Tests/WasmSdkBasedProjectProvider.cs @@ -27,7 +27,7 @@ protected override IReadOnlyDictionary GetAllKnownDotnetFilesToFin { "dotnet.native.js", true }, { "dotnet.native.js.symbols", false }, { "dotnet.native.wasm", false }, - { "dotnet.native.worker.js", true }, + { "dotnet.native.worker.mjs", true }, { "dotnet.runtime.js", true }, { "dotnet.runtime.js.map", false }, }; @@ -43,7 +43,7 @@ protected override IReadOnlySet GetDotNetFilesExpectedSet(AssertBundleOp }; if (assertOptions.RuntimeType is RuntimeVariant.MultiThreaded) { - res.Add("dotnet.native.worker.js"); + res.Add("dotnet.native.worker.mjs"); } if (!assertOptions.IsPublish) @@ -107,7 +107,7 @@ public void AssertBundle(AssertWasmSdkBundleOptions assertOptions) string buildType = assertOptions.IsPublish ? "publish" : "build"; var nativeFilesToCheck = new List() { "dotnet.native.wasm", "dotnet.native.js" }; if (assertOptions.RuntimeType == RuntimeVariant.MultiThreaded) - nativeFilesToCheck.Add("dotnet.native.worker.js"); + nativeFilesToCheck.Add("dotnet.native.worker.mjs"); foreach (string nativeFilename in nativeFilesToCheck) { if (!actualDotnetFiles.TryGetValue(nativeFilename, out DotNetFileName? dotnetFile)) @@ -121,7 +121,7 @@ public void AssertBundle(AssertWasmSdkBundleOptions assertOptions) if (assertOptions.ExpectedFileType != NativeFilesType.FromRuntimePack) { - if (nativeFilename == "dotnet.native.worker.js") + if (nativeFilename == "dotnet.native.worker.mjs") { Console.WriteLine($"Skipping the verification whether {nativeFilename} is from the runtime pack. The check wouldn't be meaningful as the runtime pack file has the same size as the relinked file"); continue; diff --git a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/AssetsComputingHelper.cs b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/AssetsComputingHelper.cs index 8e42fc982ce24..cf78cbbed1f05 100644 --- a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/AssetsComputingHelper.cs +++ b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/AssetsComputingHelper.cs @@ -71,7 +71,8 @@ public static bool ShouldFilterCandidate( ".ts" when fromMonoPackage && fileName == "dotnet.d" => "dotnet type definition is not used by Blazor", ".map" when !emitSourceMap && fromMonoPackage && (fileName == "dotnet.js" || fileName == "dotnet.runtime.js") => "source map file is not published", ".ts" when fromMonoPackage && fileName == "dotnet-legacy.d" => "dotnet type definition is not used by Blazor", - ".js" when assetType == "native" && !(dotnetJsSingleThreadNames.Contains(fileName) || (enableThreads && fileName == "dotnet.native.worker")) => $"{fileName}{extension} is not used by Blazor", + ".js" when assetType == "native" && !dotnetJsSingleThreadNames.Contains(fileName) => $"{fileName}{extension} is not used by Blazor", + ".mjs" when assetType == "native" && !(enableThreads && fileName == "dotnet.native.worker") => $"{fileName}{extension} is not used by Blazor", ".pdb" when !copySymbols => "copying symbols is disabled", ".symbols" when fromMonoPackage => "extension .symbols is not required.", _ => null diff --git a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/BootJsonBuilderHelper.cs b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/BootJsonBuilderHelper.cs index 17760e84aad06..6924be8be07e5 100644 --- a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/BootJsonBuilderHelper.cs +++ b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/BootJsonBuilderHelper.cs @@ -54,7 +54,7 @@ static void AddDictionary(StringBuilder sb, Dictionary? res) public Dictionary? GetNativeResourceTargetInBootConfig(BootJsonData bootConfig, string resourceName) { string resourceExtension = Path.GetExtension(resourceName); - if (resourceName.StartsWith("dotnet.native.worker", StringComparison.OrdinalIgnoreCase) && string.Equals(resourceExtension, ".js", StringComparison.OrdinalIgnoreCase)) + if (resourceName.StartsWith("dotnet.native.worker", StringComparison.OrdinalIgnoreCase) && string.Equals(resourceExtension, ".mjs", StringComparison.OrdinalIgnoreCase)) return bootConfig.resources.jsModuleWorker ??= new(); else if (resourceName.StartsWith("dotnet.native", StringComparison.OrdinalIgnoreCase) && string.Equals(resourceExtension, ".js", StringComparison.OrdinalIgnoreCase)) return bootConfig.resources.jsModuleNative ??= new(); diff --git a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmPublishAssets.cs b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmPublishAssets.cs index 64b7b99c930ae..a2ba1f1d4bfb6 100644 --- a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmPublishAssets.cs +++ b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmPublishAssets.cs @@ -172,9 +172,10 @@ private List ProcessNativeAssets( var key = kvp.Key; var asset = kvp.Value; var isDotNetJs = IsAnyDotNetJs(key); + var isDotNetMJs = IsAnyDotNetMJs(key); var isDotNetWasm = IsDotNetWasm(key); - if (!isDotNetJs && !isDotNetWasm) + if (!isDotNetJs && !isDotNetMJs && !isDotNetWasm) { if (resolvedNativeAssetToPublish.TryGetValue(Path.GetFileName(asset.GetMetadata("OriginalItemSpec")), out var existing)) { @@ -203,19 +204,21 @@ private List ProcessNativeAssets( continue; } - if (isDotNetJs) + if (isDotNetJs || isDotNetMJs) { + var extension = ".js"; var baseName = Path.GetFileNameWithoutExtension(key); - if (baseName.StartsWith("dotnet.native.worker")) + if (baseName.StartsWith("dotnet.native.worker")) { baseName = "dotnet.native.worker"; - else if (baseName.StartsWith("dotnet.native")) + extension = ".mjs"; + } else if (baseName.StartsWith("dotnet.native")) baseName = "dotnet.native"; else if (baseName.StartsWith("dotnet.runtime")) baseName = "dotnet.runtime"; else if (baseName.StartsWith("dotnet")) baseName = "dotnet"; - var aotDotNetJs = WasmAotAssets.SingleOrDefault(a => $"{a.GetMetadata("FileName")}{a.GetMetadata("Extension")}" == $"{baseName}.js"); + var aotDotNetJs = WasmAotAssets.SingleOrDefault(a => $"{a.GetMetadata("FileName")}{a.GetMetadata("Extension")}" == $"{baseName}{extension}"); ITaskItem newDotNetJs = null; if (aotDotNetJs != null) { @@ -223,8 +226,8 @@ private List ProcessNativeAssets( newDotNetJs.SetMetadata("OriginalItemSpec", aotDotNetJs.ItemSpec); string relativePath = baseName != "dotnet" || FingerprintDotNetJs - ? $"_framework/{$"{baseName}.{DotNetJsVersion}.{FileHasher.GetFileHash(aotDotNetJs.ItemSpec)}.js"}" - : $"_framework/{baseName}.js"; + ? $"_framework/{$"{baseName}.{DotNetJsVersion}.{FileHasher.GetFileHash(aotDotNetJs.ItemSpec)}{extension}"}" + : $"_framework/{baseName}{extension}"; newDotNetJs.SetMetadata("RelativePath", relativePath); @@ -239,7 +242,7 @@ private List ProcessNativeAssets( ApplyPublishProperties(newDotNetJs); nativeStaticWebAssets.Add(newDotNetJs); - if (resolvedNativeAssetToPublish.TryGetValue($"{baseName}.js", out var resolved)) + if (resolvedNativeAssetToPublish.TryGetValue($"{baseName}{extension}", out var resolved)) { filesToRemove.Add(resolved); } @@ -296,6 +299,12 @@ static bool IsAnyDotNetJs(string key) return fileName.StartsWith("dotnet.", StringComparison.Ordinal) && fileName.EndsWith(".js", StringComparison.Ordinal); } + static bool IsAnyDotNetMJs(string key) + { + var fileName = Path.GetFileName(key); + return fileName.StartsWith("dotnet.", StringComparison.Ordinal) && fileName.EndsWith(".mjs", StringComparison.Ordinal); + } + static bool IsDotNetWasm(string key) { var name = Path.GetFileName(key); diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.cs b/src/tasks/WasmAppBuilder/WasmAppBuilder.cs index 7847039163b11..03bf938207bc4 100644 --- a/src/tasks/WasmAppBuilder/WasmAppBuilder.cs +++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.cs @@ -165,7 +165,7 @@ protected override bool ExecuteInternal() if (!FileCopyChecked(item.ItemSpec, dest, "NativeAssets")) return false; - if (!IncludeThreadsWorker && name == "dotnet.native.worker.js") + if (!IncludeThreadsWorker && name == "dotnet.native.worker.mjs") continue; if (name == "dotnet.runtime.js.map" || name == "dotnet.js.map") From 50dfb7260375e3341c92f9401da11cfb6beb3563 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Thu, 30 May 2024 17:30:37 +0200 Subject: [PATCH 04/45] Update deps --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfb1ea462c5c8..f82e4786c5e57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 1f01904b5b68612031509a7e9c1ffa1f9bd1d75e + 5cb8b0efe9cf4e89678ff7b036e40c67a2ec1216 https://github.com/dotnet/msquic @@ -68,14 +68,14 @@ 9c8ea966df62f764523b51772763e74e71040a92 - + https://github.com/dotnet/emsdk - bd79d3dd7ed2db36b3c3d4fa807c21a06d2024ec + 5d4f5c8fd11516b7f45c5b0e2994c656e9ec73e9 - + https://github.com/dotnet/emsdk - bd79d3dd7ed2db36b3c3d4fa807c21a06d2024ec + 5d4f5c8fd11516b7f45c5b0e2994c656e9ec73e9 diff --git a/eng/Versions.props b/eng/Versions.props index 8b862d54f60ef..9e3d34303222f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -211,7 +211,7 @@ 9.0.0-preview.4.24175.1 - 9.0.0-preview.4.24172.4 + 9.0.0-preview.6.24280.1 2.3.5 9.0.0-alpha.1.24167.3 @@ -234,7 +234,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 9.0.0-preview.4.24201.2 + 9.0.0-preview.6.24279.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 9.0.0-preview.4.24201.2 From aca6c58251dea3d40f5145bcc82978b8e97ef7f5 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Thu, 30 May 2024 17:31:19 +0200 Subject: [PATCH 05/45] Add general testing feed --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index c9f91b5327322..a2f361ba992c5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,6 +20,7 @@ + From f917ea69adc44b60e87e71793b6c7f27fe08617a Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Thu, 30 May 2024 18:33:14 +0200 Subject: [PATCH 06/45] Update mode deps --- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++----------- src/mono/mono.proj | 6 +-- 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc9b73904af50..51165f4602d28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,41 +12,41 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/emsdk - b0e8c5f3800bbaa46221ff26b3748f0a2b486f8c + 5d4f5c8fd11516b7f45c5b0e2994c656e9ec73e9 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 https://github.com/dotnet/command-line-api @@ -226,61 +226,61 @@ https://github.com/dotnet/runtime-assets c185f58a7f75bd824a3cd820634cddf27e791d91 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 - + https://github.com/dotnet/llvm-project - 26f8c30340764cfa7fa9090dc01a36c222bf09c1 + e549f1466814deaf97b1462b1a1979169ce96225 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 669cb7388c950..8c886cef78fd3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,20 +217,20 @@ 2.3.5 9.0.0-alpha.1.24167.3 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 - 16.0.5-alpha.1.24204.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 + 19.0.0-alpha.1.24279.1 3.1.7 1.0.406601 @@ -258,6 +258,6 @@ 9.0.0-alpha.1.24175.1 $(MicrosoftNETRuntimeEmscriptenVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) - 3.1.34 + 3.1.56 diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 8f02901b6d771..a171e0b3d4351 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -83,7 +83,7 @@ @@ -261,11 +261,11 @@ JS_ENGINES = [NODE_JS] - - From a7c4e55cc288e3678cdb97e875ae4fece92f9263 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Thu, 30 May 2024 18:53:10 +0200 Subject: [PATCH 07/45] Update path --- src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs index 03db9aed60118..7d9fbeaba68a0 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs @@ -607,7 +607,7 @@ internal BuildPaths GetBuildPaths(BuildArgs buildArgs, bool forPublish = true) protected static string GetSkiaSharpReferenceItems() => @" - "; + "; protected static string s_mainReturns42 = @" public class TestClass { From 0b030c1a37662d58f483d75eb5a30333b920b9a1 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Thu, 30 May 2024 19:16:35 +0200 Subject: [PATCH 08/45] Use current python packages for now, we don't have newer ones The current names 3.1.34 are new enough --- eng/Version.Details.xml | 2 +- src/mono/mono.proj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51165f4602d28..fa96a78a1ce8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,7 +12,7 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/emsdk 5d4f5c8fd11516b7f45c5b0e2994c656e9ec73e9 diff --git a/src/mono/mono.proj b/src/mono/mono.proj index a171e0b3d4351..8f02901b6d771 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -83,7 +83,7 @@ @@ -261,11 +261,11 @@ JS_ENGINES = [NODE_JS] - - From 6a0057f05d6a23e5ae9eae242a74275ff0c74e69 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Mon, 3 Jun 2024 10:54:59 +0200 Subject: [PATCH 09/45] Keep using llvm 16 for runtime and aot compiler --- eng/Version.Details.xml | 90 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa96a78a1ce8e..9cdcf0fb75de3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,39 +14,39 @@ https://github.com/dotnet/emsdk - 5d4f5c8fd11516b7f45c5b0e2994c656e9ec73e9 + b0e8c5f3800bbaa46221ff26b3748f0a2b486f8c - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 https://github.com/dotnet/command-line-api @@ -226,61 +226,61 @@ https://github.com/dotnet/runtime-assets c185f58a7f75bd824a3cd820634cddf27e791d91 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/llvm-project - e549f1466814deaf97b1462b1a1979169ce96225 + 26f8c30340764cfa7fa9090dc01a36c222bf09c1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8c886cef78fd3..b54bd47735c92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,20 +217,20 @@ 2.3.5 9.0.0-alpha.1.24167.3 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 - 19.0.0-alpha.1.24279.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 + 16.0.5-alpha.1.24204.1 3.1.7 1.0.406601 From 1721779cfe96d0759ea47e44f3b80d6fa79bfe49 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Mon, 3 Jun 2024 21:01:48 +0200 Subject: [PATCH 10/45] Add -Wno-pre-c11-compat only for browser --- src/native/libs/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/native/libs/CMakeLists.txt b/src/native/libs/CMakeLists.txt index bfb2f3e4eb1c0..eb1df8fa2a210 100644 --- a/src/native/libs/CMakeLists.txt +++ b/src/native/libs/CMakeLists.txt @@ -30,7 +30,11 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI) endif () set(CMAKE_INSTALL_PREFIX $ENV{__CMakeBinDir}) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wno-declaration-after-statement -Wno-pre-c11-compat") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wno-declaration-after-statement") + + if (CLR_CMAKE_TARGET_BROWSER) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-pre-c11-compat") + endif() add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common) add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common) From fe1e5c643c6ab4bbfeb1af06f1f13492722825b9 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Mon, 3 Jun 2024 23:52:43 +0200 Subject: [PATCH 11/45] Temporarily disable version checks to get further --- src/native/libs/CMakeLists.txt | 2 +- src/native/libs/configure.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/native/libs/CMakeLists.txt b/src/native/libs/CMakeLists.txt index eb1df8fa2a210..f9d1b364903f7 100644 --- a/src/native/libs/CMakeLists.txt +++ b/src/native/libs/CMakeLists.txt @@ -33,7 +33,7 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wno-declaration-after-statement") if (CLR_CMAKE_TARGET_BROWSER) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-pre-c11-compat") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-pre-c11-compat -Wno-version-check") endif() add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common) diff --git a/src/native/libs/configure.cmake b/src/native/libs/configure.cmake index d15a5ff74bc96..a9904e323bd42 100644 --- a/src/native/libs/configure.cmake +++ b/src/native/libs/configure.cmake @@ -616,6 +616,7 @@ elseif(CLR_CMAKE_TARGET_ANDROID) set(HAVE_CLOCK_REALTIME 1) elseif(CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI) set(HAVE_FORK 0) + add_compile_options(-Wno-version-check) else() check_symbol_exists( aligned_alloc From 3f8834f2a83405bdb46ffe4ae46560ce7c8755e3 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 4 Jun 2024 09:27:02 +0200 Subject: [PATCH 12/45] Temporarily disable version checks to get further #2 --- src/mono/browser/browser.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj index b6db9f1807048..75a2c8016b8ed 100644 --- a/src/mono/browser/browser.proj +++ b/src/mono/browser/browser.proj @@ -274,6 +274,7 @@ 5MB + <_EmccLinkFlags Include="-Wno-version-check" /> <_EmccLinkFlags Include="-s INITIAL_MEMORY=$(EmccInitialHeapSize)" /> <_EmccLinkFlags Include="-s STACK_SIZE=$(EmccStackSize)" /> <_EmccCommonFlags Condition="'$(WasmEnableThreads)' == 'true'" Include="-s USE_PTHREADS=1" /> From 123767a88ad01170579f6d2e6812fe58ff5bf7b5 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 4 Jun 2024 10:56:28 +0200 Subject: [PATCH 13/45] Disable -Wunused-command-line-argument --- src/mono/browser/browser.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj index 75a2c8016b8ed..ec0bc326ef809 100644 --- a/src/mono/browser/browser.proj +++ b/src/mono/browser/browser.proj @@ -274,7 +274,7 @@ 5MB - <_EmccLinkFlags Include="-Wno-version-check" /> + <_EmccLinkFlags Include="-Wno-version-check -Wno-unused-command-line-argument" /> <_EmccLinkFlags Include="-s INITIAL_MEMORY=$(EmccInitialHeapSize)" /> <_EmccLinkFlags Include="-s STACK_SIZE=$(EmccStackSize)" /> <_EmccCommonFlags Condition="'$(WasmEnableThreads)' == 'true'" Include="-s USE_PTHREADS=1" /> From e3b1316676bf7cf039faaeb72f62223af906855b Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 4 Jun 2024 16:54:36 +0200 Subject: [PATCH 14/45] Update emsdk deps --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 015919aaa4963..92cd01d8264f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,14 +68,14 @@ 7a4a59f9f66baf6711a6ce2de01d3b2c62ed72d8 - + https://github.com/dotnet/emsdk - 5d4f5c8fd11516b7f45c5b0e2994c656e9ec73e9 + 51710a63905929c08435a3388d4691ede57a31bf - + https://github.com/dotnet/emsdk - 5d4f5c8fd11516b7f45c5b0e2994c656e9ec73e9 + 51710a63905929c08435a3388d4691ede57a31bf diff --git a/eng/Versions.props b/eng/Versions.props index d5d85a6ac753c..e57552846d6a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -235,7 +235,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 9.0.0-preview.6.24279.1 + 9.0.0-preview.6.24304.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 9.0.0-preview.6.24277.2 From 7d6edc3e3e4a1afc98fb1a1199e7167f7138892f Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 4 Jun 2024 17:03:20 +0200 Subject: [PATCH 15/45] Update icu dependency --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92cd01d8264f9..d54b10157a2f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 5cb8b0efe9cf4e89678ff7b036e40c67a2ec1216 + 18bf8e40d89828b28fa586c9941907d2105d108c https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index e57552846d6a6..03a73d7dbee9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -212,7 +212,7 @@ 9.0.0-preview.5.24272.3 - 9.0.0-preview.6.24280.1 + 9.0.0-preview.6.24304.1 2.3.5 9.0.0-alpha.1.24167.3 From 15bd5859b2c6ad75cc7fa764418fe4f925a5eafe Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 4 Jun 2024 17:05:04 +0200 Subject: [PATCH 16/45] Revert "Temporarily disable version checks to get further #2" This reverts commit 3f8834f2a83405bdb46ffe4ae46560ce7c8755e3. --- src/mono/browser/browser.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj index ec0bc326ef809..e423a648c489b 100644 --- a/src/mono/browser/browser.proj +++ b/src/mono/browser/browser.proj @@ -274,7 +274,7 @@ 5MB - <_EmccLinkFlags Include="-Wno-version-check -Wno-unused-command-line-argument" /> + <_EmccLinkFlags Include="-Wno-unused-command-line-argument" /> <_EmccLinkFlags Include="-s INITIAL_MEMORY=$(EmccInitialHeapSize)" /> <_EmccLinkFlags Include="-s STACK_SIZE=$(EmccStackSize)" /> <_EmccCommonFlags Condition="'$(WasmEnableThreads)' == 'true'" Include="-s USE_PTHREADS=1" /> From 92b4559ff0267b9cd2ff6fb300e35222877528d6 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 4 Jun 2024 17:05:33 +0200 Subject: [PATCH 17/45] Revert "Temporarily disable version checks to get further" This reverts commit fe1e5c643c6ab4bbfeb1af06f1f13492722825b9. --- src/native/libs/CMakeLists.txt | 2 +- src/native/libs/configure.cmake | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/native/libs/CMakeLists.txt b/src/native/libs/CMakeLists.txt index f9d1b364903f7..eb1df8fa2a210 100644 --- a/src/native/libs/CMakeLists.txt +++ b/src/native/libs/CMakeLists.txt @@ -33,7 +33,7 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wno-declaration-after-statement") if (CLR_CMAKE_TARGET_BROWSER) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-pre-c11-compat -Wno-version-check") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-pre-c11-compat") endif() add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common) diff --git a/src/native/libs/configure.cmake b/src/native/libs/configure.cmake index a9904e323bd42..d15a5ff74bc96 100644 --- a/src/native/libs/configure.cmake +++ b/src/native/libs/configure.cmake @@ -616,7 +616,6 @@ elseif(CLR_CMAKE_TARGET_ANDROID) set(HAVE_CLOCK_REALTIME 1) elseif(CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI) set(HAVE_FORK 0) - add_compile_options(-Wno-version-check) else() check_symbol_exists( aligned_alloc From d7b1d52f308b84178bafacf1bb76e62d1619993f Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 4 Jun 2024 11:34:33 +0200 Subject: [PATCH 18/45] Fix emsdk check We use system python on osx too --- src/mono/browser/build/EmSdkRepo.Defaults.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/browser/build/EmSdkRepo.Defaults.props b/src/mono/browser/build/EmSdkRepo.Defaults.props index 4e56389ea631e..aa94ded228bfc 100644 --- a/src/mono/browser/build/EmSdkRepo.Defaults.props +++ b/src/mono/browser/build/EmSdkRepo.Defaults.props @@ -13,8 +13,8 @@ <_UsingEMSDK_PATH>true - - + + $([MSBuild]::NormalizeDirectory($(EmscriptenSdkToolsPath)python)) <_EMSDKMissingPaths Condition="'$(_EMSDKMissingPaths)' == '' and ('$(EmscriptenPythonToolsPath)' == '' or !Exists('$(EmscriptenPythonToolsPath)'))">%24(EmscriptenPythonToolsPath)=$(EmscriptenPythonToolsPath) From 3593c41798f6c667a1778859f5576d8cfc723d5d Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 4 Jun 2024 21:55:01 +0200 Subject: [PATCH 19/45] Workaround wasm-opt crash --- src/mono/wasm/build/WasmApp.Common.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets index 37f4db88371b3..aae8ed7492fec 100644 --- a/src/mono/wasm/build/WasmApp.Common.targets +++ b/src/mono/wasm/build/WasmApp.Common.targets @@ -499,6 +499,9 @@ + + + From 4530edfdcc64dd60d16f276a58fb7e3e5ede867d Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 5 Jun 2024 14:16:00 +0200 Subject: [PATCH 20/45] Workaround wasm-opt crash --- src/mono/browser/browser.proj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj index e423a648c489b..a92061c0704f3 100644 --- a/src/mono/browser/browser.proj +++ b/src/mono/browser/browser.proj @@ -365,6 +365,9 @@ $(ICULibDir)/libicudata.a; $(BrowserProjectRoot)runtime/hybrid-globalization/segmentation-rules.json" /> + + + $(ArtifactsObjDir)wasm/pinvoke-table.h @@ -382,6 +385,9 @@ $(CMakeConfigurationLinkFlags) -Wno-pthreads-mem-growth $(CMakeConfigurationLinkFlags) --emit-symbol-map + + $(CMakeConfigurationLinkFlags) -O1 + -DEMSDK_PATH="$(EMSDK_PATH.TrimEnd('\/').Replace('\','/'))" emcmake cmake $(MSBuildThisFileDirectory)runtime From 200cf3b3915d7e308414387628049cc710196992 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 5 Jun 2024 16:01:27 +0200 Subject: [PATCH 21/45] Workaround wasm-opt crash --- src/mono/browser/build/BrowserWasmApp.targets | 4 ++++ src/mono/wasm/build/WasmApp.Common.targets | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mono/browser/build/BrowserWasmApp.targets b/src/mono/browser/build/BrowserWasmApp.targets index 193e0db3d7286..4310617c9927b 100644 --- a/src/mono/browser/build/BrowserWasmApp.targets +++ b/src/mono/browser/build/BrowserWasmApp.targets @@ -271,6 +271,10 @@ $(EmccCompileOptimizationFlag) -O2 $(WasmCompileOptimizationFlag) + + + -O1 + -O2 $(WasmCompileOptimizationFlag) $(EmccLinkOptimizationFlag) diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets index aae8ed7492fec..8df3969e45f56 100644 --- a/src/mono/wasm/build/WasmApp.Common.targets +++ b/src/mono/wasm/build/WasmApp.Common.targets @@ -501,7 +501,7 @@ - + From 6e86cc3abe98366f4b1c61d1fd14b0cb297287a2 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 11 Jun 2024 16:21:25 +0200 Subject: [PATCH 22/45] Fix WBT test --- .../ComponentsWebAssemblyApplicationBuilderExtensions.cs | 1 + .../testassets/WasmOnAspNetCore/AspNetCoreServer/Program.cs | 1 + .../ComputeWasmBuildAssets.cs | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mono/wasm/host/DevServer/ComponentsWebAssemblyApplicationBuilderExtensions.cs b/src/mono/wasm/host/DevServer/ComponentsWebAssemblyApplicationBuilderExtensions.cs index 1409fa7b5868d..f510495772a18 100644 --- a/src/mono/wasm/host/DevServer/ComponentsWebAssemblyApplicationBuilderExtensions.cs +++ b/src/mono/wasm/host/DevServer/ComponentsWebAssemblyApplicationBuilderExtensions.cs @@ -95,6 +95,7 @@ private static StaticFileOptions CreateStaticFilesOptions(IFileProvider webRootF AddMapping(contentTypeProvider, ".br", MediaTypeNames.Application.Octet); AddMapping(contentTypeProvider, ".dat", MediaTypeNames.Application.Octet); AddMapping(contentTypeProvider, ".blat", MediaTypeNames.Application.Octet); + AddMapping(contentTypeProvider, ".mjs", MediaTypeNames.Text.JavaScript); options.ContentTypeProvider = contentTypeProvider; diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/Program.cs b/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/Program.cs index b22b8ded516a0..7fadf13bd38fe 100644 --- a/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/Program.cs +++ b/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/Program.cs @@ -31,6 +31,7 @@ provider.Mappings[".dll"] = "application/octet-stream"; provider.Mappings[".pdb"] = "application/octet-stream"; provider.Mappings[".dat"] = "application/octet-stream"; +provider.Mappings[".mjs"] = "text/javascript"; app.UseStaticFiles(new StaticFileOptions { ContentTypeProvider = provider, diff --git a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmBuildAssets.cs b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmBuildAssets.cs index e5c10d67a4a30..6e2962593c3a3 100644 --- a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmBuildAssets.cs +++ b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmBuildAssets.cs @@ -118,14 +118,15 @@ public override bool Execute() } string candidateFileName = candidate.GetMetadata("FileName"); - if (candidateFileName.StartsWith("dotnet") && candidate.GetMetadata("Extension") == ".js") + string extension = candidate.GetMetadata("Extension"); + if (candidateFileName.StartsWith("dotnet") && (extension == ".js" || extension == ".mjs")) { string newDotnetJSFileName = null; string newDotNetJSFullPath = null; if (candidateFileName != "dotnet" || FingerprintDotNetJs) { var itemHash = FileHasher.GetFileHash(candidate.ItemSpec); - newDotnetJSFileName = $"{candidateFileName}.{DotNetJsVersion}.{itemHash}.js"; + newDotnetJSFileName = $"{candidateFileName}.{DotNetJsVersion}.{itemHash}{extension}"; var originalFileFullPath = Path.GetFullPath(candidate.ItemSpec); var originalFileDirectory = Path.GetDirectoryName(originalFileFullPath); From c313fa52bf8cb2995d03b8c25474ef978272cbfc Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 11 Jun 2024 16:33:38 +0200 Subject: [PATCH 23/45] Feedback --- .../ComputeWasmPublishAssets.cs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmPublishAssets.cs b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmPublishAssets.cs index a2ba1f1d4bfb6..1255494e22e29 100644 --- a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmPublishAssets.cs +++ b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmPublishAssets.cs @@ -172,10 +172,9 @@ private List ProcessNativeAssets( var key = kvp.Key; var asset = kvp.Value; var isDotNetJs = IsAnyDotNetJs(key); - var isDotNetMJs = IsAnyDotNetMJs(key); var isDotNetWasm = IsDotNetWasm(key); - if (!isDotNetJs && !isDotNetMJs && !isDotNetWasm) + if (!isDotNetJs && !isDotNetWasm) { if (resolvedNativeAssetToPublish.TryGetValue(Path.GetFileName(asset.GetMetadata("OriginalItemSpec")), out var existing)) { @@ -204,7 +203,7 @@ private List ProcessNativeAssets( continue; } - if (isDotNetJs || isDotNetMJs) + if (isDotNetJs) { var extension = ".js"; var baseName = Path.GetFileNameWithoutExtension(key); @@ -296,13 +295,7 @@ private List ProcessNativeAssets( static bool IsAnyDotNetJs(string key) { var fileName = Path.GetFileName(key); - return fileName.StartsWith("dotnet.", StringComparison.Ordinal) && fileName.EndsWith(".js", StringComparison.Ordinal); - } - - static bool IsAnyDotNetMJs(string key) - { - var fileName = Path.GetFileName(key); - return fileName.StartsWith("dotnet.", StringComparison.Ordinal) && fileName.EndsWith(".mjs", StringComparison.Ordinal); + return fileName.StartsWith("dotnet.", StringComparison.Ordinal) && (fileName.EndsWith(".js", StringComparison.Ordinal) || fileName.EndsWith(".mjs", StringComparison.Ordinal)); } static bool IsDotNetWasm(string key) From 0d7708b79c3c228c8c98f8c4579347224762eb52 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 14 Jun 2024 10:30:19 +0200 Subject: [PATCH 24/45] Update ICU dependency --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d9c402322153..052e04db54d4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 18bf8e40d89828b28fa586c9941907d2105d108c + 6fa5c9be91ff269e5a73b8eb11b590bab44d9502 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index c966bd7314507..36771f7623862 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -212,7 +212,7 @@ 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24304.1 + 9.0.0-preview.6.24313.1 2.3.5 9.0.0-alpha.1.24167.3 From 8a12f4424b43a0a68df62727efa5b5675bc47449 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 14 Jun 2024 10:32:54 +0200 Subject: [PATCH 25/45] Update emscripten deps --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 052e04db54d4b..945f2bec22fb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,14 +68,14 @@ 7a4a59f9f66baf6711a6ce2de01d3b2c62ed72d8 - + https://github.com/dotnet/emsdk - 51710a63905929c08435a3388d4691ede57a31bf + ccb35a56688801297932756a6ba004c5baaa1b98 - + https://github.com/dotnet/emsdk - 51710a63905929c08435a3388d4691ede57a31bf + ccb35a56688801297932756a6ba004c5baaa1b98 diff --git a/eng/Versions.props b/eng/Versions.props index 36771f7623862..22c6416e26fe0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -235,7 +235,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 9.0.0-preview.6.24304.1 + 9.0.0-preview.6.24313.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 9.0.0-preview.6.24305.1 From fc6ad972834de281d7d17dc632a57b5076a2f468 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 14 Jun 2024 10:45:19 +0200 Subject: [PATCH 26/45] Revert "Workaround wasm-opt crash" This reverts commit 200cf3b3915d7e308414387628049cc710196992. --- src/mono/browser/build/BrowserWasmApp.targets | 4 ---- src/mono/wasm/build/WasmApp.Common.targets | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/mono/browser/build/BrowserWasmApp.targets b/src/mono/browser/build/BrowserWasmApp.targets index 4310617c9927b..193e0db3d7286 100644 --- a/src/mono/browser/build/BrowserWasmApp.targets +++ b/src/mono/browser/build/BrowserWasmApp.targets @@ -271,10 +271,6 @@ $(EmccCompileOptimizationFlag) -O2 $(WasmCompileOptimizationFlag) - - - -O1 - -O2 $(WasmCompileOptimizationFlag) $(EmccLinkOptimizationFlag) diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets index 6ba651be5d2f0..4c09e3688bcc3 100644 --- a/src/mono/wasm/build/WasmApp.Common.targets +++ b/src/mono/wasm/build/WasmApp.Common.targets @@ -502,7 +502,7 @@ - + From 683bd51809e2f2b2893f1d79a61ef2ae4606deee Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 14 Jun 2024 10:45:40 +0200 Subject: [PATCH 27/45] Revert "Workaround wasm-opt crash" This reverts commit 4530edfdcc64dd60d16f276a58fb7e3e5ede867d. --- src/mono/browser/browser.proj | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj index a92061c0704f3..e423a648c489b 100644 --- a/src/mono/browser/browser.proj +++ b/src/mono/browser/browser.proj @@ -365,9 +365,6 @@ $(ICULibDir)/libicudata.a; $(BrowserProjectRoot)runtime/hybrid-globalization/segmentation-rules.json" /> - - - $(ArtifactsObjDir)wasm/pinvoke-table.h @@ -385,9 +382,6 @@ $(CMakeConfigurationLinkFlags) -Wno-pthreads-mem-growth $(CMakeConfigurationLinkFlags) --emit-symbol-map - - $(CMakeConfigurationLinkFlags) -O1 - -DEMSDK_PATH="$(EMSDK_PATH.TrimEnd('\/').Replace('\','/'))" emcmake cmake $(MSBuildThisFileDirectory)runtime From b15fd5cda76c19a145d7985bfbf58e31e99b8eb4 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 14 Jun 2024 10:46:16 +0200 Subject: [PATCH 28/45] Revert "Workaround wasm-opt crash" This reverts commit 3593c41798f6c667a1778859f5576d8cfc723d5d. --- src/mono/wasm/build/WasmApp.Common.targets | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets index 4c09e3688bcc3..0c56ee083ee9b 100644 --- a/src/mono/wasm/build/WasmApp.Common.targets +++ b/src/mono/wasm/build/WasmApp.Common.targets @@ -500,9 +500,6 @@ - - - From 9ae3c2fe6d49df4418e1167c0a0b5a833d922a1f Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Sun, 16 Jun 2024 20:23:49 +0200 Subject: [PATCH 29/45] Increase tests timeout --- eng/testing/tests.wasm.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index bf29d930d02f5..17ad41a2eac89 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -31,7 +31,7 @@ <_ShellCommandSeparator Condition="'$(OS)' == 'Windows_NT'">&& <_ShellCommandSeparator Condition="'$(OS)' != 'Windows_NT'">&& true - 00:30:00 + 00:45:00 $(BundleDir) $(MSBuildThisFileDirectory) From 60a47999172f01172438e7805bf4a27f574db571 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Sun, 16 Jun 2024 20:31:13 +0200 Subject: [PATCH 30/45] Show test progress --- .../tests/System.Buffers.Tests/System.Buffers.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/System.Runtime/tests/System.Buffers.Tests/System.Buffers.Tests.csproj b/src/libraries/System.Runtime/tests/System.Buffers.Tests/System.Buffers.Tests.csproj index 66ae6833a50eb..113d56e6f4363 100644 --- a/src/libraries/System.Runtime/tests/System.Buffers.Tests/System.Buffers.Tests.csproj +++ b/src/libraries/System.Runtime/tests/System.Buffers.Tests/System.Buffers.Tests.csproj @@ -6,6 +6,7 @@ $(NetCoreAppCurrent) + true 1 From 3bd6bfbf4cba48961a7fde50a80ba3d790f8cb6f Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Mon, 17 Jun 2024 10:02:28 +0200 Subject: [PATCH 31/45] Increase MT library tests timeout --- eng/pipelines/runtime.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index cb7aadde9fab6..03df800102de2 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -860,6 +860,8 @@ extends: platforms: - browser_wasm #- browser_wasm_win + jobParameters: + timeoutInMinutes: 240 nameSuffix: _Threading extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) extraHelixArguments: /p:WasmEnableThreads=true From 16866a148a3faa557200074a7fbdb0832ef7ff75 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Mon, 17 Jun 2024 13:05:38 +0200 Subject: [PATCH 32/45] Disable WBT tests with SkiaSharp --- src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs | 1 + src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs index e01a9f4f3e642..654811e14b8ab 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs @@ -22,6 +22,7 @@ public MiscTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildC [InlineData("Debug", false)] [InlineData("Release", true)] [InlineData("Release", false)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/103566")] public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRelink) { string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{GetRandomId()}"; diff --git a/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs b/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs index 555cfa73fad17..8444f54308d5b 100644 --- a/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs @@ -51,6 +51,7 @@ public void ProjectWithNativeReference(BuildArgs buildArgs, RunHost host, string [Theory] [BuildAndRun(aot: false)] [BuildAndRun(aot: true)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/103566")] public void ProjectUsingSkiaSharp(BuildArgs buildArgs, RunHost host, string id) { string projectName = $"AppUsingSkiaSharp"; From d53aaa332a9c0eaf9b21b28f9fdf05b157ad0ff6 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 18 Jun 2024 13:17:29 +0200 Subject: [PATCH 33/45] Increase helix tests timeout on browser --- src/libraries/sendtohelixhelp.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 3608f1cae63d0..ae3673b47fd8c 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -39,6 +39,7 @@ '$(Scenario)' == 'gcstress0xc_jitminopts_heapverify1'">06:00:00 <_workItemTimeout Condition="'$(_workItemTimeout)' == '' and '$(TargetsAppleMobile)' == 'true'">01:15:00 <_workItemTimeout Condition="'$(_workItemTimeout)' == '' and '$(TargetOS)' == 'android'">00:30:00 + <_workItemTimeout Condition="'$(_workItemTimeout)' == '' and '$(TargetOS)' == 'browser'">00:45:00 <_workItemTimeout Condition="'$(Scenario)' == '' and '$(_workItemTimeout)' == '' and ('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm')">00:45:00 <_workItemTimeout Condition="'$(Scenario)' != '' and '$(_workItemTimeout)' == '' and ('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm')">01:00:00 <_workItemTimeout Condition="'$(Scenario)' == '' and '$(_workItemTimeout)' == '' and ('$(TestScope)' == 'outerloop' or '$(TestScope)' == 'all')">00:20:00 From 4c69c36b8e7bb5fddcd2ecd84b9a4b90e46ccd38 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 19 Jun 2024 10:27:15 +0200 Subject: [PATCH 34/45] Increase WBT timeout --- eng/pipelines/common/templates/browser-wasm-build-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/browser-wasm-build-tests.yml b/eng/pipelines/common/templates/browser-wasm-build-tests.yml index 3bcbec8607cac..0be5acb054030 100644 --- a/eng/pipelines/common/templates/browser-wasm-build-tests.yml +++ b/eng/pipelines/common/templates/browser-wasm-build-tests.yml @@ -111,7 +111,7 @@ jobs: /p:WasmSkipMissingRuntimePackBuild=true /p:PreparePackagesForWorkloadInstall=false /p:WorkloadsTestPreviousVersions=$(workloadsTestPreviousVersionsVar) - timeoutInMinutes: 180 + timeoutInMinutes: 240 condition: >- or( eq(variables['alwaysRunVar'], true), From c268a87f674e3b2862fcb2624431d0cfcf2e7ded Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 19 Jun 2024 19:28:30 +0200 Subject: [PATCH 35/45] Increase initial heap sizes --- src/mono/browser/browser.proj | 2 +- src/mono/wasm/build/WasmApp.Common.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj index e423a648c489b..88836e45e04c8 100644 --- a/src/mono/browser/browser.proj +++ b/src/mono/browser/browser.proj @@ -270,7 +270,7 @@ <_EmccExportedRuntimeMethods>"[@(EmccExportedRuntimeMethod -> '%27%(Identity)%27', ',')]" <_EmccExportedFunctions>@(EmccExportedFunction -> '%(Identity)',',') - 33554432 + 67108864 5MB diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets index 0c56ee083ee9b..5089424bad876 100644 --- a/src/mono/wasm/build/WasmApp.Common.targets +++ b/src/mono/wasm/build/WasmApp.Common.targets @@ -600,7 +600,7 @@ $(_WasmCalculatedInitialHeapSize) - 33554432 + 67108864 From abe9b0023b5cc09b7de20491bd29c2022b6a7a87 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Thu, 20 Jun 2024 15:07:31 +0200 Subject: [PATCH 36/45] Fix mono_wasm_load_runtime cwrap signature Fixes: `Uncaught ExitStatus: Assertion failed: stringToUTF8Array expects a string (got number)` --- src/mono/browser/runtime/cwraps.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/browser/runtime/cwraps.ts b/src/mono/browser/runtime/cwraps.ts index 26584a7a213a3..78709bb2c6278 100644 --- a/src/mono/browser/runtime/cwraps.ts +++ b/src/mono/browser/runtime/cwraps.ts @@ -53,7 +53,7 @@ const fn_signatures: SigLine[] = [ [true, "mono_wasm_load_icu_data", "number", ["number"]], [false, "mono_wasm_add_assembly", "number", ["string", "number", "number"]], [true, "mono_wasm_add_satellite_assembly", "void", ["string", "string", "number", "number"]], - [false, "mono_wasm_load_runtime", null, ["string", "number"]], + [false, "mono_wasm_load_runtime", null, ["number"]], [true, "mono_wasm_change_debugger_log_level", "void", ["number"]], [true, "mono_wasm_assembly_load", "number", ["string"]], From d5a0bc4e96b56888f748a9d30ea44f163cee6941 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 26 Jun 2024 12:33:57 +0200 Subject: [PATCH 37/45] Enable XunitShowProgress for threading tasks tests --- .../System.Threading.Tasks.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Threading.Tasks.Tests.csproj b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Threading.Tasks.Tests.csproj index 4b916c09bb4b3..2f832312d7e2d 100644 --- a/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Threading.Tasks.Tests.csproj +++ b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Threading.Tasks.Tests.csproj @@ -6,6 +6,7 @@ <_WasmPThreadPoolUnusedSize>10 + true From 5d9a6d2352e1df268a591320ac36ed62b71f8c91 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 26 Jun 2024 23:24:28 +0200 Subject: [PATCH 38/45] Try to reduce number of parallel AOT compilations To check whether it will improve memory issues on CI --- src/tasks/AotCompilerTask/MonoAOTCompiler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.cs b/src/tasks/AotCompilerTask/MonoAOTCompiler.cs index 2dc46b0c65a73..b439f650385d3 100644 --- a/src/tasks/AotCompilerTask/MonoAOTCompiler.cs +++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.cs @@ -523,7 +523,7 @@ private bool ExecuteInternal() } else { - int allowedParallelism = DisableParallelAot ? 1 : Math.Min(_assembliesToCompile.Count, Environment.ProcessorCount); + int allowedParallelism = DisableParallelAot ? 1 : Math.Min(_assembliesToCompile.Count, Math.Max(1, Environment.ProcessorCount/2)); if (BuildEngine is IBuildEngine9 be9) allowedParallelism = be9.RequestCores(allowedParallelism); From 3fe1e1f1d73a0b1cb9399c6805bc5d982d7bfcdb Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 2 Jul 2024 21:31:59 +0200 Subject: [PATCH 39/45] Use new docker image for helix/windows tests --- eng/pipelines/libraries/helix-queues-setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index dd7e155a4afeb..7f291d7c5114f 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -177,6 +177,6 @@ jobs: # Browser WebAssembly windows - ${{ if in(parameters.platform, 'browser_wasm_win', 'wasi_wasm_win') }}: - - (Windows.Amd64.Server2022.Open)windows.amd64.server2022.open@mcr.microsoft.com/dotnet-buildtools/prereqs:windowsservercore-ltsc2022-helix-webassembly + - (Windows.Amd64.Server2022.Open)windows.amd64.server2022.open@mcr.microsoft.com/dotnet-buildtools/prereqs:windowsservercore-ltsc2022-helix-webassembly-20240702174122-7aba2af ${{ insert }}: ${{ parameters.jobParameters }} From b2655bfceedde3433db45fab53c16c435c8518f5 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 3 Jul 2024 11:56:04 +0200 Subject: [PATCH 40/45] Revert "Try to reduce number of parallel AOT compilations" This reverts commit 5d9a6d2352e1df268a591320ac36ed62b71f8c91. --- src/tasks/AotCompilerTask/MonoAOTCompiler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.cs b/src/tasks/AotCompilerTask/MonoAOTCompiler.cs index 527c561d436af..89241ebdd85f4 100644 --- a/src/tasks/AotCompilerTask/MonoAOTCompiler.cs +++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.cs @@ -523,7 +523,7 @@ private bool ExecuteInternal() } else { - int allowedParallelism = DisableParallelAot ? 1 : Math.Min(_assembliesToCompile.Count, Math.Max(1, Environment.ProcessorCount/2)); + int allowedParallelism = DisableParallelAot ? 1 : Math.Min(_assembliesToCompile.Count, Environment.ProcessorCount); IBuildEngine9? be9 = BuildEngine as IBuildEngine9; if (be9 is not null) allowedParallelism = be9.RequestCores(allowedParallelism); From 009e371a71d24b5c7185590afdc864eda0f717dc Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Sun, 7 Jul 2024 10:54:10 +0200 Subject: [PATCH 41/45] Reduce the timeouts --- eng/pipelines/common/templates/browser-wasm-build-tests.yml | 2 +- eng/pipelines/runtime.yml | 2 -- eng/testing/tests.wasm.targets | 2 +- src/libraries/sendtohelixhelp.proj | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/common/templates/browser-wasm-build-tests.yml b/eng/pipelines/common/templates/browser-wasm-build-tests.yml index 0be5acb054030..3bcbec8607cac 100644 --- a/eng/pipelines/common/templates/browser-wasm-build-tests.yml +++ b/eng/pipelines/common/templates/browser-wasm-build-tests.yml @@ -111,7 +111,7 @@ jobs: /p:WasmSkipMissingRuntimePackBuild=true /p:PreparePackagesForWorkloadInstall=false /p:WorkloadsTestPreviousVersions=$(workloadsTestPreviousVersionsVar) - timeoutInMinutes: 240 + timeoutInMinutes: 180 condition: >- or( eq(variables['alwaysRunVar'], true), diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 999ae526970d9..97092071411ef 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -839,8 +839,6 @@ extends: platforms: - browser_wasm #- browser_wasm_win - jobParameters: - timeoutInMinutes: 240 nameSuffix: _Threading extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) extraHelixArguments: /p:WasmEnableThreads=true diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index 7158da4fcb21f..ef52bce43743c 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -28,7 +28,7 @@ <_ShellCommandSeparator Condition="'$(OS)' == 'Windows_NT'">&& <_ShellCommandSeparator Condition="'$(OS)' != 'Windows_NT'">&& true - 00:45:00 + 00:30:00 $(BundleDir) $(MSBuildThisFileDirectory) diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index ae3673b47fd8c..81a3ac4d71097 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -39,7 +39,7 @@ '$(Scenario)' == 'gcstress0xc_jitminopts_heapverify1'">06:00:00 <_workItemTimeout Condition="'$(_workItemTimeout)' == '' and '$(TargetsAppleMobile)' == 'true'">01:15:00 <_workItemTimeout Condition="'$(_workItemTimeout)' == '' and '$(TargetOS)' == 'android'">00:30:00 - <_workItemTimeout Condition="'$(_workItemTimeout)' == '' and '$(TargetOS)' == 'browser'">00:45:00 + <_workItemTimeout Condition="'$(_workItemTimeout)' == '' and '$(TargetOS)' == 'browser'">00:30:00 <_workItemTimeout Condition="'$(Scenario)' == '' and '$(_workItemTimeout)' == '' and ('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm')">00:45:00 <_workItemTimeout Condition="'$(Scenario)' != '' and '$(_workItemTimeout)' == '' and ('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm')">01:00:00 <_workItemTimeout Condition="'$(Scenario)' == '' and '$(_workItemTimeout)' == '' and ('$(TestScope)' == 'outerloop' or '$(TestScope)' == 'all')">00:20:00 From 9e0d5cefb96d0a5fe30a04f18ebfe62d85814353 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Sun, 7 Jul 2024 11:01:27 +0200 Subject: [PATCH 42/45] Reduce intitial heap size --- src/mono/browser/browser.proj | 2 +- src/mono/wasm/build/WasmApp.Common.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj index e671e737f58ed..7844565cc3519 100644 --- a/src/mono/browser/browser.proj +++ b/src/mono/browser/browser.proj @@ -274,7 +274,7 @@ <_EmccExportedRuntimeMethods>"[@(EmccExportedRuntimeMethod -> '%27%(Identity)%27', ',')]" <_EmccExportedFunctions>@(EmccExportedFunction -> '%(Identity)',',') - 67108864 + 33554432 5MB diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets index 45bfb7034a7e2..3a47fe5d55a91 100644 --- a/src/mono/wasm/build/WasmApp.Common.targets +++ b/src/mono/wasm/build/WasmApp.Common.targets @@ -595,7 +595,7 @@ $(_WasmCalculatedInitialHeapSize) - 67108864 + 33554432 From 8ed7bf90d124ab15e7a2f4f0be6b60c5136b1bfe Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Tue, 9 Jul 2024 13:09:34 +0200 Subject: [PATCH 43/45] use active issues for MT --- .../tests/System.Threading.Tasks.Tests/MethodCoverage.cs | 2 ++ .../Task/AsyncEnumerableToBlockingEnumerableTests.cs | 3 +++ .../System.Threading.Tasks.Tests/Task/TaskContinueWithTests.cs | 2 ++ src/libraries/System.Threading/tests/MutexTests.cs | 1 + src/libraries/System.Threading/tests/SemaphoreSlimTests.cs | 1 + 5 files changed, 9 insertions(+) diff --git a/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/MethodCoverage.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/MethodCoverage.cs index 695cd6abb1714..579662f96dc1f 100644 --- a/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/MethodCoverage.cs +++ b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/MethodCoverage.cs @@ -295,6 +295,7 @@ public static async Task Task_WhenAny_TwoTasks_WakesOnFirstCompletion() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/99500", TestPlatforms.Browser)] public static void CancellationTokenRegitration() { ManualResetEvent mre = new ManualResetEvent(false); @@ -312,6 +313,7 @@ public static void CancellationTokenRegitration() /// verify that the taskawaiter.UnsafeOnCompleted is invoked /// [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/99500", TestPlatforms.Browser)] public static void TaskAwaiter() { ManualResetEvent mre = new ManualResetEvent(false); diff --git a/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/AsyncEnumerableToBlockingEnumerableTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/AsyncEnumerableToBlockingEnumerableTests.cs index 0692aedb514f9..048025c5c947a 100644 --- a/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/AsyncEnumerableToBlockingEnumerableTests.cs +++ b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/AsyncEnumerableToBlockingEnumerableTests.cs @@ -70,6 +70,7 @@ static async IAsyncEnumerable CreateSourceEnumerable() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/99519", TestPlatforms.Browser)] public static void AsyncEnumerableWithDelays() { var source = new InstrumentedAsyncEnumerable(CreateSourceEnumerable()); @@ -104,6 +105,7 @@ static async IAsyncEnumerable CreateSourceEnumerable() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/99519", TestPlatforms.Browser)] public static void AsyncEnumerableWithException() { var source = new InstrumentedAsyncEnumerable(CreateSourceEnumerable()); @@ -132,6 +134,7 @@ static async IAsyncEnumerable CreateSourceEnumerable() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/99519", TestPlatforms.Browser)] public static void AsyncEnumerableWithCancellation() { var source = new InstrumentedAsyncEnumerable(CreateSourceEnumerable()); diff --git a/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWithTests.cs b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWithTests.cs index 2800a5e9e24c4..4cb9d47ca4ec8 100644 --- a/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWithTests.cs +++ b/src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWithTests.cs @@ -1076,6 +1076,7 @@ public static void RunContinuationCancelTest_State() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/99519", TestPlatforms.Browser)] public static void TestNoDeadlockOnContinueWith() { Debug.WriteLine("TestNoDeadlockOnContinueWith: shouldn't deadlock if it passes."); @@ -1255,6 +1256,7 @@ public static void LongContinuationChain_Unwrap_DoesNotStackOverflow() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/99519", TestPlatforms.Browser)] public static void LongContinuationChain_Await_DoesNotStackOverflow() { const int DiveDepth = 12_000; diff --git a/src/libraries/System.Threading/tests/MutexTests.cs b/src/libraries/System.Threading/tests/MutexTests.cs index 6b06baeb76034..6d769c4297fae 100644 --- a/src/libraries/System.Threading/tests/MutexTests.cs +++ b/src/libraries/System.Threading/tests/MutexTests.cs @@ -661,6 +661,7 @@ private static void IncrementValueInFileNTimes(Mutex mutex, string fileName, int } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/96191", TestPlatforms.Browser)] public void NamedMutex_ThreadExitDisposeRaceTest() { var mutexName = Guid.NewGuid().ToString("N"); diff --git a/src/libraries/System.Threading/tests/SemaphoreSlimTests.cs b/src/libraries/System.Threading/tests/SemaphoreSlimTests.cs index 7aabd01c39f1e..faac4d9cf9f85 100644 --- a/src/libraries/System.Threading/tests/SemaphoreSlimTests.cs +++ b/src/libraries/System.Threading/tests/SemaphoreSlimTests.cs @@ -90,6 +90,7 @@ public static void RunSemaphoreSlimTest1_WaitAsync() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/99519", TestPlatforms.Browser)] public static void RunSemaphoreSlimTest1_WaitAsync_NegativeCases() { // Invalid timeout From fdbb1f20e341613ab7834cf9b4a7f08864f07026 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Sat, 13 Jul 2024 14:13:32 +0200 Subject: [PATCH 44/45] Remove testing channel from nuget config, update deps --- NuGet.config | 1 - eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index a2f361ba992c5..c9f91b5327322 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1f703f4cfb0c..fd03ff0259daf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 6fa5c9be91ff269e5a73b8eb11b590bab44d9502 + ea4bc17f2671ca47902cb7a83f364d64f3bb0ccb https://github.com/dotnet/msquic @@ -68,14 +68,14 @@ 7e4af02521473d89d6144b3da58fef253e498974 - + https://github.com/dotnet/emsdk - ccb35a56688801297932756a6ba004c5baaa1b98 + cf18445b693ff6a631e3335e32db78eda9f7ce5e - + https://github.com/dotnet/emsdk - ccb35a56688801297932756a6ba004c5baaa1b98 + cf18445b693ff6a631e3335e32db78eda9f7ce5e diff --git a/eng/Versions.props b/eng/Versions.props index fa1ab7676ac16..d51432b700332 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,7 +216,7 @@ 9.0.0-preview.7.24357.2 - 9.0.0-preview.6.24313.1 + 9.0.0-preview.7.24362.1 2.3.5 9.0.0-alpha.1.24167.3 @@ -239,7 +239,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 9.0.0-preview.6.24313.3 + 9.0.0-preview.7.24362.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 9.0.0-preview.7.24352.2 From ddc4698181676f2640885f0aca414bb48a03faa8 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Mon, 15 Jul 2024 18:44:48 +0200 Subject: [PATCH 45/45] Update emsdk and icu dependencies --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd03ff0259daf..3c784f4dae1fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - ea4bc17f2671ca47902cb7a83f364d64f3bb0ccb + c8db7547bc0a021ffd262b3449f5b0343894b32b https://github.com/dotnet/msquic @@ -68,14 +68,14 @@ 7e4af02521473d89d6144b3da58fef253e498974 - + https://github.com/dotnet/emsdk - cf18445b693ff6a631e3335e32db78eda9f7ce5e + 99ea0c06b84d3084d090da537080dd35d2a193cf - + https://github.com/dotnet/emsdk - cf18445b693ff6a631e3335e32db78eda9f7ce5e + 99ea0c06b84d3084d090da537080dd35d2a193cf diff --git a/eng/Versions.props b/eng/Versions.props index d51432b700332..c1afe987b0698 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,7 +216,7 @@ 9.0.0-preview.7.24357.2 - 9.0.0-preview.7.24362.1 + 9.0.0-preview.7.24365.2 2.3.5 9.0.0-alpha.1.24167.3 @@ -239,7 +239,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 9.0.0-preview.7.24362.3 + 9.0.0-preview.7.24365.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 9.0.0-preview.7.24352.2