Merge pull request #19263 from unoplatform/dev/dr/hrUpdates

chore: Restore HR tests
unoplatform · Jan 23, 2025 · a319a42 · a319a42
2 parents e455335 + 220cee1
commit a319a42
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/...rceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdateTests/Given_HotReloadService.cs b/...rceGenerators/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)

diff --git a/...rceGenerators/Uno.UI.SourceGenerators.Tests/MetadataUpdates/HotReloadWorkspaceProvider.cs b/...rceGenerators/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(