Fix ILVerification.Tests project (#5471)

* Use correct name to fetch embedded resource

* Fix the test project

* Use GetTypeInfo().Assembly

4 files changed, 15 insertions, 8 deletions

diff --git a/src/ILVerification/src/AssemblyInfo.cs b/src/ILVerification/src/AssemblyInfo.cs
index 2942fd990..cd0ba8baa 100644
--- a/src/ILVerification/src/AssemblyInfo.cs
+++ b/src/ILVerification/src/AssemblyInfo.cs
@@ -1,4 +1,4 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("ILVerification.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100314e026e409db99b50d61628136c49095e67f782a3032832cfe1e61ba2af8264d2cf7d9228bdf611c1027f61b0ca4c87ee1c248cd58241a695520ba78e76d1c672c2b597cfa0ab4526dcae2b5b6f36936c126e59ada3500d656f3424826d0dab452ea407039d2846cf0e4820905eee537fe904a86097b5b2f3aaae000fc08fc3")]
+[assembly: InternalsVisibleTo("ILVerification.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]
 [assembly: InternalsVisibleTo("ILVerify, PublicKey=0024000004800000940000000602000000240000525341310004000001000100314e026e409db99b50d61628136c49095e67f782a3032832cfe1e61ba2af8264d2cf7d9228bdf611c1027f61b0ca4c87ee1c248cd58241a695520ba78e76d1c672c2b597cfa0ab4526dcae2b5b6f36936c126e59ada3500d656f3424826d0dab452ea407039d2846cf0e4820905eee537fe904a86097b5b2f3aaae000fc08fc3")]
diff --git a/src/ILVerification/tests/ILMethodTester.cs b/src/ILVerification/tests/ILMethodTester.cs
index c3f35f19c..eb92c3dcb 100644
--- a/src/ILVerification/tests/ILMethodTester.cs
+++ b/src/ILVerification/tests/ILMethodTester.cs
@@ -6,10 +6,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection.Metadata;
 using System.Reflection.Metadata.Ecma335;
+using ILVerify;
 using Internal.TypeSystem.Ecma;
 using Xunit;
 
-namespace ILVerify.Tests
+namespace ILVerification.Tests
 {
     public class ILMethodTester
     {
@@ -48,7 +49,7 @@ namespace ILVerify.Tests
                 foreach (var item in invalidIL.ExpectedVerifierErrors)
                 {
                     var actual = results.Select(e => e.ToString());
-                    Assert.True(results.Where(r => r.Error.Code == item).Count() > 0, $"Actual errors where: {string.Join(',', actual)}");
+                    Assert.True(results.Where(r => r.Error.Code == item).Count() > 0, $"Actual errors where: {string.Join(",", actual)}");
                 }
             }
         }
diff --git a/src/ILVerification/tests/ILVerification.Tests.csproj b/src/ILVerification/tests/ILVerification.Tests.csproj
index 297f5180d..4d5f17abf 100644
--- a/src/ILVerification/tests/ILVerification.Tests.csproj
+++ b/src/ILVerification/tests/ILVerification.Tests.csproj
@@ -3,16 +3,21 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
+    <TargetFramework>netstandard1.5</TargetFramework>
 
     <IsPackable>false</IsPackable>
-    <AssemblyKey></AssemblyKey>
-    <AssemblyOriginatorKeyFile>..\StrongNameKeys\ILVerify.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Include="ILMethodTester.cs" />
+    <Compile Include="TestDataLoader.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170427-09" />
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ILVerification/tests/TestDataLoader.cs b/src/ILVerification/tests/TestDataLoader.cs
index ed22d1b1d..91a1195f8 100644
--- a/src/ILVerification/tests/TestDataLoader.cs
+++ b/src/ILVerification/tests/TestDataLoader.cs
@@ -10,12 +10,13 @@ using System.Reflection.Metadata;
 using System.Reflection.Metadata.Ecma335;
 using System.Reflection.PortableExecutable;
 using System.Text;
+using ILVerify;
 using Internal.TypeSystem.Ecma;
 using Newtonsoft.Json;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace ILVerify.Tests
+namespace ILVerification.Tests
 {
     /// <summary>
     /// Parses the methods in the test assemblies. 
@@ -169,10 +170,10 @@ namespace ILVerify.Tests
                 simpleNameToPathMap.Add(Path.GetFileNameWithoutExtension(fileName), TESTASSEMBLYPATH + fileName);
             }
 
-            Assembly coreAssembly = typeof(object).Assembly;
+            Assembly coreAssembly = typeof(object).GetTypeInfo().Assembly;
             simpleNameToPathMap.Add(coreAssembly.GetName().Name, coreAssembly.Location);
 
-            Assembly systemRuntime = Assembly.Load("System.Runtime");
+            Assembly systemRuntime = Assembly.Load(new AssemblyName("System.Runtime"));
             simpleNameToPathMap.Add(systemRuntime.GetName().Name, systemRuntime.Location);
 
             var resolver = new TestResolver(simpleNameToPathMap);