Sync main patch 9abfe11d

patches/last_processed_commit.txt

@@ -1 +1 @@
-796cc18ffaaafd5cea525d6231f5a8c93c11c603
+9abfe11d2abd9de09d3a8d933d7ed701ea0518a3

patches/runner-main-sdk8-arm.patch

@@ -44,7 +44,7 @@ index 4acf4943..97d3dd87 100644
                  public static readonly string Node20DeprecationUrl = "https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/";
 
 diff --git a/src/Runner.Common/Runner.Common.csproj b/src/Runner.Common/Runner.Common.csproj
-index 4ed18b2b..e0c88fbc 100644
+index 9c087c87..f6e576b2 100644
 --- a/src/Runner.Common/Runner.Common.csproj
 +++ b/src/Runner.Common/Runner.Common.csproj
 @@ -1,7 +1,7 @@
@@ -146,7 +146,7 @@ index 7b8055b9..584e654a 100644
      }
  }
 diff --git a/src/Runner.Listener/Runner.Listener.csproj b/src/Runner.Listener/Runner.Listener.csproj
-index d2b1060d..d7119171 100644
+index b5325000..7244b10f 100644
 --- a/src/Runner.Listener/Runner.Listener.csproj
 +++ b/src/Runner.Listener/Runner.Listener.csproj
 @@ -1,7 +1,7 @@
@@ -245,7 +245,7 @@ index 8044f091..d1f341ed 100644
                              // Action is still running on node20 (general case)
                              executionContext.Global.DeprecatedNode20Actions?.Add(actionName);
 diff --git a/src/Runner.Worker/Runner.Worker.csproj b/src/Runner.Worker/Runner.Worker.csproj
-index 03290778..efd2b8cd 100644
+index 6a7f36ef..511aa2f5 100644
 --- a/src/Runner.Worker/Runner.Worker.csproj
 +++ b/src/Runner.Worker/Runner.Worker.csproj
 @@ -1,7 +1,7 @@
@@ -258,7 +258,7 @@ index 03290778..efd2b8cd 100644
      <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
      <SelfContained>true</SelfContained>
 diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj
-index 8058f761..90e6cd61 100644
+index 13a8cf7a..de3c3218 100644
 --- a/src/Sdk/Sdk.csproj
 +++ b/src/Sdk/Sdk.csproj
 @@ -1,7 +1,7 @@
@@ -622,4 +622,4 @@ index 5821cb36..70cfe5c2 100644
 +    "version": "9.0.318"
    }
  }
-# From upstream commit: 796cc18ffaaafd5cea525d6231f5a8c93c11c603
+# From upstream commit: 9abfe11d2abd9de09d3a8d933d7ed701ea0518a3

patches/runner-main-sdk8-ppc64le.patch

@@ -127,7 +127,7 @@ index 97273a1a..78f78701 100644
                          throw new NotSupportedException(); // Should never reach here.
                  }
 diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj
-index 8058f761..53f83c36 100644
+index 13a8cf7a..c1a147dd 100644
 --- a/src/Sdk/Sdk.csproj
 +++ b/src/Sdk/Sdk.csproj
 @@ -4,7 +4,7 @@
@@ -284,4 +284,4 @@ index 056a312e..3f9a3679 100644
          <Exec Command="%22$(DesktopMSBuild)%22 Runner.Service/Windows/RunnerService.csproj /p:Configuration=$(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime) /p:OutputPath=%22$(MSBuildProjectDirectory)/../_layout/bin%22" ConsoleToMSBuild="true" Condition="'$(PackageRuntime)' == 'win-x64' Or '$(PackageRuntime)' == 'win-x86' Or '$(PackageRuntime)' == 'win-arm64'" />
      </Target>
 
-# From upstream commit: 796cc18ffaaafd5cea525d6231f5a8c93c11c603
+# From upstream commit: 9abfe11d2abd9de09d3a8d933d7ed701ea0518a3

patches/runner-main-sdk8-s390x.patch

@@ -127,7 +127,7 @@ index 97273a1a..78f78701 100644
                          throw new NotSupportedException(); // Should never reach here.
                  }
 diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj
-index 8058f761..53f83c36 100644
+index 13a8cf7a..c1a147dd 100644
 --- a/src/Sdk/Sdk.csproj
 +++ b/src/Sdk/Sdk.csproj
 @@ -4,7 +4,7 @@
@@ -284,4 +284,4 @@ index 056a312e..3f9a3679 100644
          <Exec Command="%22$(DesktopMSBuild)%22 Runner.Service/Windows/RunnerService.csproj /p:Configuration=$(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime) /p:OutputPath=%22$(MSBuildProjectDirectory)/../_layout/bin%22" ConsoleToMSBuild="true" Condition="'$(PackageRuntime)' == 'win-x64' Or '$(PackageRuntime)' == 'win-x86' Or '$(PackageRuntime)' == 'win-arm64'" />
      </Target>
 
-# From upstream commit: 796cc18ffaaafd5cea525d6231f5a8c93c11c603
+# From upstream commit: 9abfe11d2abd9de09d3a8d933d7ed701ea0518a3

src/Misc/expressionFunc/hashFiles/package.json

@@ -37,7 +37,7 @@
   "devDependencies": {
     "@stylistic/eslint-plugin": "^5.10.0",
     "@types/node": "^22.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.71.1",
+    "@typescript-eslint/eslint-plugin": "^8.71.2",
     "@typescript-eslint/parser": "^8.71.0",
     "@vercel/ncc": "^0.45.0",
     "eslint": "^8.47.0",

src/Runner.Common/Runner.Common.csproj

@@ -17,7 +17,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.11" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.13" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.12" />
     <PackageReference Include="System.Threading.Channels" Version="10.0.10" />
   </ItemGroup>

src/Runner.Listener/Runner.Listener.csproj

@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.11" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.13" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.9" />
   </ItemGroup>
 

src/Runner.Listener/Runner.cs

@@ -442,13 +442,20 @@ private async Task<int> RunAsync(RunnerSettings settings, bool runOnce = false,
                 }
 
                 bool usedMigratedSettings = false;
+                bool allowMessageListenerFallback = true;
 
                 if (migratedSettings != null)
                 {
                     // Try to create session with migrated settings first
                     Trace.Info("Attempting to create session using migrated settings");
                     _listener = GetMessageListener(migratedSettings, isMigratedSettings: true);
 
+                    // We won't fallback to original MessageListener on github.com anymore
+                    if (_listener is BrokerMessageListener && migratedSettings.IsHostedServer)
+                    {
+                        allowMessageListenerFallback = false;
+                    }
+
                     try
                     {
                         CreateSessionResult createSessionResult = await _listener.CreateSessionAsync(HostContext.RunnerShutdownToken);
@@ -458,12 +465,23 @@ private async Task<int> RunAsync(RunnerSettings settings, bool runOnce = false,
                             settings = migratedSettings; // Use migrated settings for the rest of the process
                             usedMigratedSettings = true;
                         }
+                        else if (!allowMessageListenerFallback)
+                        {
+                            if (createSessionResult == CreateSessionResult.SessionConflict)
+                            {
+                                return Constants.Runner.ReturnCode.SessionConflict;
+                            }
+                            else if (createSessionResult == CreateSessionResult.Failure)
+                            {
+                                return Constants.Runner.ReturnCode.TerminatedError;
+                            }
+                        }
                         else
                         {
                             Trace.Warning($"Failed to create session with migrated settings: {createSessionResult}");
                         }
                     }
-                    catch (Exception ex)
+                    catch (Exception ex) when (allowMessageListenerFallback)
                     {
                         Trace.Error($"Exception when creating session with migrated settings: {ex}");
                     }
@@ -688,7 +706,7 @@ private async Task<int> RunAsync(RunnerSettings settings, bool runOnce = false,
                                 else
                                 {
                                     var messageRef = StringUtil.ConvertFromJson<RunnerJobRequestRef>(message.Body);
-                                    
+
                                     // Acknowledge (best-effort)
                                     if (messageRef.ShouldAcknowledge) // Temporary feature flag
                                     {

src/Runner.Worker/Runner.Worker.csproj

@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.11" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.13" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.3" />
     <PackageReference Include="System.Threading.Channels" Version="10.0.10" />
     <PackageReference Include="YamlDotNet.Signed" Version="5.3.0" />

src/Sdk/Sdk.csproj

@@ -24,7 +24,7 @@
         <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
         <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
         <PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.13" />
-        <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.11" />
+        <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.13" />
         <PackageReference Include="Minimatch" Version="2.0.0" />
         <PackageReference Include="YamlDotNet.Signed" Version="5.3.0" />
         <PackageReference Include="System.Net.Http" Version="4.3.4" />