Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion eng/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
<PackageVersion Include="Microsoft.DiaSymReader.Converter" Version="1.1.0-beta2-22302-02" />
<PackageVersion Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta2-22302-02" />
<PackageVersion Include="Microsoft.Metadata.Visualizer" Version="1.0.0-beta3.21075.2" />
<PackageVersion Include="Microsoft.ILVerification" Version="8.0.0-rtm.23523.3" />
<PackageVersion Include="Microsoft.ILVerification" Version="9.0.7" />
<PackageVersion Include="Microsoft.NETCore.Platforms" Version="5.0.0" />
<PackageVersion Include="Microsoft.VisualStudio.Cache" Version="17.3.26-alpha" />
<PackageVersion Include="Microsoft.VisualStudio.Diagnostics.Measurement" Version="17.9.36343-preview.3" />
Expand Down
6 changes: 3 additions & 3 deletions src/Compilers/Test/Core/CompilationVerifier.cs
Original file line number Diff line number Diff line change
Expand Up @@ -400,13 +400,13 @@ internal Resolver(Dictionary<string, PEReader> readersByName)
_readersByName = readersByName;
}

public PEReader ResolveAssembly(AssemblyName assemblyName)
public PEReader ResolveAssembly(AssemblyNameInfo assemblyName)
{
Debug.Assert(assemblyName.Name is not null);
return Resolve(assemblyName.Name);
}

public PEReader ResolveModule(AssemblyName referencingAssembly, string fileName)
public PEReader ResolveModule(AssemblyNameInfo referencingAssembly, string fileName)
{
throw new NotImplementedException();
}
Expand Down Expand Up @@ -489,7 +489,7 @@ internal static void ILVerify(Verification verification, ModuleData mainModule,
int errorCount = 0;
try
{
verifier.SetSystemModuleName(new AssemblyName(corlibName));
verifier.SetSystemModuleName(AssemblyNameInfo.Parse(corlibName));
result = verifier.Verify(mainModule);
errorCount = result.Count();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ End Module
<expected>
</expected>)

' ILVerify: Unexpected type on the stack. { Offset = 232, Found = ref 'int32[][]', Expected = ref '[mscorlib]System.Collections.Generic.IList`1<System.Collections.Generic.IReadOnlyList`1<int32>>' }
CompileAndVerify(compilation,
<![CDATA[
3
Expand All @@ -128,7 +127,7 @@ ProcessReadOnlyList3
ProcessReadOnlyList3
ProcessReadOnlyList3
ProcessReadOnlyListOfObject3
]]>, verify:=Verification.FailsILVerify)
]]>, verify:=Verification.Passes)

End Sub

Expand Down Expand Up @@ -327,7 +326,6 @@ End Module
<expected>
</expected>)

' ILVerify: Unexpected type on the stack. { Offset = 232, Found = ref 'int32[][]', Expected = ref '[mscorlib]System.Collections.Generic.IList`1<System.Collections.Generic.IReadOnlyCollection`1<int32>>' }
CompileAndVerify(compilation,
<![CDATA[
3
Expand All @@ -344,7 +342,7 @@ ProcessReadOnlyCollection3
ProcessReadOnlyCollection3
ProcessReadOnlyCollection3
ProcessReadOnlyCollectionOfObject3
]]>, verify:=Verification.FailsILVerify)
]]>, verify:=Verification.Passes)

End Sub

Expand Down
Loading