From 523063d9cf16375731685b9c90d886eee3fe6623 Mon Sep 17 00:00:00 2001
From: David <github.site@torick.net>
Date: Fri, 17 Jan 2025 09:35:59 -0500
Subject: [PATCH 1/3] fix(devSrv): Remove usage of the deprecated
 RemoteControl.config file (cause mis config if a stale file reminas on the
 disk)

---
 .../Uno.WinUI.DevServer.targets               | 24 ++++---------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/Uno.UI.RemoteControl/buildTransitive/Uno.WinUI.DevServer.targets b/src/Uno.UI.RemoteControl/buildTransitive/Uno.WinUI.DevServer.targets
index 2a33b6875fa8..2953bc45687a 100644
--- a/src/Uno.UI.RemoteControl/buildTransitive/Uno.WinUI.DevServer.targets
+++ b/src/Uno.UI.RemoteControl/buildTransitive/Uno.WinUI.DevServer.targets
@@ -52,27 +52,11 @@
 
 	<Target Name="InjectRemoteControlHost"
 			BeforeTargets="BeforeBuild"
-			Condition="exists('$(IntermediateOutputPath)\RemoteControlHost.config') and '$(BuildingInsideVisualStudio)'!='true'">
-
-		<ItemGroup>
-			<WasmShellMonoEnvironment Include="DOTNET_MODIFIABLE_ASSEMBLIES" Value="debug" />
-		</ItemGroup>
-
-		<ReadLinesFromFile File="$(IntermediateOutputPath)\RemoteControlHost.config" >
-			<Output TaskParameter="Lines" ItemName="_RemoteControlHostContent"/>
-		</ReadLinesFromFile>
-
-		<ItemGroup>
-			<FileWrites Include="$(IntermediateOutputPath)\RemoteControlHost.config" />
-		</ItemGroup>
-
-		<CreateProperty
-			Value="@(_RemoteControlHostContent)">
-			<Output
-				TaskParameter="Value"
-				PropertyName="UnoRemoteControlHost" />
-		</CreateProperty>
+			Condition="exists('$(IntermediateOutputPath)\RemoteControlHost.config') and '$(BuildingInsideVisualStudio)'!='true' and '$(Configuration)'=='Debug'">
 
+		<Warning
+			Text="The version of uno's extension installed on your IDE is obsolete, please update to the latest version.
+				  If error persists, try to delete obj folder and rebuild your solution." />
 	</Target>
 
 </Project>

From d3cc24da87c78173a4a9ec03ce3c74b1fcc6be94 Mon Sep 17 00:00:00 2001
From: David <github.site@torick.net>
Date: Fri, 17 Jan 2025 11:07:26 -0500
Subject: [PATCH 2/3] chore: Restore HR tests

---
 .../MetadataUpdateTests/Given_HotReloadService.cs            | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Given_HotReloadService.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Given_HotReloadService.cs
index 41e01622bbcc..811830d76d7b 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Given_HotReloadService.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Given_HotReloadService.cs
@@ -11,11 +11,6 @@ public class Given_HotReloadService
 {
 	[TestMethod]
 	[DynamicData(nameof(GetScenarios), DynamicDataSourceType.Method)]
-	// Failed	HR	Uno.UI.SourceGenerators.Tests.MetadataUpdateTests.Given_HotReloadService.HR
-	// Assert.AreEqual failed.
-	// Expected:<0>. Actual:<1>.
-	// Diagnostics: warning CS1701: Assuming assembly reference 'System.ObjectModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' used by 'Uno.UI' matches identity 'System.ObjectModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' of 'System.ObjectModel', you may need to supply runtime policy, expected 	
-	[Ignore("Needs investigation - tracked by https://github.com/unoplatform/uno/issues/19255")]
 	public async Task HR(string name, Scenario? scenario, Project[]? projects)
 	{
 		if (scenario != null)

From 220cee13839b6e35eff5014dda0f026d5f4cf08c Mon Sep 17 00:00:00 2001
From: David <github.site@torick.net>
Date: Fri, 17 Jan 2025 14:17:13 -0500
Subject: [PATCH 3/3] fix(test): Ignore CS1701 (linked to move to net9)

---
 .../HotReloadWorkspaceProvider.cs             | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdates/HotReloadWorkspaceProvider.cs b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdates/HotReloadWorkspaceProvider.cs
index 52f6e42276e2..2b6fd97f06e5 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdates/HotReloadWorkspaceProvider.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdates/HotReloadWorkspaceProvider.cs
@@ -223,21 +223,22 @@ public async Task Initialize(CancellationToken ct)
 		foreach (var projectName in EnumerateProjects())
 		{
 			var projectInfo = ProjectInfo.Create(
-							ProjectId.CreateNewId(),
-							VersionStamp.Default,
-							name: projectName,
-							assemblyName: projectName,
-							language: LanguageNames.CSharp,
-							filePath: Path.Combine(_baseWorkFolder, projectName + ".csproj"),
-							outputFilePath: _baseWorkFolder,
-							metadataReferences: references,
-							compilationOptions: new CSharpCompilationOptions(
-								OutputKind.DynamicallyLinkedLibrary,
-								optimizationLevel: OptimizationLevel.Debug,
-								allowUnsafe: true,
-								nullableContextOptions: NullableContextOptions.Enable,
-								assemblyIdentityComparer: DesktopAssemblyIdentityComparer.Default),
-							analyzerReferences: [generatorReference]);
+				ProjectId.CreateNewId(),
+				VersionStamp.Default,
+				name: projectName,
+				assemblyName: projectName,
+				language: LanguageNames.CSharp,
+				filePath: Path.Combine(_baseWorkFolder, projectName + ".csproj"),
+				outputFilePath: _baseWorkFolder,
+				metadataReferences: references,
+				compilationOptions: new CSharpCompilationOptions(
+						OutputKind.DynamicallyLinkedLibrary,
+						optimizationLevel: OptimizationLevel.Debug,
+						allowUnsafe: true,
+						nullableContextOptions: NullableContextOptions.Enable,
+						assemblyIdentityComparer: DesktopAssemblyIdentityComparer.Default)
+					.WithSpecificDiagnosticOptions([new("CS1701", ReportDiagnostic.Suppress)]), // Assuming assembly reference 'System.ObjectModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' used by 'Uno.UI' matches identity 'System.ObjectModel, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' of 'System.ObjectModel', you may need to supply runtime policy, expected
+				analyzerReferences: [generatorReference]);
 
 			projectInfo = projectInfo
 				.WithCompilationOutputInfo(