Merge pull request #20622 from unoplatform/mergify/bp/release/stable/6.0/pr-20618

fix: Fix multiple instance of dev-server can be started when re-using VS sinatnce with multiple solutions (backport #20618)

Author: jeromelaban

src/Uno.UI.RemoteControl.VS/DebuggerHelper/ProfilesObserver.cs

@@ -218,6 +218,26 @@ private void ObserveSolutionEvents()
 		_dte.Events.CommandEvents.AfterExecute += _afterExecute;
 	}
 
+	private void UnObserveSolutionEvents()
+	{
+		if (_projectAdded is not null)
+		{
+			_dte.Events.SolutionEvents.ProjectAdded -= _projectAdded;
+		}
+		if (_projectRemoved is not null)
+		{
+			_dte.Events.SolutionEvents.ProjectRemoved -= _projectRemoved;
+		}
+		if (_projectRenamed is not null)
+		{
+			_dte.Events.SolutionEvents.ProjectRenamed -= _projectRenamed;
+		}
+		if (_afterExecute is not null)
+		{
+			_dte.Events.CommandEvents.AfterExecute -= _afterExecute;
+		}
+	}
+
 	private async Task OnUnconfiguredProject_ProjectUnloadingAsync(object? sender, EventArgs args)
 	{
 		await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
@@ -412,6 +432,7 @@ private void EnsureActiveDebugFrameworkServices()
 
 	public void Dispose()
 	{
+		UnObserveSolutionEvents();
 		_projectRuleSubscriptionLink?.Dispose();
 		_isDisposed = true;
 	}

src/Uno.UI.RemoteControl.VS/EntryPoint.cs

@@ -321,47 +321,52 @@ private async Task OnStartupProjectChangedAsync()
 
 	private async Task EnsureServerAsync()
 	{
+		if (_isDisposed || _closing)
+		{
+			return;
+		}
+
 		_debugAction?.Invoke($"Starting server (tid:{Environment.CurrentManagedThreadId})");
 
 		// As Android projects are "library", we cannot filter on "Application" projects.
 		// Instead, we persist the port only in the current startup projects ... and we make sure to re-write it when the startup project changes (cf. OnStartupProjectChangedAsync).
 		const ProjectAttribute persistenceFilter = ProjectAttribute.Startup;
 
-		var persistedPorts = (await _dte
-			.GetProjectUserSettingsAsync(_asyncPackage, RemoteControlServerPortProperty, persistenceFilter))
-			.Distinct(StringComparer.OrdinalIgnoreCase)
-			.Select(str => int.TryParse(str, out var p) ? p : -1)
-			.ToArray();
-		var persistedPort = persistedPorts.FirstOrDefault(p => p > 0);
+		await _devServerGate.WaitAsync();
+		try
+		{
+			var persistedPorts = (await _dte
+				.GetProjectUserSettingsAsync(_asyncPackage, RemoteControlServerPortProperty, persistenceFilter))
+				.Distinct(StringComparer.OrdinalIgnoreCase)
+				.Select(str => int.TryParse(str, out var p) ? p : -1)
+				.ToArray();
+			var persistedPort = persistedPorts.FirstOrDefault(p => p > 0);
 
-		var port = _devServer?.port ?? persistedPort;
-		// Determine if the port configuration is incorrect:
-		// - Either no ports or multiple ports are persisted (`persistedPorts is { Length: 0 or > 1 }`).
-		// - Or the currently used port (`port`) does not match the persisted port (`persistedPort`).
-		var portMisConfigured = persistedPorts is { Length: 0 or > 1 } || port != persistedPort;
+			var port = _devServer?.port ?? persistedPort;
+			// Determine if the port configuration is incorrect:
+			// - Either no ports or multiple ports are persisted (`persistedPorts is { Length: 0 or > 1 }`).
+			// - Or the currently used port (`port`) does not match the persisted port (`persistedPort`).
+			var portMisConfigured = persistedPorts is { Length: 0 or > 1 } || port != persistedPort;
 
-		if (_devServer is { process.HasExited: false })
-		{
-			if (portMisConfigured)
+			if (_devServer is { process.HasExited: false })
 			{
-				_debugAction?.Invoke($"Server already running on port {_devServer?.port}, but port is not configured properly on all projects. Updating it ...");
+				if (portMisConfigured)
+				{
+					_debugAction?.Invoke($"Server already running on port {_devServer?.port}, but port is not configured properly on all projects. Updating it ...");
 
-				// The dev-server is already running, but at least one project is not configured properly
-				// (This can happen when a project is being added to the solution while opened - Reminder: This EnsureServerAsync is invoked each time a project is built)
-				// We make sure to set the current port for **all** projects.
-				await _dte.SetProjectUserSettingsAsync(_asyncPackage, RemoteControlServerPortProperty, port.ToString(CultureInfo.InvariantCulture), persistenceFilter);
-			}
-			else
-			{
-				_debugAction?.Invoke($"Server already running on port {_devServer?.port}");
-			}
+					// The dev-server is already running, but at least one project is not configured properly
+					// (This can happen when a project is being added to the solution while opened - Reminder: This EnsureServerAsync is invoked each time a project is built)
+					// We make sure to set the current port for **all** projects.
+					await _dte.SetProjectUserSettingsAsync(_asyncPackage, RemoteControlServerPortProperty, port.ToString(CultureInfo.InvariantCulture), persistenceFilter);
+				}
+				else
+				{
+					_debugAction?.Invoke($"Server already running on port {_devServer?.port}");
+				}
 
-			return;
-		}
+				return;
+			}
 
-		await _devServerGate.WaitAsync();
-		try
-		{
 			if (EnsureTcpPort(ref port) || portMisConfigured)
 			{
 				// The port has changed, or all application projects does not have the same port number (or is not configured), we update port in *all* user files