ci: Fix build

Author: carldebilly

src/Uno.UI.RemoteControl.DevServer.Tests/AppLaunch/RealAppLaunchIntegrationTests.cs

@@ -18,7 +18,7 @@ public async Task WhenRealAppBuiltAndRunWithDevServer_RealConnectionEstablished(
 	{
 		// PRE-ARRANGE: Create a real Uno solution file (will contain desktop project)
 		var solution = SolutionHelper!;
-		await solution.CreateSolutionFileAsync();
+		await solution.CreateSolutionFileAsync(copyGlobalJson: false, platforms: "desktop");
 
 		var filePath = Path.Combine(Path.GetTempPath(), GetTestTelemetryFileName("applaunch_app_success"));
 		await using var helper = CreateTelemetryHelperWithExactPath(filePath, solutionPath: solution.SolutionFile, enableIdeChannel: false);
@@ -122,10 +122,11 @@ private async Task<string> BuildAppProjectAsync(SolutionHelper solution, int dev
 
 		// Build the project with devserver configuration so the generators create the right ServerEndpointAttribute
 		// Using MSBuild properties directly to override any .csproj.user or Directory.Build.props values
+		// Explicitly targeting net9.0-desktop to avoid any multi-targeting issues with .NET 10 SDK
 		var buildInfo = new ProcessStartInfo
 		{
 			FileName = "dotnet",
-			Arguments = $"build \"{appProject}\" --configuration Debug --verbosity minimal -p:UnoRemoteControlHost=localhost -p:UnoRemoteControlPort={devServerPort}",
+			Arguments = $"build \"{appProject}\" --configuration Debug --verbosity minimal --framework net9.0-desktop -p:UnoRemoteControlHost=localhost -p:UnoRemoteControlPort={devServerPort}",
 			RedirectStandardOutput = true,
 			RedirectStandardError = true,
 			UseShellExecute = false,

src/Uno.UI.RemoteControl.DevServer.Tests/Helpers/SolutionHelper.cs

@@ -8,16 +8,18 @@ namespace Uno.UI.RemoteControl.DevServer.Tests.Helpers;
 
 public class SolutionHelper : IDisposable
 {
+	private readonly TestContext _testContext;
 	private readonly string _solutionFileName;
 	private readonly string _tempFolder;
 
 	public string TempFolder => _tempFolder;
 	public string SolutionFile => Path.Combine(_tempFolder, _solutionFileName + ".sln");
 
-	private bool isDisposed;
+	private bool _isDisposed;
 
-	public SolutionHelper(string solutionFileName = "MyApp")
+	public SolutionHelper(TestContext testContext, string solutionFileName = "MyApp")
 	{
+		_testContext = testContext;
 		_solutionFileName = solutionFileName;
 		_tempFolder = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
 
@@ -27,17 +29,24 @@ public SolutionHelper(string solutionFileName = "MyApp")
 		}
 	}
 
-	public async Task CreateSolutionFileAsync()
+	public async Task CreateSolutionFileAsync(
+		bool copyGlobalJson = false,
+		string platforms = "wasm,desktop")
 	{
-		if (isDisposed)
+		if (_isDisposed)
 		{
 			throw new ObjectDisposedException(nameof(SolutionHelper));
 		}
 
+		await ShowDotnetVersionAsync();
+
+		var platformArgs = string.Join(" ", platforms.Split(',').Select(p => $"-platforms \"{p.Trim()}\""));
+		var arguments = $"new unoapp -n {_solutionFileName} -o {_tempFolder} -preset \"recommended\" {platformArgs}";
+
 		var startInfo = new ProcessStartInfo
 		{
 			FileName = "dotnet",
-			Arguments = $"new unoapp -n {_solutionFileName} -o {_tempFolder} -preset \"recommended\" -platforms \"wasm\" -platforms \"desktop\"",
+			Arguments = arguments,
 			RedirectStandardOutput = true,
 			RedirectStandardError = true,
 			UseShellExecute = false,
@@ -48,7 +57,45 @@ public async Task CreateSolutionFileAsync()
 		var (exitCode, output) = await ProcessUtil.RunProcessAsync(startInfo);
 		if (exitCode != 0)
 		{
-			throw new InvalidOperationException($"dotnet new unoapp failed with exit code {exitCode} / {output}");
+			throw new InvalidOperationException($"dotnet new unoapp failed with exit code {exitCode} / {output}.\n>dotnet {arguments}");
+		}
+
+		// Optionally copy the global.json from the Uno repo to the temp folder to ensure we use the correct SDK version
+		// This is critical for CI environments where .NET 10 prerelease might be installed
+		if (copyGlobalJson)
+		{
+			CopyGlobalJsonToTempFolder();
+		}
+	}
+
+	private void CopyGlobalJsonToTempFolder()
+	{
+		// Find the global.json in the Uno repo (walking up from the current assembly location)
+		var assemblyLocation = Path.GetDirectoryName(typeof(SolutionHelper).Assembly.Location)!;
+		var currentDir = assemblyLocation;
+		string? globalJsonPath = null;
+
+		// Walk up the directory tree to find global.json
+		while (currentDir != null)
+		{
+			var candidatePath = Path.Combine(currentDir, "global.json");
+			if (File.Exists(candidatePath))
+			{
+				globalJsonPath = candidatePath;
+				break;
+			}
+			currentDir = Path.GetDirectoryName(currentDir);
+		}
+
+		if (globalJsonPath != null)
+		{
+			var targetPath = Path.Combine(_tempFolder, "global.json");
+			File.Copy(globalJsonPath, targetPath, overwrite: true);
+			Console.WriteLine($"[DEBUG_LOG] Copied global.json from {globalJsonPath} to {targetPath}");
+		}
+		else
+		{
+			Console.WriteLine("[DEBUG_LOG] Warning: Could not find global.json in parent directories");
 		}
 	}
 
@@ -129,9 +176,26 @@ public void EnsureUnoTemplatesInstalled()
 		}
 	}
 
+	private async Task ShowDotnetVersionAsync()
+	{
+		var startInfo = new ProcessStartInfo
+		{
+			FileName = "dotnet",
+			Arguments = "--info",
+			RedirectStandardOutput = true,
+			RedirectStandardError = true,
+			UseShellExecute = false,
+			CreateNoWindow = true,
+			WorkingDirectory = _tempFolder,
+		};
+
+		var (exitCode, output) = await ProcessUtil.RunProcessAsync(startInfo);
+		_testContext.WriteLine($"dotnet --info output:\n{output}");
+	}
+
 	public void Dispose()
 	{
-		isDisposed = true;
+		_isDisposed = true;
 
 		// Force delete temp folder
 		Directory.Delete(_tempFolder, true);

src/Uno.UI.RemoteControl.DevServer.Tests/Telemetry/TelemetryTestBase.cs

@@ -38,7 +38,7 @@ private CancellationToken GetTimeoutToken()
 	[TestInitialize]
 	public void TestInitialize()
 	{
-		SolutionHelper = new SolutionHelper();
+		SolutionHelper = new SolutionHelper(TestContext!);
 		SolutionHelper.EnsureUnoTemplatesInstalled();
 	}
 
@@ -65,16 +65,6 @@ protected static void GlobalClassInitialize<T>(TestContext context) where T : cl
 		InitializeLogger<T>();
 	}
 
-	private static void InitializeLogger(Type type)
-	{
-		var loggerFactory = LoggerFactory.Create(builder =>
-		{
-			builder.AddConsole();
-			builder.AddDebug();
-		});
-		Logger = loggerFactory.CreateLogger(type);
-	}
-
 	/// <summary>
 	/// Creates a DevServerTestHelper with telemetry redirection to a temporary file.
 	/// </summary>

src/Uno.UI.RemoteControl.Messaging/IDEChannel/AppLaunchRegisterIdeMessage.cs

@@ -3,7 +3,7 @@ namespace Uno.UI.RemoteControl.Messaging.IdeChannel;
 
 /// <summary>
 /// Message sent by the IDE to indicate that a target application has just been launched.
-/// The dev-server will correlate this registration with a later runtime connection (AppIdentityMessage) using the MVID.
+/// The dev-server will correlate this registration with a later runtime connection (`AppLaunchMessage` with `Step = Connected`) using the MVID, Platform and IsDebug.
 /// </summary>
 /// <param name="Mvid">The MVID (Module Version ID) of the head application assembly.</param>
 /// <param name="Platform">The target platform (case-sensitive, e.g. "Wasm", "Android").</param>

src/Uno.UI.RemoteControl.Server/AppLaunch/ApplicationLaunchMonitor.md

@@ -5,7 +5,7 @@
 - You tell it that an app was launched, then you report when a matching app connects. It matches them 1:1 in launch order and handles timeouts.
 - When a launched application fails to connect, it is reported as a timeout thru the OnTimeout callback.
 - It is thread-safe / Disposable.
-- It used the MVID as the key. This is the _Module Version ID_ of the app (head) assembly, which is unique per build. More info: https://learn.microsoft.com/en-us/dotnet/api/system.reflection.module.moduleversionid
+- It uses a composite key: MVID + Platform + IsDebug. The MVID is the _Module Version ID_ of the app (head) assembly, which is unique per build. More info: https://learn.microsoft.com/en-us/dotnet/api/system.reflection.module.moduleversionid
 
 ## How to use
 ### 1) Create the monitor (optionally with callbacks and a custom timeout):
@@ -54,13 +54,18 @@ When integrated in the dev-server, the monitor emits telemetry events (prefix `u
 
 `latencyMs` is the elapsed time between registration and connection, measured internally. `timeoutSeconds` equals the configured timeout.
 
-## IDE / Runtime Messages
-To enable correlation end-to-end, two messages flow through the system:
+## Integration points (IDE, WebSocket, HTTP)
+The dev-server can receive registration and connection events through multiple channels:
 
-1. IDE → DevServer: `AppLaunchRegisterIdeMessage` (scope: `AppLaunch`) carrying MVID, Platform, IsDebug. Triggers `RegisterLaunch`.
-2. Runtime → DevServer: `AppIdentityMessage` (scope: `RemoteControlServer`) carrying MVID, Platform, IsDebug, automatically sent after WebSocket connection. Triggers `ReportConnection`.
+- IDE → DevServer: `AppLaunchRegisterIdeMessage` (scope: `AppLaunch`) carrying MVID, Platform, IsDebug. Triggers `RegisterLaunch`.
+- Runtime → DevServer over WebSocket (scope: `DevServerChannel`): `AppLaunchMessage` with `Step = Launched`. Triggers `RegisterLaunch`.
+- HTTP GET → DevServer: `GET /applaunch/{mvid}?platform={platform}&isDebug={true|false}`. Triggers `RegisterLaunch`.
 
-If no matching `AppIdentityMessage` arrives before timeout, a timeout event is emitted.
+Connections are reported by the runtime after establishing the WebSocket connection:
+
+- Runtime → DevServer over WebSocket (scope: `DevServerChannel`): `AppLaunchMessage` with `Step = Connected`. Triggers `ReportConnection`.
+
+If no matching `Connected` message arrives before timeout, a timeout event is emitted.
 
 ### Testing / Time control