Merge branch 'main' into wasm_legacy_interop

Author: pavelsavara

.github/workflows/runtime-sync.yml

@@ -47,7 +47,7 @@ jobs:
         mkdir ..\artifacts
         git status > ..\artifacts\status.txt
         git diff > ..\artifacts\diff.txt
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: results
         path: artifacts

eng/Version.Details.xml

@@ -43,6 +43,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant
 
     <!-- Optimize the framework using the crossgen2 tool. Crossgen2 is not currently supported on s390x or ppc64le or armv6 or loongarch64. -->
     <CrossgenOutput Condition=" '$(TargetArchitecture)' == 's390x' OR '$(TargetArchitecture)' == 'armv6' OR '$(TargetArchitecture)' == 'ppc64le' OR '$(TargetArchitecture)' == 'loongarch64' ">false</CrossgenOutput>
+    <!-- VMR doesn't produce valid crossgen for the host/build machine https://github.com/dotnet/source-build/issues/3793 -->
+    <CrossgenOutput Condition=" '$(DotnetBuildVertical)' == 'true' AND '$(Crossbuild)' == 'true' ">false</CrossgenOutput>
     <CrossgenOutput Condition=" '$(CrossgenOutput)' == '' AND '$(Configuration)' != 'Debug' ">true</CrossgenOutput>
 
     <!-- Produce crossgen2 profiling symbols (.ni.pdb or .r2rmap files). -->

eng/Versions.props

@@ -8,5 +8,6 @@ public enum RuntimeArchitecture
     arm64,
     x64,
     x86,
-    ppc64le //Power Architecture
+    ppc64le, //Power Architecture
+    s390x
 }

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

@@ -17,6 +17,7 @@ public static RuntimeArchitecture Current
                 Architecture.X64 => RuntimeArchitecture.x64,
                 Architecture.X86 => RuntimeArchitecture.x86,
                 Architecture.Ppc64le => RuntimeArchitecture.ppc64le,
+                Architecture.S390x => RuntimeArchitecture.s390x,
                 _ => throw new NotImplementedException($"Unknown RuntimeInformation.OSArchitecture: {RuntimeInformation.OSArchitecture.ToString()}"),
             };
         }

src/Hosting/Server.IntegrationTesting/src/Common/RuntimeArchitecture.cs

@@ -9,6 +9,7 @@ namespace Microsoft.AspNetCore.Identity.Data;
 [JsonSerializable(typeof(LoginRequest))]
 [JsonSerializable(typeof(RefreshRequest))]
 [JsonSerializable(typeof(ResetPasswordRequest))]
+[JsonSerializable(typeof(ForgotPasswordRequest))]
 [JsonSerializable(typeof(ResendConfirmationEmailRequest))]
 [JsonSerializable(typeof(InfoRequest))]
 [JsonSerializable(typeof(InfoResponse))]

src/Hosting/Server.IntegrationTesting/src/Common/RuntimeArchitectures.cs

@@ -21,12 +21,6 @@ FILE_WATCHER::FILE_WATCHER() :
         FALSE,    // not set
         nullptr); // name
 
-    m_pShutdownEvent = CreateEvent(
-        nullptr,  // default security attributes
-        TRUE,     // manual reset event
-        FALSE,    // not set
-        nullptr); // name
-
     // Use of TerminateThread for the file watcher thread was eliminated in favor of an event-based
     // approach. Out of an abundance of caution, we are temporarily adding an environment variable
     // to allow falling back to TerminateThread usage. If all goes well, this will be removed in a
@@ -175,19 +169,8 @@ Win32 error
     LOG_INFO(L"Starting file watcher thread");
     DBG_ASSERT(pFileMonitor != nullptr);
 
-    HANDLE events[2] = { pFileMonitor->m_hCompletionPort, pFileMonitor->m_pShutdownEvent };
-
-    DWORD dwEvent = 0;
     while (true)
     {
-        // Wait for either a change notification or a shutdown event.
-        dwEvent = WaitForMultipleObjects(ARRAYSIZE(events), events, FALSE, INFINITE) - WAIT_OBJECT_0;
-
-        if (dwEvent == 1)
-        {
-            // Shutdown event.
-            break;
-        }
 
         DWORD       cbCompletion = 0;
         OVERLAPPED* pOverlapped = nullptr;
@@ -203,6 +186,11 @@ Win32 error
         DBG_ASSERT(success);
         (void)success;
 
+        if (completionKey == FILE_WATCHER_SHUTDOWN_KEY)
+        {
+            break;
+        }
+
         DBG_ASSERT(pOverlapped != nullptr);
         if (pOverlapped != nullptr)
         {
@@ -469,7 +457,7 @@ FILE_WATCHER::StopMonitor()
     LOG_INFO(L"Stopping file watching.");
 
     // Signal the file watcher thread to exit
-    SetEvent(m_pShutdownEvent);
+    PostQueuedCompletionStatus(m_hCompletionPort, 0, FILE_WATCHER_SHUTDOWN_KEY, NULL);
     WaitForWatcherThreadExit();
 
     if (m_fShadowCopyEnabled)

src/Identity/Core/src/Data/IdentityEndpointsJsonSerializerContext.cs

@@ -60,7 +60,6 @@ class FILE_WATCHER{
     HandleWrapper<NullHandleTraits>               m_hChangeNotificationThread;
     HandleWrapper<NullHandleTraits>               _hDirectory;
     HandleWrapper<NullHandleTraits>               m_pDoneCopyEvent;
-    HandleWrapper<NullHandleTraits>               m_pShutdownEvent;
     std::atomic_bool        m_fThreadExit;
     STTIMER                 m_Timer;
     SRWLOCK                 m_copyLock{};

src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp

@@ -10,6 +10,7 @@ namespace Microsoft.AspNetCore.Http.Connections;
 /// </summary>
 public class ConnectionOptionsSetup : IConfigureOptions<ConnectionOptions>
 {
+    // This is a known typo; fixing it would be a breaking change which we don't believe is worth it.
     /// <summary>
     /// Default timeout value for disconnecting idle connections.
     /// </summary>