Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Mono.Linker.Tests build #102102

Merged
merged 1 commit into from
May 11, 2024
Merged

Fix Mono.Linker.Tests build #102102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions eng/pipelines/common/evaluate-default-paths.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ILVerification/ILVerifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 ()
Expand Down
7 changes: 4 additions & 3 deletions src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ILVerifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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> ();
Expand Down Expand Up @@ -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)
Expand Down