dotnet · radical · Jul 9, 2022 · May 2, 2022 · May 2, 2022 · May 2, 2022
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,8 +1,8 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-preview.7.22354.1">
+    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-preview.6.22313.1">
       <Uri>https://github.com/dotnet/icu</Uri>
-      <Sha>da370c0f13fe10e544f6ed2c575c551d8a863ad9</Sha>
+      <Sha>d18a78f3f7bb973e7b01509ae6afe934cfbbd0d4</Sha>
     </Dependency>
     <Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.22357.1">
       <Uri>https://github.com/dotnet/msquic</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -171,7 +171,7 @@
     <MicrosoftNETILLinkTasksVersion>7.0.100-1.22357.2</MicrosoftNETILLinkTasksVersion>
     <MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
     <!-- ICU -->
-    <MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-preview.7.22354.1</MicrosoftNETCoreRuntimeICUTransportVersion>
+    <MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-preview.6.22313.1</MicrosoftNETCoreRuntimeICUTransportVersion>
     <!-- MsQuic -->
     <SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22357.1</SystemNetMsQuicTransportVersion>
     <!-- Mono LLVM -->

diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml
@@ -397,7 +397,7 @@ jobs:
       platform: Browser_wasm
       shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
       container:
-        image: ubuntu-18.04-webassembly-20220317214646-1ad56e8
+        image: ubuntu-18.04-webassembly-20220531132048-00a561c
         registry: mcr
       jobParameters:
         hostedOs: Linux
@@ -422,7 +422,7 @@ jobs:
       platform: Browser_wasm_firefox
       shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
       container:
-        image: ubuntu-18.04-webassembly-20220317214646-1ad56e8
+        image: ubuntu-18.04-webassembly-20220531132048-00a561c
         registry: mcr
       jobParameters:
         hostedOs: Linux

@@ -15,13 +15,34 @@ jobs:
 #
 # Build for Browser/wasm, with EnableAggressiveTrimming=true
 #
-- template: /eng/pipelines/common/templates/wasm-library-tests.yml
-  parameters:
-    platforms: ${{ parameters.platforms }}
-    nameSuffix: ${{ parameters.nameSuffix }}
-    isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
-    extraBuildArgs: /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=${{ parameters.buildAOTOnHelix }} /p:RunAOTCompilation=${{ parameters.runAOT }} ${{ parameters.extraBuildArgs }}
-    extraHelixArgs: /p:NeedsToBuildWasmAppsOnHelix=true ${{ parameters.extraHelixArgs }}
-    alwaysRun: ${{ parameters.alwaysRun }}
-    runSmokeOnlyArg: $(_runSmokeTestsOnlyArg)
-    shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
+# non-windows - run only with v8
+- ${{ if containsValue(parameters.platforms, 'Browser_wasm') }}:
+  - template: /eng/pipelines/common/templates/wasm-library-tests.yml
+    parameters:
+      platforms:
+        - Browser_wasm
+      nameSuffix: ${{ parameters.nameSuffix }}
+      isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
+      extraBuildArgs: /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=${{ parameters.buildAOTOnHelix }} /p:RunAOTCompilation=${{ parameters.runAOT }} ${{ parameters.extraBuildArgs }}
+      extraHelixArgs: /p:NeedsToBuildWasmAppsOnHelix=true ${{ parameters.extraHelixArgs }}
+      alwaysRun: ${{ parameters.alwaysRun }}
+      runSmokeOnlyArg: $(_runSmokeTestsOnlyArg)
+      shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
+      scenarios:
+        - normal
+
+# windows - run only with browser
+- ${{ if containsValue(parameters.platforms, 'Browser_wasm_win') }}:
+  - template: /eng/pipelines/common/templates/wasm-library-tests.yml
+    parameters:
+      platforms:
+        - Browser_wasm_win
+      nameSuffix: ${{ parameters.nameSuffix }}
+      isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
+      extraBuildArgs: /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=${{ parameters.buildAOTOnHelix }} /p:RunAOTCompilation=${{ parameters.runAOT }} ${{ parameters.extraBuildArgs }}
+      extraHelixArgs: /p:NeedsToBuildWasmAppsOnHelix=true ${{ parameters.extraHelixArgs }}
+      alwaysRun: ${{ parameters.alwaysRun }}
+      runSmokeOnlyArg: $(_runSmokeTestsOnlyArg)
+      shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
+      scenarios:
+        - WasmTestOnBrowser
diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -187,6 +187,6 @@ jobs:
 
     # WebAssembly windows
     - ${{ if eq(parameters.platform, 'Browser_wasm_win') }}:
-      - (Windows.Amd64.Server2022.Open)windows.amd64.server2022.open@mcr.microsoft.com/dotnet-buildtools/prereqs:windowsservercore-ltsc2022-helix-webassembly-20220317203903-1ad56e8
+      - (Windows.Amd64.Server2022.Open)windows.amd64.server2022.open@mcr.microsoft.com/dotnet-buildtools/prereqs:windowsservercore-ltsc2022-helix-webassembly-20220620175048-bf70060
 
     ${{ insert }}: ${{ parameters.jobParameters }}
@@ -57,14 +57,24 @@ jobs:
     parameters:
       platforms:
         - Browser_wasm
-        - Browser_wasm_win
       # Don't run for rolling builds, as this is covered
       alwaysRun: ${{ parameters.isWasmOnlyBuild }}
       scenarios:
         - normal
         - WasmTestOnBrowser
         - WasmTestOnNodeJs
 
+  # Library tests - Windows
+  - template: /eng/pipelines/common/templates/wasm-library-tests.yml
+    parameters:
+      platforms:
+        - Browser_wasm_win
+      # Don't run for rolling builds, as this is covered
+      alwaysRun: ${{ parameters.isWasmOnlyBuild }}
+      scenarios:
+        - WasmTestOnBrowser
+        - WasmTestOnNodeJs
+
   # Library tests with full threading 
   - template: /eng/pipelines/common/templates/wasm-library-tests.yml
     parameters:

diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml
@@ -66,7 +66,6 @@ jobs:
       - Browser_wasm_win
     alwaysRun: ${{ variables.isRollingBuild }}
     scenarios:
-      - normal
       - WasmTestOnBrowser
 
 # AOT Library tests

diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedFile.CreateFromFile.Tests.cs b/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedFile.CreateFromFile.Tests.cs
@@ -835,6 +835,7 @@ public void FileSizeExpandsToCapacity()
         /// <summary>
         /// Test the exceptional behavior when attempting to create a map so large it's not supported.
         /// </summary>
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/51375", TestPlatforms.Browser)]
         [SkipOnPlatform(TestPlatforms.OSX, "Because of the file-based backing, OS X pops up a warning dialog about being out-of-space (even though we clean up immediately)")]
         [Fact]
         public void TooLargeCapacity()

diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedFile.CreateNew.Tests.cs b/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedFile.CreateNew.Tests.cs
@@ -103,6 +103,7 @@ public void TooLargeCapacity_Windows()
         /// <summary>
         /// Test the exceptional behavior when attempting to create a map so large it's not supported.
         /// </summary>
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/51375", TestPlatforms.Browser)]
         [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.OSX)] // Because of the file-based backing, OS X pops up a warning dialog about being out-of-space (even though we clean up immediately)
         [Fact]
         public void TooLargeCapacity_Unix()

diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs
@@ -31,6 +31,7 @@ public abstract class DiagnosticsTest : HttpClientHandlerTestBase
         public DiagnosticsTest(ITestOutputHelper output) : base(output) { }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/71877", TestPlatforms.Browser)]
         public void EventSource_ExistsWithCorrectId()
         {
             Type esType = typeof(HttpClient).Assembly.GetType("System.Net.NetEventSource", throwOnError: true, ignoreCase: false);

diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/ILLink.Descriptor.xml b/src/libraries/System.Net.Http/tests/FunctionalTests/ILLink.Descriptor.xml
@@ -0,0 +1,8 @@
+<linker>
+  <assembly fullname="System.Net.Http">
+    <type fullname="System.Net.Http.SocketsHttpHandler" />
+  </assembly>
+  <assembly fullname="System.Net.Http.Functional.Tests">
+    <type fullname="System.Net.Http.Functional.Tests.SocketsHttpHandler_Http2KeepAlivePing_Test" />
+  </assembly>
+</linker>
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
@@ -34,6 +34,8 @@
     <NodeNpmModule Include="ws" Alias="WebSocket" />
     <NodeNpmModule Include="node-fetch" />
     <NodeNpmModule Include="node-abort-controller" />
+
+    <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptor.xml" Condition="'$(TargetOS)' == 'Browser'" />
   </ItemGroup>
 
   <Import Condition="'$(TargetOS)' == 'Browser'" Project="$(CommonTestPath)System/Net/Prerequisites/LocalEchoServer.props" />

@@ -22,7 +22,6 @@
     <_workItemTimeout Condition="'$(NeedsToBuildWasmAppsOnHelix)' == 'true'">01:00:00</_workItemTimeout>
     <_workItemTimeout Condition="'$(Scenario)' == 'WasmDebuggerTests'">01:00:00</_workItemTimeout>
     <_workItemTimeout Condition="'$(Scenario)' == 'WasmDebuggerTests' and '$(BrowserHost)' == 'windows'">01:30:00</_workItemTimeout>
-    <_workItemTimeout Condition="'$(Scenario)' == 'WasmTestOnBrowser' and '$(BrowserHost)' == 'windows'">00:45:00</_workItemTimeout>
 
     <WasmBuildTargetsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasm', 'build'))</WasmBuildTargetsDir>
     <TestEchoMiddleware>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'NetCoreServer', '$(Configuration)', '$(AspNetCoreAppCurrent)'))</TestEchoMiddleware>

@@ -234,6 +234,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
   set(HOST_BROWSER 1)
   add_definitions(-DNO_GLOBALIZATION_SHIM)
   add_definitions(-D_THREAD_SAFE)
+  add_compile_options(-Wno-strict-prototypes)
+  add_compile_options(-Wno-unused-but-set-variable)
   set(DISABLE_EXECUTABLES 1)
   # FIXME: Is there a cmake option for this ?
   set(DISABLE_SHARED_LIBS 1)

@@ -1 +1 @@
-3.1.7
+3.1.12
@@ -139,6 +139,9 @@
       <_EmccLinkFlags Include="-s MODULARIZE=1"/>
       <_EmccLinkFlags Include="-Wl,--allow-undefined"/>
       <_EmccLinkFlags Include="-s ENVIRONMENT=&quot;web,webview,worker,node,shell&quot;" />
+      <!-- remove -Wno-limited-postlink-optimizations once below issue is fixed
+           active issue: https://github.com/emscripten-core/emscripten/pull/16727 -->
+      <_EmccLinkFlags Include="-Wno-limited-postlink-optimizations"/>
     </ItemGroup>
 
     <ItemGroup Condition="'$(MonoWasmThreads)' == 'true'">

diff --git a/src/native/libs/CMakeLists.txt b/src/native/libs/CMakeLists.txt
@@ -150,6 +150,7 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER)
         add_compile_options(-Wno-typedef-redefinition)
         add_compile_options(-Wno-c11-extensions)
         add_compile_options(-Wno-thread-safety-analysis)
+        add_compile_options(-Wno-strict-prototypes)
     endif ()
 
     add_subdirectory(System.Native)

diff --git a/src/native/libs/System.IO.Compression.Native/CMakeLists.txt b/src/native/libs/System.IO.Compression.Native/CMakeLists.txt
@@ -38,6 +38,10 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER)
     # Disable implicit fallthrough warning for Brotli
     set(FLAGS -Wno-implicit-fallthrough)
 
+    if (CMAKE_C_COMPILER_ID STREQUAL Clang)
+        add_compile_options(-Wno-strict-prototypes)
+    endif ()
+
     # Delete this supression once brotli is upgraded to vNext (current latest v1.0.9
     # does not contain upstream fix: https://github.com/google/brotli/commit/0a3944c)
     set(FLAGS "${FLAGS} -Wno-vla-parameter")