[9.0.1xx] Update the dotnet/xharness dependency. (#23637)

rolfbjarne · web-flow · commit 3e5be17f7bf9 · 2025-08-19T15:48:24.000+02:00
Updated xharness to the latest build: > darc update-dependencies --id 278914 to get this fix: dotnet/xharness#1423
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -95,9 +95,9 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25262.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25412.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>173a357c9d49136d9b7d49ca2bf9709a68067e19</Sha>
+      <Sha>fe850ca677efa9ed62009b929f55ff59d5e24c0e</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25271.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -12,7 +12,7 @@
     <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
     <MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25213.4</MicrosoftDotNetCecilPackageVersion>
-    <MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.25262.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
+    <MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.25412.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
     <MicrosoftDotNetArcadeSdkPackageVersion>9.0.0-beta.25271.1</MicrosoftDotNetArcadeSdkPackageVersion>
     <!-- Manually updated versions -->
     <Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</Emscriptennet7WorkloadVersion>
diff --git a/tests/xharness/DeviceLogCapturerFactory.cs b/tests/xharness/DeviceLogCapturerFactory.cs
@@ -9,16 +9,9 @@ public interface IDeviceLogCapturerFactory {
 	}
 
 	public class DeviceLogCapturerFactory : IDeviceLogCapturerFactory {
-		readonly IMlaunchProcessManager processManager;
-
-		public DeviceLogCapturerFactory (IMlaunchProcessManager processManager)
-		{
-			this.processManager = processManager ?? throw new ArgumentNullException (nameof (processManager));
-		}
-
 		public IDeviceLogCapturer Create (ILog mainLog, ILog deviceLog, string deviceName)
 		{
-			return new DeviceLogCapturer (processManager, mainLog, deviceLog, deviceName);
+			return new DeviceLogCapturer (mainLog, deviceLog, deviceName);
 		}
 	}
 }
diff --git a/tests/xharness/Harness.cs b/tests/xharness/Harness.cs
@@ -727,7 +727,7 @@ AppRunner CreateAppRunner (TestProject project)
 				new DeviceLoaderFactory (processManager),
 				new CrashSnapshotReporterFactory (processManager),
 				new CaptureLogFactory (),
-				new DeviceLogCapturerFactory (processManager),
+				new DeviceLogCapturerFactory (),
 				new TestReporterFactory (processManager),
 				target,
 				this,
diff --git a/tests/xharness/Jenkins/TestTasks/RunDevice.cs b/tests/xharness/Jenkins/TestTasks/RunDevice.cs
@@ -93,7 +93,7 @@ public async Task RunTestAsync ()
 						new DeviceLoaderFactory (testTask.ProcessManager),
 						new CrashSnapshotReporterFactory (testTask.ProcessManager),
 						new CaptureLogFactory (),
-						new DeviceLogCapturerFactory (testTask.ProcessManager),
+						new DeviceLogCapturerFactory (),
 						new TestReporterFactory (testTask.ProcessManager),
 						testTask.AppRunnerTarget,
 						testTask.Harness,
diff --git a/tests/xharness/Jenkins/TestTasks/RunSimulator.cs b/tests/xharness/Jenkins/TestTasks/RunSimulator.cs
@@ -91,7 +91,7 @@ public async Task SelectSimulatorAsync ()
 				new DeviceLoaderFactory (testTask.ProcessManager),
 				new CrashSnapshotReporterFactory (testTask.ProcessManager),
 				new CaptureLogFactory (),
-				new DeviceLogCapturerFactory (testTask.ProcessManager),
+				new DeviceLogCapturerFactory (),
 				new TestReporterFactory (testTask.ProcessManager),
 				testTask.AppRunnerTarget,
 				testTask.Harness,

Original file line number	Diff line number	Diff line change
`@@ -9,16 +9,9 @@ public interface IDeviceLogCapturerFactory {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`public class DeviceLogCapturerFactory : IDeviceLogCapturerFactory {`
`12`		`- readonly IMlaunchProcessManager processManager;`
`13`		`-`
`14`		`- public DeviceLogCapturerFactory (IMlaunchProcessManager processManager)`
`15`		`- {`
`16`		`- this.processManager = processManager ?? throw new ArgumentNullException (nameof (processManager));`
`17`		`- }`
`18`		`-`
`19`	`12`	`public IDeviceLogCapturer Create (ILog mainLog, ILog deviceLog, string deviceName)`
`20`	`13`	`{`
`21`		`- return new DeviceLogCapturer (processManager, mainLog, deviceLog, deviceName);`
	`14`	`+ return new DeviceLogCapturer (mainLog, deviceLog, deviceName);`
`22`	`15`	`}`
`23`	`16`	`}`
`24`	`17`	`}`