Fix Mono.Linker.Tests build (#102102)

And ensure changes to ProjectReferences trigger linker tests
dotnet · May 11, 2024 · 31527d1 · 31527d1
1 parent dc98263
commit 31527d1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml
@@ -162,6 +162,8 @@ jobs:
     - subset: tools_illink
       include:
       - src/tools/illink/*
+      - src/coreclr/tools/aot/ILCompiler.DependencyAnalysisFramework/*
+      - src/coreclr/tools/ILVerification/*
       - global.json
 
     - subset: tools_cdacreader

diff --git a/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ILVerification/ILVerifier.cs b/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ILVerification/ILVerifier.cs
@@ -33,7 +33,7 @@ public ILVerifier (NPath[] searchDirectories, string systemModuleName)
 				IncludeMetadataTokensInErrorMessages = true
 			});
 
-		_verifier.SetSystemModuleName (new AssemblyName (systemModuleName));
+		_verifier.SetSystemModuleName (new AssemblyNameInfo (systemModuleName));
 	}
 
 	public ILVerifierResult[] VerifyByName (string assemblyName)
@@ -132,10 +132,10 @@ bool TryLoadAssemblyFromFolder (string assemblyName, NPath folder, [NotNullWhen
 		return null;
 	}
 
-	PEReader? IResolver.ResolveAssembly (AssemblyName assemblyName)
+	PEReader? IResolver.ResolveAssembly (AssemblyNameInfo assemblyName)
 		=> Resolve (assemblyName.Name ?? assemblyName.FullName);
 
-	PEReader? IResolver.ResolveModule (AssemblyName referencingModule, string fileName)
+	PEReader? IResolver.ResolveModule (AssemblyNameInfo referencingModule, string fileName)
 		=> Resolve (Path.GetFileNameWithoutExtension (fileName));
 
 	public void Dispose ()

diff --git a/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ILVerifier.cs b/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ILVerifier.cs
@@ -7,6 +7,7 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Reflection.Metadata;
 using System.Reflection.PortableExecutable;
 using System.Runtime.Loader;
 using ILVerify;
@@ -42,7 +43,7 @@ public ILVerifier (NPath assemblyPath)
 					SanityChecks = true,
 					IncludeMetadataTokensInErrorMessages = true
 				});
-			_verifier.SetSystemModuleName (new AssemblyName ("mscorlib"));
+			_verifier.SetSystemModuleName (new AssemblyNameInfo ("mscorlib"));
 
 			var allResults = _verifier.Verify (Resolve (assemblyName))
 				?? Enumerable.Empty<VerificationResult> ();
@@ -118,10 +119,10 @@ bool TryLoadAssemblyFromFolder (string assemblyName, NPath folder, [NotNullWhen
 			return null;
 		}
 
-		PEReader? ILVerify.IResolver.ResolveAssembly (AssemblyName assemblyName)
+		PEReader? ILVerify.IResolver.ResolveAssembly (AssemblyNameInfo assemblyName)
 			=> Resolve (assemblyName.Name ?? assemblyName.FullName);
 
-		PEReader? ILVerify.IResolver.ResolveModule (AssemblyName referencingModule, string fileName)
+		PEReader? ILVerify.IResolver.ResolveModule (AssemblyNameInfo referencingAssembly, string fileName)
 			=> Resolve (Path.GetFileNameWithoutExtension (fileName));
 
 		public static string GetErrorMessage (VerificationResult result)