diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets
index 11c86348e22c2..cefb5e341a494 100644
--- a/src/tests/Directory.Build.targets
+++ b/src/tests/Directory.Build.targets
@@ -35,7 +35,7 @@
true
- Exe
+ Exe
BuildAndRun
SharedLibrary
diff --git a/src/tests/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/AssemblyDependencyResolverTests.cs b/src/tests/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/AssemblyDependencyResolverTests.cs
index bc991d0bce1f1..b0afc606bc127 100644
--- a/src/tests/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/AssemblyDependencyResolverTests.cs
+++ b/src/tests/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/AssemblyDependencyResolverTests.cs
@@ -9,7 +9,7 @@
namespace AssemblyDependencyResolverTests
{
- class AssemblyDependencyResolverTests : TestBase
+ public class AssemblyDependencyResolverTests : TestBase
{
string _componentDirectory;
string _componentAssemblyPath;
@@ -306,7 +306,8 @@ private string CreateMockStandardNativeLibrary(string relativePath, string simpl
relativePath + Path.DirectorySeparatorChar + XPlatformUtils.GetStandardNativeLibraryFileName(simpleName));
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
return TestBase.RunTests(
typeof(AssemblyDependencyResolverTests),
diff --git a/src/tests/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/AssemblyDependencyResolverTests.csproj b/src/tests/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/AssemblyDependencyResolverTests.csproj
index 8f319017729c9..9cb6cb2b095ec 100644
--- a/src/tests/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/AssemblyDependencyResolverTests.csproj
+++ b/src/tests/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/AssemblyDependencyResolverTests.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
true
true
diff --git a/src/tests/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/TestBase.cs b/src/tests/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/TestBase.cs
index 69beddb5839cb..8af8ffc1514ce 100644
--- a/src/tests/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/TestBase.cs
+++ b/src/tests/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/TestBase.cs
@@ -7,7 +7,7 @@
namespace AssemblyDependencyResolverTests
{
- class TestBase
+ public class TestBase
{
protected string TestBasePath { get; private set; }
protected string BinaryBasePath { get; private set; }
diff --git a/src/tests/Loader/AssemblyDependencyResolver/MissingHostPolicyTests/InvalidHostingTest.cs b/src/tests/Loader/AssemblyDependencyResolver/MissingHostPolicyTests/InvalidHostingTest.cs
index 1a213d9689ffa..bf15c2cdafb96 100644
--- a/src/tests/Loader/AssemblyDependencyResolver/MissingHostPolicyTests/InvalidHostingTest.cs
+++ b/src/tests/Loader/AssemblyDependencyResolver/MissingHostPolicyTests/InvalidHostingTest.cs
@@ -7,9 +7,10 @@
namespace AssemblyDependencyResolverTests
{
- class InvalidHostingTest
+ public class InvalidHostingTest
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
try
{
diff --git a/src/tests/Loader/AssemblyDependencyResolver/MissingHostPolicyTests/MissingHostPolicyTests.csproj b/src/tests/Loader/AssemblyDependencyResolver/MissingHostPolicyTests/MissingHostPolicyTests.csproj
index 64c2cd4119e7f..7d064de314ac8 100644
--- a/src/tests/Loader/AssemblyDependencyResolver/MissingHostPolicyTests/MissingHostPolicyTests.csproj
+++ b/src/tests/Loader/AssemblyDependencyResolver/MissingHostPolicyTests/MissingHostPolicyTests.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocals.cs b/src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocals.cs
index 52017327ffaf3..70030c92dff64 100644
--- a/src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocals.cs
+++ b/src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocals.cs
@@ -8,8 +8,9 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Loader;
+using Xunit;
-class Program
+public class Program
{
class TestALC : AssemblyLoadContext
{
@@ -25,7 +26,8 @@ protected override Assembly Load(AssemblyName name)
}
}
- static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
var holdResult = HoldAssembliesAliveThroughByRefFields(out GCHandle gch1, out GCHandle gch2);
if (holdResult != 100)
@@ -90,7 +92,7 @@ private static ReadOnlySpan LoadAssembly(out GCHandle gchToAssembly)
{
var currentALC = AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly());
var alc = new TestALC(currentALC);
- var a = alc.LoadFromAssemblyPath(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Unloaded.dll"));
+ var a = alc.LoadFromAssemblyPath(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "ByRefLocalsUnloaded.dll"));
gchToAssembly = GCHandle.Alloc(a, GCHandleType.WeakTrackResurrection);
var spanAccessor = (IReturnSpan)Activator.CreateInstance(a.GetType("SpanAccessor"));
diff --git a/src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocals.csproj b/src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocals.csproj
index c9953e48e979b..7037f0b4c1d01 100644
--- a/src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocals.csproj
+++ b/src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocals.csproj
@@ -1,10 +1,11 @@
+
+ true
true
- Exe
-
+
diff --git a/src/tests/Loader/CollectibleAssemblies/ByRefLocals/Unloaded.cs b/src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocalsUnloaded.cs
similarity index 100%
rename from src/tests/Loader/CollectibleAssemblies/ByRefLocals/Unloaded.cs
rename to src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocalsUnloaded.cs
diff --git a/src/tests/Loader/CollectibleAssemblies/ByRefLocals/Unloaded.csproj b/src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocalsUnloaded.csproj
similarity index 83%
rename from src/tests/Loader/CollectibleAssemblies/ByRefLocals/Unloaded.csproj
rename to src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocalsUnloaded.csproj
index be28ad33533a1..54ed017983962 100644
--- a/src/tests/Loader/CollectibleAssemblies/ByRefLocals/Unloaded.csproj
+++ b/src/tests/Loader/CollectibleAssemblies/ByRefLocals/ByRefLocalsUnloaded.csproj
@@ -5,6 +5,6 @@
-
+
diff --git a/src/tests/Loader/CollectibleAssemblies/ResolvedFromDifferentContext/ResolvedFromDifferentContext.cs b/src/tests/Loader/CollectibleAssemblies/ResolvedFromDifferentContext/ResolvedFromDifferentContext.cs
index c7469d09f66be..d15e33dc051c4 100644
--- a/src/tests/Loader/CollectibleAssemblies/ResolvedFromDifferentContext/ResolvedFromDifferentContext.cs
+++ b/src/tests/Loader/CollectibleAssemblies/ResolvedFromDifferentContext/ResolvedFromDifferentContext.cs
@@ -14,6 +14,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.IO;
+using Xunit;
class TestAssemblyLoadContext : AssemblyLoadContext
{
@@ -31,7 +32,7 @@ protected override Assembly Load(AssemblyName assemblyName)
{
AssemblyLoadContext alc1 = new AssemblyLoadContext("Dependencies", true);
Console.WriteLine($"Loading TestInterface by alc {alc1} for {(IsCollectible ? "collectible" : "non-collectible")} alc {this}");
- Assembly a = alc1.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("..", "TestInterface", "TestInterface.dll")));
+ Assembly a = alc1.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("TestInterface", "TestInterface.dll")));
interfaceAssemblyRef = new WeakReference(a);
return a;
}
@@ -40,7 +41,7 @@ protected override Assembly Load(AssemblyName assemblyName)
}
}
-class Test
+public class Test
{
static AssemblyLoadContext alc1 = null;
static WeakReference interfaceAssemblyRef = null;
@@ -56,7 +57,7 @@ private static Assembly LoadUsingResolvingEvent(bool collectibleParent)
alc1 = new AssemblyLoadContext("Dependencies", true);
AssemblyLoadContext alc2 = new AssemblyLoadContext("Test1", collectibleParent);
alc2.Resolving += Alc2_Resolving;
- Assembly assembly = alc2.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("..", "TestClass", "TestClass.dll")));
+ Assembly assembly = alc2.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("TestClass", "TestClass.dll")));
Type t = assembly.GetType("TestClass.Class");
Console.WriteLine($"Type {t} obtained");
@@ -76,7 +77,7 @@ private static Assembly Alc2_Resolving(AssemblyLoadContext arg1, AssemblyName ar
if (alc1 != null && arg2.Name == "TestInterface")
{
Console.WriteLine($"Loading TestInterface by alc {alc1} for {(arg1.IsCollectible ? "collectible" : "non-collectible")} alc {arg1}");
- Assembly a = alc1.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("..", "TestInterface", "TestInterface.dll")));
+ Assembly a = alc1.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("TestInterface", "TestInterface.dll")));
interfaceAssemblyRef = new WeakReference(a);
return a;
}
@@ -88,7 +89,7 @@ private static Assembly Alc2_Resolving(AssemblyLoadContext arg1, AssemblyName ar
private static Assembly LoadUsingLoadOverride(bool collectibleParent)
{
TestAssemblyLoadContext alc2 = new TestAssemblyLoadContext("Test2", collectibleParent);
- Assembly assembly = alc2.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("..", "TestClass", "TestClass.dll")));
+ Assembly assembly = alc2.LoadFromAssemblyPath(Test.GetTestAssemblyPath(Path.Join("TestClass", "TestClass.dll")));
Type t = assembly.GetType("TestClass.Class");
@@ -206,7 +207,8 @@ private static int TestFullUnload(TestCase testCase)
return 100;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
int status = 100;
foreach (TestCase testCase in Enum.GetValues(typeof(TestCase)))
diff --git a/src/tests/Loader/CollectibleAssemblies/ResolvedFromDifferentContext/ResolvedFromDifferentContext.csproj b/src/tests/Loader/CollectibleAssemblies/ResolvedFromDifferentContext/ResolvedFromDifferentContext.csproj
index 05911dbc18dd2..d232fb7ec1c7e 100644
--- a/src/tests/Loader/CollectibleAssemblies/ResolvedFromDifferentContext/ResolvedFromDifferentContext.csproj
+++ b/src/tests/Loader/CollectibleAssemblies/ResolvedFromDifferentContext/ResolvedFromDifferentContext.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
true
1
@@ -8,4 +9,21 @@
+
+
+
+
+
+
+
+ $(OutputPath)/../TestClass
+ $(OutputPath)/../TestInterface
+
+
+
+
+
+
+
+
diff --git a/src/tests/Loader/CollectibleAssemblies/Statics/CollectibleStatics.cs b/src/tests/Loader/CollectibleAssemblies/Statics/CollectibleStatics.cs
index b7d188d9739b9..6c1e5560a7e03 100644
--- a/src/tests/Loader/CollectibleAssemblies/Statics/CollectibleStatics.cs
+++ b/src/tests/Loader/CollectibleAssemblies/Statics/CollectibleStatics.cs
@@ -8,8 +8,9 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Loader;
+using Xunit;
-class Program
+public class Program
{
class TestALC : AssemblyLoadContext
{
@@ -25,11 +26,12 @@ protected override Assembly Load(AssemblyName name)
}
}
- static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
var currentALC = AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly());
var alc = new TestALC(currentALC);
- var a = alc.LoadFromAssemblyPath(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Unloaded.dll"));
+ var a = alc.LoadFromAssemblyPath(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "StaticsUnloaded.dll"));
var accessor = (IStaticTest)Activator.CreateInstance(a.GetType("StaticTest"));
accessor.SetStatic(12759, 548739, 5468, 8518, 9995);
diff --git a/src/tests/Loader/CollectibleAssemblies/Statics/CollectibleStatics.csproj b/src/tests/Loader/CollectibleAssemblies/Statics/CollectibleStatics.csproj
index 5d18a39f5aa19..5b63f4f5a1cbd 100644
--- a/src/tests/Loader/CollectibleAssemblies/Statics/CollectibleStatics.csproj
+++ b/src/tests/Loader/CollectibleAssemblies/Statics/CollectibleStatics.csproj
@@ -1,10 +1,11 @@
+
+ true
true
- Exe
-
+
diff --git a/src/tests/Loader/CollectibleAssemblies/Statics/Unloaded.cs b/src/tests/Loader/CollectibleAssemblies/Statics/StaticsUnloaded.cs
similarity index 100%
rename from src/tests/Loader/CollectibleAssemblies/Statics/Unloaded.cs
rename to src/tests/Loader/CollectibleAssemblies/Statics/StaticsUnloaded.cs
diff --git a/src/tests/Loader/CollectibleAssemblies/Statics/Unloaded.csproj b/src/tests/Loader/CollectibleAssemblies/Statics/StaticsUnloaded.csproj
similarity index 84%
rename from src/tests/Loader/CollectibleAssemblies/Statics/Unloaded.csproj
rename to src/tests/Loader/CollectibleAssemblies/Statics/StaticsUnloaded.csproj
index cb77651e9221a..163668109092c 100644
--- a/src/tests/Loader/CollectibleAssemblies/Statics/Unloaded.csproj
+++ b/src/tests/Loader/CollectibleAssemblies/Statics/StaticsUnloaded.csproj
@@ -5,6 +5,6 @@
-
+
diff --git a/src/tests/Loader/ContextualReflection/ContextualReflection.cs b/src/tests/Loader/ContextualReflection/ContextualReflection.cs
index 3ac42f5f44c1f..abbbb9639367a 100644
--- a/src/tests/Loader/ContextualReflection/ContextualReflection.cs
+++ b/src/tests/Loader/ContextualReflection/ContextualReflection.cs
@@ -23,7 +23,7 @@ class MockAssembly : Assembly
public MockAssembly() {}
}
- class Program : IProgram
+ public class Program : IProgram
{
public AssemblyLoadContext alc { get; set; }
public Assembly alcAssembly { get; set; }
@@ -31,15 +31,14 @@ class Program : IProgram
public IProgram alcProgramInstance { get; set; }
public Assembly defaultAssembly { get; set; }
- public static int Main()
+ [Fact]
+ public static void TestEntryPoint()
{
Program program = new Program(isolated:false);
program.RunTests();
Console.WriteLine("Success");
-
- return 100;
}
public Program()
@@ -84,7 +83,7 @@ void VerifyIsolationDefault()
VerifyIsolation();
Assert.Equal(defaultAssembly, Assembly.GetExecutingAssembly());
Assert.Equal(AssemblyLoadContext.Default, AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly()));
- Assert.NotEqual(alcProgramType, typeof(Program));
+ Assert.NotEqual(typeof(Program), alcProgramType);
Assert.NotEqual((object)alcProgramInstance, (object)this);
}
@@ -93,7 +92,7 @@ void VerifyIsolationAlc()
VerifyIsolation();
Assert.Equal(alcAssembly, Assembly.GetExecutingAssembly());
Assert.Equal(alc, AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly()));
- Assert.Equal(alcProgramType, typeof(Program));
+ Assert.Equal(typeof(Program), alcProgramType);
Assert.Equal((object)alcProgramInstance, (object)this);
}
@@ -286,7 +285,7 @@ void VerifyBadContextualReflectionUsage()
try
{
IDisposable defaultScope = AssemblyLoadContext.EnterContextualReflection(null);
- Assert.Equal(null, AssemblyLoadContext.CurrentContextualReflectionContext);
+ Assert.Null(AssemblyLoadContext.CurrentContextualReflectionContext);
throw new InvalidOperationException();
}
@@ -738,7 +737,7 @@ void TestDefineDynamicAssembly(bool collectibleContext, AssemblyBuilderAccess as
AssemblyLoadContext context = AssemblyLoadContext.GetLoadContext(assemblyBuilder);
Assert.Equal(assemblyLoadContext, context);
- Assert.True(assemblyLoadContext.Assemblies.Any(a => AssemblyName.ReferenceMatchesDefinition(a.GetName(), assemblyBuilder.GetName())));
+ Assert.Contains(assemblyLoadContext.Assemblies, a => AssemblyName.ReferenceMatchesDefinition(a.GetName(), assemblyBuilder.GetName()));
}
void TestMockAssemblyThrows()
diff --git a/src/tests/Loader/ContextualReflection/ContextualReflection.csproj b/src/tests/Loader/ContextualReflection/ContextualReflection.csproj
index 35166cd9773fd..4b4a23b21633a 100644
--- a/src/tests/Loader/ContextualReflection/ContextualReflection.csproj
+++ b/src/tests/Loader/ContextualReflection/ContextualReflection.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/CustomAttributes/DynamicObjects.cs b/src/tests/Loader/CustomAttributes/DynamicObjects.cs
index 5b232d83eba3b..3cf3ca6445342 100644
--- a/src/tests/Loader/CustomAttributes/DynamicObjects.cs
+++ b/src/tests/Loader/CustomAttributes/DynamicObjects.cs
@@ -12,18 +12,19 @@
namespace DynamicObjects {
public class M {
public const string ObjectRequiredMessage = "some string";
- public static int Main() {
+ [Fact]
+ public static void TestEntryPoint()
+ {
var instance = createObject();
var attrs = instance.GetType().GetProperty("prop1").GetCustomAttributes();
Assert.True(attrs.Count() == 2);
- Assert.Equal(attrs.ElementAt(0).ToString(), "System.ComponentModel.DataAnnotations.DisplayAttribute");
- Assert.Equal(attrs.ElementAt(1).ToString(), "System.ComponentModel.DataAnnotations.RequiredAttribute");
+ Assert.Equal("System.ComponentModel.DataAnnotations.DisplayAttribute", attrs.ElementAt(0).ToString());
+ Assert.Equal("System.ComponentModel.DataAnnotations.RequiredAttribute", attrs.ElementAt(1).ToString());
Assert.Equal(typeof(RequiredAttribute), attrs.ElementAt(1).GetType());
Assert.Equal(ObjectRequiredMessage, ((RequiredAttribute)attrs.ElementAt(1)).FormatErrorMessage("abc"));
Console.WriteLine("Success");
- return 100;
}
public static object createObject () {
diff --git a/src/tests/Loader/CustomAttributes/DynamicObjects.csproj b/src/tests/Loader/CustomAttributes/DynamicObjects.csproj
index 3e62bfd677e86..9c6fe304c9143 100644
--- a/src/tests/Loader/CustomAttributes/DynamicObjects.csproj
+++ b/src/tests/Loader/CustomAttributes/DynamicObjects.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/Directory.Build.props b/src/tests/Loader/Directory.Build.props
new file mode 100644
index 0000000000000..17e80030ca09d
--- /dev/null
+++ b/src/tests/Loader/Directory.Build.props
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+ true
+ $(NoWarn);xUnit1013
+ false
+
+
diff --git a/src/tests/Loader/Loader.csproj b/src/tests/Loader/Loader.csproj
new file mode 100644
index 0000000000000..afa7b4bc95ba3
--- /dev/null
+++ b/src/tests/Loader/Loader.csproj
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/Loader/NativeLibs/FromNativePaths.cs b/src/tests/Loader/NativeLibs/FromNativePaths.cs
index aba99d41c252c..92cdc026c32b0 100644
--- a/src/tests/Loader/NativeLibs/FromNativePaths.cs
+++ b/src/tests/Loader/NativeLibs/FromNativePaths.cs
@@ -6,6 +6,7 @@
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
+using Xunit;
public class FromNativePaths
{
@@ -117,7 +118,8 @@ private static bool Test()
}
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
return Test() ? 100 : 101;
}
diff --git a/src/tests/Loader/NativeLibs/FromNativePaths.csproj b/src/tests/Loader/NativeLibs/FromNativePaths.csproj
index 4d3443fd8626a..64d8810f29a54 100644
--- a/src/tests/Loader/NativeLibs/FromNativePaths.csproj
+++ b/src/tests/Loader/NativeLibs/FromNativePaths.csproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/Loader/binding/assemblies/assemblybugs/102140/test.cs b/src/tests/Loader/binding/assemblies/assemblybugs/102140/test.cs
index cd96b0d934e25..9ea814383846d 100644
--- a/src/tests/Loader/binding/assemblies/assemblybugs/102140/test.cs
+++ b/src/tests/Loader/binding/assemblies/assemblybugs/102140/test.cs
@@ -2,57 +2,61 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
using System.Reflection;
+using Xunit;
-public class test{
+public class test
+{
+ private static double numtests = 4.0;
- private static double numtests = 4.0;
+ [Fact]
+ public static int TestEntryPoint()
+ {
+ Console.WriteLine("Test1: new AssemblyName(\"server2\")");
+ AssemblyName asmN1 = new AssemblyName("server2");
+ int ret = Check(asmN1);
+ Console.WriteLine("Test2: new AssemblyName(\"server2, Version=0.0.0.0\")");
+ AssemblyName asmN2 = new AssemblyName("server2, Version=0.0.0.0");
+ ret = ret + Check(asmN2);
+ Console.WriteLine("Test3: new AssemblyName(\"server2, Culture=neutral\")");
+ AssemblyName asmN3 = new AssemblyName("server2, Culture=neutral");
+ ret = ret + Check(asmN3);
+ Console.WriteLine("Test4: new AssemblyName(\"server2, Culture=neutral, Version=0.0.0.0\")");
+ AssemblyName asmN4 = new AssemblyName("server2, Culture=neutral, Version=0.0.0.0");
+ ret = ret + Check(asmN4);
+ if(ret/numtests==100.0){
+ Console.WriteLine("All Passed!");
+ return 100;
+ }else{
+ Console.WriteLine("Failed!");
+ return ret;
+ }
+ }
- public static int Main () {
- Console.WriteLine("Test1: new AssemblyName(\"server2\")");
- AssemblyName asmN1 = new AssemblyName("server2");
- int ret = Check(asmN1);
- Console.WriteLine("Test2: new AssemblyName(\"server2, Version=0.0.0.0\")");
- AssemblyName asmN2 = new AssemblyName("server2, Version=0.0.0.0");
- ret = ret + Check(asmN2);
- Console.WriteLine("Test3: new AssemblyName(\"server2, Culture=neutral\")");
- AssemblyName asmN3 = new AssemblyName("server2, Culture=neutral");
- ret = ret + Check(asmN3);
- Console.WriteLine("Test4: new AssemblyName(\"server2, Culture=neutral, Version=0.0.0.0\")");
- AssemblyName asmN4 = new AssemblyName("server2, Culture=neutral, Version=0.0.0.0");
- ret = ret + Check(asmN4);
- if(ret/numtests==100.0){
- Console.WriteLine("All Passed!");
- return 100;
- }else{
- Console.WriteLine("Failed!");
- return ret;
- }
- }
-
- public static int Check(AssemblyName asmN){
- String strVersion = asmN.ToString();
- int index = strVersion.ToLower().IndexOf("version=");
- if(asmN.Version==null){
- if(index==-1){
- Console.WriteLine("Passed: both asmName.ToString() version and asmName.Version are null.");
- return 100;
- }else{
- Console.WriteLine("Failed: asmName.Version != asmName.ToString() Version");
- Console.WriteLine ("\tasmName.Version = \"{0}\"", asmN.Version);
- Console.WriteLine ("\tasmName.ToString() = \"{0}\"", strVersion);
- return 101;
- }
- }else{
- strVersion = strVersion.Substring(index+8,7);
- if(strVersion.Equals(asmN.Version.ToString())){
- Console.WriteLine("Passed: asmName.Version == asmName.ToString() Version");
- return 100;
- }else{
- Console.WriteLine("Failed: asmName.Version != asmName.ToString() Version");
- Console.WriteLine ("\tasmName.Version = \"{0}\"", asmN.Version);
- Console.WriteLine ("\tasmName.ToString() = \"{0}\"", strVersion);
- return 101;
- }
- }
- }
+ public static int Check(AssemblyName asmN)
+ {
+ String strVersion = asmN.ToString();
+ int index = strVersion.ToLower().IndexOf("version=");
+ if(asmN.Version==null){
+ if(index==-1){
+ Console.WriteLine("Passed: both asmName.ToString() version and asmName.Version are null.");
+ return 100;
+ }else{
+ Console.WriteLine("Failed: asmName.Version != asmName.ToString() Version");
+ Console.WriteLine ("\tasmName.Version = \"{0}\"", asmN.Version);
+ Console.WriteLine ("\tasmName.ToString() = \"{0}\"", strVersion);
+ return 101;
+ }
+ }else{
+ strVersion = strVersion.Substring(index+8,7);
+ if(strVersion.Equals(asmN.Version.ToString())){
+ Console.WriteLine("Passed: asmName.Version == asmName.ToString() Version");
+ return 100;
+ }else{
+ Console.WriteLine("Failed: asmName.Version != asmName.ToString() Version");
+ Console.WriteLine ("\tasmName.Version = \"{0}\"", asmN.Version);
+ Console.WriteLine ("\tasmName.ToString() = \"{0}\"", strVersion);
+ return 101;
+ }
+ }
+ }
}
diff --git a/src/tests/Loader/binding/assemblies/assemblybugs/102140/test.csproj b/src/tests/Loader/binding/assemblies/assemblybugs/102140/test.csproj
index 3d3c6346f4214..e763068e76f1f 100644
--- a/src/tests/Loader/binding/assemblies/assemblybugs/102140/test.csproj
+++ b/src/tests/Loader/binding/assemblies/assemblybugs/102140/test.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
true
1
diff --git a/src/tests/Loader/binding/assemblies/assemblybugs/203962w/client.cs b/src/tests/Loader/binding/assemblies/assemblybugs/203962w/client.cs
index 08b122a40d28d..f25a8571eb413 100644
--- a/src/tests/Loader/binding/assemblies/assemblybugs/203962w/client.cs
+++ b/src/tests/Loader/binding/assemblies/assemblybugs/203962w/client.cs
@@ -3,11 +3,13 @@
using System;
using System.IO;
using System.Reflection;
+using Xunit;
public class client
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
try
diff --git a/src/tests/Loader/binding/assemblies/assemblybugs/203962w/client.csproj b/src/tests/Loader/binding/assemblies/assemblybugs/203962w/client.csproj
index 051246ae9764b..9fec279b8272e 100644
--- a/src/tests/Loader/binding/assemblies/assemblybugs/203962w/client.csproj
+++ b/src/tests/Loader/binding/assemblies/assemblybugs/203962w/client.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
true
1
diff --git a/src/tests/Loader/binding/assemblies/assemblybugs/37910/Ii.cs b/src/tests/Loader/binding/assemblies/assemblybugs/37910/Ii.cs
index 73cccbc37a6ca..27b3d44b77d50 100644
--- a/src/tests/Loader/binding/assemblies/assemblybugs/37910/Ii.cs
+++ b/src/tests/Loader/binding/assemblies/assemblybugs/37910/Ii.cs
@@ -3,13 +3,15 @@
using System;
using System.Reflection;
using System.Runtime.InteropServices;
+using Xunit;
public class Program
{
[DllImport("libc", EntryPoint = "setlocale")]
public static extern IntPtr setlocale(int category, [MarshalAs(UnmanagedType.LPStr)] string locale);
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
Assembly a1 = Assembly.GetExecutingAssembly();
diff --git a/src/tests/Loader/binding/assemblies/assemblybugs/37910/Ii.csproj b/src/tests/Loader/binding/assemblies/assemblybugs/37910/Ii.csproj
index 5b09e9e5cc3ca..4979349a55e19 100644
--- a/src/tests/Loader/binding/assemblies/assemblybugs/37910/Ii.csproj
+++ b/src/tests/Loader/binding/assemblies/assemblybugs/37910/Ii.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
true
diff --git a/src/tests/Loader/binding/assemblies/assemblyversion/EmbedStringVersions.csproj b/src/tests/Loader/binding/assemblies/assemblyversion/EmbedStringVersions.csproj
index 1e7af5d17cc68..fe6a7034d6aac 100644
--- a/src/tests/Loader/binding/assemblies/assemblyversion/EmbedStringVersions.csproj
+++ b/src/tests/Loader/binding/assemblies/assemblyversion/EmbedStringVersions.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
true
1
diff --git a/src/tests/Loader/binding/assemblies/assemblyversion/embedstringversions.cs b/src/tests/Loader/binding/assemblies/assemblyversion/embedstringversions.cs
index 932ad532ad019..c671fa9d0d756 100644
--- a/src/tests/Loader/binding/assemblies/assemblyversion/embedstringversions.cs
+++ b/src/tests/Loader/binding/assemblies/assemblyversion/embedstringversions.cs
@@ -48,6 +48,7 @@
using System;
using System.Globalization;
+using Xunit;
public class StringVersionClass {
@@ -61,7 +62,8 @@ public class StringVersionClass {
private bool[] result = new bool[MAX_TEST];
- public static int Main() {
+ [Fact]
+ public static int TestEntryPoint() {
StringVersionClass Me = new StringVersionClass();
int ret = -1;
diff --git a/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/exceptions.cs b/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/exceptions.cs
index a8a2375bcdf70..8a0974e186723 100644
--- a/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/exceptions.cs
+++ b/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/exceptions.cs
@@ -6,6 +6,7 @@
using System.IO;
using System.Reflection;
using System.Collections;
+using Xunit;
public class GenClass
{
@@ -15,7 +16,8 @@ public class GenClass
public class PropsArIList
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
int result = 0;
diff --git a/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/exceptions.csproj b/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/exceptions.csproj
index 114bd690d4fa2..f21b42273890a 100644
--- a/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/exceptions.csproj
+++ b/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/exceptions.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
true
1
diff --git a/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/methods.cs b/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/methods.cs
index be51a38e6fd98..f2aa88723e01e 100644
--- a/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/methods.cs
+++ b/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/methods.cs
@@ -6,6 +6,7 @@
using System.IO;
using System.Reflection;
using System.Collections;
+using Xunit;
public class GenClass
{
@@ -15,7 +16,8 @@ public class GenClass
public class PropsArIList
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
int result = 0;
diff --git a/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/methods.csproj b/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/methods.csproj
index a7eeee0ff34f9..c89d7e6e45604 100644
--- a/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/methods.csproj
+++ b/src/tests/Loader/binding/assemblies/generics/arilistienum/methods/methods.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
true
1
diff --git a/src/tests/Loader/binding/tracing/BinderTracingTest.EventHandlers.cs b/src/tests/Loader/binding/tracing/BinderTracingTest.EventHandlers.cs
index 21561ec3ff151..dbd3570ccc5e6 100644
--- a/src/tests/Loader/binding/tracing/BinderTracingTest.EventHandlers.cs
+++ b/src/tests/Loader/binding/tracing/BinderTracingTest.EventHandlers.cs
@@ -37,8 +37,8 @@ public static BindOperation AssemblyLoadContextResolving_ReturnNull()
}
catch { }
- Assert.Equal(1, handlers.Invocations.Count);
- Assert.Equal(0, handlers.Binds.Count);
+ Assert.Single(handlers.Invocations);
+ Assert.Empty(handlers.Binds);
return new BindOperation()
{
AssemblyName = assemblyName,
@@ -62,8 +62,8 @@ public static BindOperation AssemblyLoadContextResolving_LoadAssembly()
{
Assembly asm = alc.LoadFromAssemblyName(assemblyName);
- Assert.Equal(1, handlers.Invocations.Count);
- Assert.Equal(1, handlers.Binds.Count);
+ Assert.Single(handlers.Invocations);
+ Assert.Single(handlers.Binds);
return new BindOperation()
{
AssemblyName = assemblyName,
@@ -87,8 +87,8 @@ public static BindOperation AssemblyLoadContextResolving_NameMismatch()
{
Assert.Throws(() => alc.LoadFromAssemblyName(assemblyName));
- Assert.Equal(1, handlers.Invocations.Count);
- Assert.Equal(1, handlers.Binds.Count);
+ Assert.Single(handlers.Invocations);
+ Assert.Single(handlers.Binds);
return new BindOperation()
{
AssemblyName = assemblyName,
@@ -111,10 +111,10 @@ public static BindOperation AssemblyLoadContextResolving_MultipleHandlers()
{
Assembly asm = alc.LoadFromAssemblyName(assemblyName);
- Assert.Equal(1, handlerNull.Invocations.Count);
- Assert.Equal(0, handlerNull.Binds.Count);
- Assert.Equal(1, handlerLoad.Invocations.Count);
- Assert.Equal(1, handlerLoad.Binds.Count);
+ Assert.Single(handlerNull.Invocations);
+ Assert.Empty(handlerNull.Binds);
+ Assert.Single(handlerLoad.Invocations);
+ Assert.Single(handlerLoad.Binds);
return new BindOperation()
{
AssemblyName = assemblyName,
@@ -141,8 +141,8 @@ public static BindOperation AppDomainAssemblyResolve_ReturnNull()
}
catch { }
- Assert.Equal(1, handlers.Invocations.Count);
- Assert.Equal(0, handlers.Binds.Count);
+ Assert.Single(handlers.Invocations);
+ Assert.Empty(handlers.Binds);
return new BindOperation()
{
AssemblyName = assemblyName,
@@ -166,8 +166,8 @@ public static BindOperation AppDomainAssemblyResolve_LoadAssembly()
{
Assembly asm = alc.LoadFromAssemblyName(assemblyName);
- Assert.Equal(1, handlers.Invocations.Count);
- Assert.Equal(1, handlers.Binds.Count);
+ Assert.Single(handlers.Invocations);
+ Assert.Single(handlers.Binds);
return new BindOperation()
{
AssemblyName = assemblyName,
@@ -192,8 +192,8 @@ public static BindOperation AppDomainAssemblyResolve_NameMismatch()
// Result of AssemblyResolve event does not get checked for name mismatch
Assembly asm = alc.LoadFromAssemblyName(assemblyName);
- Assert.Equal(1, handlers.Invocations.Count);
- Assert.Equal(1, handlers.Binds.Count);
+ Assert.Single(handlers.Invocations);
+ Assert.Single(handlers.Binds);
return new BindOperation()
{
AssemblyName = assemblyName,
@@ -218,10 +218,10 @@ public static BindOperation AppDomainAssemblyResolve_MultipleHandlers()
{
Assembly asm = alc.LoadFromAssemblyName(assemblyName);
- Assert.Equal(1, handlerNull.Invocations.Count);
- Assert.Equal(0, handlerNull.Binds.Count);
- Assert.Equal(1, handlerLoad.Invocations.Count);
- Assert.Equal(1, handlerLoad.Binds.Count);
+ Assert.Single(handlerNull.Invocations);
+ Assert.Empty(handlerNull.Binds);
+ Assert.Single(handlerLoad.Invocations);
+ Assert.Single(handlerLoad.Binds);
return new BindOperation()
{
AssemblyName = assemblyName,
diff --git a/src/tests/Loader/binding/tracing/BinderTracingTest.targets b/src/tests/Loader/binding/tracing/BinderTracingTest.targets
index 67b0d2d3a20fa..5851e914132d7 100644
--- a/src/tests/Loader/binding/tracing/BinderTracingTest.targets
+++ b/src/tests/Loader/binding/tracing/BinderTracingTest.targets
@@ -1,6 +1,9 @@
Exe
+
+ true
+ false
diff --git a/src/tests/Loader/classloader/Casting/Functionpointer.cs b/src/tests/Loader/classloader/Casting/Functionpointer.cs
index 95d7bf33b1303..3a168fa612a83 100644
--- a/src/tests/Loader/classloader/Casting/Functionpointer.cs
+++ b/src/tests/Loader/classloader/Casting/Functionpointer.cs
@@ -1,5 +1,6 @@
using System;
using System.Runtime.InteropServices;
+using Xunit;
namespace TestFunctionPointer
{
@@ -36,9 +37,10 @@ public static int Function2(int a) {
}
}
- unsafe class Program
+ public unsafe class Program
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
return TestThings.Functions2[0][0](TestThings.Functions[0][0]());
}
diff --git a/src/tests/Loader/classloader/Casting/Functionpointer.csproj b/src/tests/Loader/classloader/Casting/Functionpointer.csproj
index 51f7075c49c81..aacefd40ce56f 100644
--- a/src/tests/Loader/classloader/Casting/Functionpointer.csproj
+++ b/src/tests/Loader/classloader/Casting/Functionpointer.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
true
diff --git a/src/tests/Loader/classloader/Casting/castclasspointer.il b/src/tests/Loader/classloader/Casting/castclasspointer.il
index 484edd480ff18..8e030f8b9de6c 100644
--- a/src/tests/Loader/classloader/Casting/castclasspointer.il
+++ b/src/tests/Loader/classloader/Casting/castclasspointer.il
@@ -5,7 +5,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib { }
-.class value MyGen`1
+.class public value MyGen`1
{
.field !T _fld;
}
diff --git a/src/tests/Loader/classloader/Casting/castclasspointer.ilproj b/src/tests/Loader/classloader/Casting/castclasspointer.ilproj
index 1a4dc8709995c..5bcba1ea8cce2 100644
--- a/src/tests/Loader/classloader/Casting/castclasspointer.ilproj
+++ b/src/tests/Loader/classloader/Casting/castclasspointer.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/Casting/punning.csproj b/src/tests/Loader/classloader/Casting/punning.csproj
index 765f941ba7d22..79e1aecaa97ad 100644
--- a/src/tests/Loader/classloader/Casting/punning.csproj
+++ b/src/tests/Loader/classloader/Casting/punning.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2.il
index 4fc29cc28189c..5788db02220bc 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2.il
@@ -23,7 +23,7 @@
}
}
-.class value Adder`1 implements class IAdder`1, class IAdder`1
+.class public value Adder`1 implements class IAdder`1, class IAdder`1
{
.field private int32 _field
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2.ilproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2.ilproj
index 7c8baeb679891..9945ea5d3a5e0 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2.ilproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2_gm.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2_gm.il
index ae609ae15397a..60dd601cd747f 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2_gm.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2_gm.il
@@ -23,7 +23,7 @@
}
}
-.class value Adder`1 implements class IAdder`1, class IAdder`1
+.class public value Adder`1 implements class IAdder`1, class IAdder`1
{
.field private int32 _field
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2_gm.ilproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2_gm.ilproj
index f6a6e713c2808..b73bbd258d127 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2_gm.ilproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained2_gm.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3.il
index a21660740efcf..bce684624b3ad 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3.il
@@ -41,7 +41,7 @@
}
}
-.class value Adder`1 implements class IFrobber`1, class IRobber`1, class IGrabber`1
+.class public value Adder`1 implements class IFrobber`1, class IRobber`1, class IGrabber`1
{
}
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3.ilproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3.ilproj
index fb95d8b59429b..8d229cca54ae7 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3.ilproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3_gm.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3_gm.il
index 1ca2bf93a7415..6deae5685e430 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3_gm.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3_gm.il
@@ -41,7 +41,7 @@
}
}
-.class value Adder`1 implements class IFrobber`1, class IRobber`1, class IGrabber`1
+.class public value Adder`1 implements class IFrobber`1, class IRobber`1, class IGrabber`1
{
}
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3_gm.ilproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3_gm.ilproj
index 050bb1ccc3b58..40f8548d09b50 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3_gm.ilproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrained3_gm.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.il
index 319e6afdf0817..6854de4c9fd0f 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.il
@@ -25,7 +25,7 @@
.class interface IGen3`1 { }
.class value Atom { }
-.class value Adder`1 implements class IAdder`1>, class IAdder`1>, class IAdder`1>, class IAdder`1
+.class public value Adder`1 implements class IAdder`1>, class IAdder`1>, class IAdder`1>, class IAdder`1
{
.field private int32 _field
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.ilproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.ilproj
index be0bca337e251..8de20bb275b72 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.ilproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/constrainedcall/constrainedcall.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.il
index 2b3865dc380d7..b0f76fc05ba5d 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.il
@@ -604,7 +604,7 @@
} // end of class GI4Class`1
-.class private auto ansi beforefieldinit Program
+.class public auto ansi beforefieldinit Program
extends [mscorlib]System.Object
{
.method public hidebysig static void Negative() cil managed
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_d.ilproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_d.ilproj
index 7e5d20a7a0849..f2e94a9f7569d 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_d.ilproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_d.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
Full
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_r.ilproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_r.ilproj
index 144d7d9636abe..213376d19b11c 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_r.ilproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape_r.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.il
index ef65e21313f20..f1f2ff694be82 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.il
@@ -153,10 +153,10 @@
} // end of class FooBar`1
-.class private auto ansi beforefieldinit Program
+.class public auto ansi beforefieldinit Program
extends [mscorlib]System.Object
{
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.ilproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.ilproj
index be0bca337e251..8de20bb275b72 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.ilproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.il
index f763c9c99863f..ec47bfc23570b 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.il
@@ -944,7 +944,7 @@
} // end of class FooBarBlahImpl
-.class private auto ansi beforefieldinit Program
+.class public auto ansi beforefieldinit Program
extends [mscorlib]System.Object
{
.method public hidebysig static int32 Main() cil managed
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.ilproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.ilproj
index be0bca337e251..8de20bb275b72 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.ilproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/reabstraction/reabstraction.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/reabstraction/reabstraction.il
index 55b6ea4775b23..1a9ebeeef99d7 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/reabstraction/reabstraction.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/reabstraction/reabstraction.il
@@ -138,7 +138,7 @@
}
}
-.method private hidebysig static int32 Main() cil managed
+.method public hidebysig static int32 Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/reabstraction/reabstraction.ilproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/reabstraction/reabstraction.ilproj
index be0bca337e251..8de20bb275b72 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/reabstraction/reabstraction.ilproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/reabstraction/reabstraction.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github44533.cs b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github44533.cs
index b1b4f3f19778a..ebe8fd1701de2 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github44533.cs
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github44533.cs
@@ -3,12 +3,14 @@
using System;
using System.Linq;
+using Xunit;
namespace BugInReflection
{
- class Program
+ public class Program
{
- static int Main()
+ [Fact]
+ public static void TestEntryPoint()
{
// This tests the ability to load a type when
// 1. The type implements an interface
@@ -26,7 +28,6 @@ static int Main()
// To workaround the bug in .NET 5, simply make the Post class have enough virtual methods to match
// the number of virtual methods on the ITitle interface.
new BlogPost();
- return 100;
}
}
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github44533.csproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github44533.csproj
index dc645c9a5acfd..c89d7e6e45604 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github44533.csproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github44533.csproj
@@ -1,7 +1,8 @@
+
+ true
true
- Exe
1
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github58394.cs b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github58394.cs
index ee94e5422908d..7f823c33ead10 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github58394.cs
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github58394.cs
@@ -3,12 +3,14 @@
using System;
using System.Runtime.CompilerServices;
+using Xunit;
namespace GenericDimValuetypeBug
{
- class Program
+ public class Program
{
- static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
if (RunOne() != 17)
return 1;
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github58394.csproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github58394.csproj
index 42c7a9e8ffc90..2495e486fa9bf 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github58394.csproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github58394.csproj
@@ -1,7 +1,8 @@
+
+ true
true
- Exe
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.cs b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.cs
index 131cef9347026..63821bbd8c88b 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.cs
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.cs
@@ -1,5 +1,6 @@
using System;
using System.Runtime.CompilerServices;
+using Xunit;
public interface IPublisher
{
@@ -111,10 +112,10 @@ public void TestMethod11(IPublisher publisher, StackFrame[] expectedFrames)
public class Program : ProgramBase, TestItf2
{
- static int Main()
+ [Fact]
+ public static void TestEntryPoint()
{
new Program().Start();
- return 100;
}
public void Start()
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.csproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.csproj
index 92fad4dce522f..9bd6a5a478b55 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.csproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github60486.csproj
@@ -1,7 +1,8 @@
+
+ true
true
- Exe
0
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github61244.cs b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github61244.cs
index bb2b0e6bc689d..6997257159964 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github61244.cs
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github61244.cs
@@ -1,6 +1,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
// In GH issue 61244 the mono runtime aborted when inflating the default
// interface method because the context used was from the base interface.
@@ -18,9 +19,10 @@
// regression that caused Mono to incorrectly instantiate generic
// interfaces that appeared in the MethodImpl table
-class Program
+public class Program
{
- static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
int result = new TestClass().DoTest();
if (result != 100)
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github61244.csproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github61244.csproj
index 42c7a9e8ffc90..2495e486fa9bf 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github61244.csproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github61244.csproj
@@ -1,7 +1,8 @@
+
+ true
true
- Exe
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github81882.cs b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github81882.cs
index 1a5203922431c..324103380225e 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github81882.cs
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github81882.cs
@@ -27,7 +27,8 @@ class ClassB : ClassA
public class Program
{
- public static int Main()
+ [Fact]
+ public static void TestEntryPoint()
{
IDefault c = new ClassB();
@@ -36,8 +37,6 @@ public static int Main()
string s2 = c.Method2();
Assert.Equal("ClassB Method2", s2);
-
- return 100;
}
}
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github81882.csproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github81882.csproj
index 42c7a9e8ffc90..2495e486fa9bf 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github81882.csproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github81882.csproj
@@ -1,7 +1,8 @@
+
+ true
true
- Exe
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github82577.cs b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github82577.cs
index c7a0f9b6877a7..ec8d74a3f88b7 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github82577.cs
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github82577.cs
@@ -1,11 +1,13 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-class Program
+public class Program
{
- static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
int ret;
ret = (new TestClass() as ITestInterface).PublicInterfaceProtectedVirtualClass();
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github82577.csproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github82577.csproj
index 42c7a9e8ffc90..2495e486fa9bf 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github82577.csproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/regressions/github82577.csproj
@@ -1,7 +1,8 @@
+
+ true
true
- Exe
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/non_virtual_calls_to_instance_methods.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/non_virtual_calls_to_instance_methods.il
index 21b03019eeada..37ab25a594507 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/non_virtual_calls_to_instance_methods.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/non_virtual_calls_to_instance_methods.il
@@ -100,10 +100,10 @@
} // end of class Sample.C1
-.class private auto ansi beforefieldinit Sample.Program
+.class public auto ansi beforefieldinit Sample.Program
extends [System.Runtime]System.Object
{
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/non_virtual_calls_to_instance_methods.ilproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/non_virtual_calls_to_instance_methods.ilproj
index 042fd4166effc..a0424b4260cd7 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/non_virtual_calls_to_instance_methods.ilproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/non_virtual_calls_to_instance_methods.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.il
index 01b203cbd2530..50caefe670684 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.il
@@ -110,7 +110,7 @@
} // end of class FooBar`2
-.class private auto ansi beforefieldinit Program
+.class public auto ansi beforefieldinit Program
extends [mscorlib]System.Object
{
.method public hidebysig static int32 Main() cil managed
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_d.ilproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_d.ilproj
index dc8ed62354809..29cc9f861db40 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_d.ilproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_d.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
Full
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_r.ilproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_r.ilproj
index 42a1c29439df3..637d7430104a9 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_r.ilproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics_r.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/simple/simple.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/simple/simple.il
index 8d8e04582aa12..6d3fd6aca9188 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/simple/simple.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/simple/simple.il
@@ -213,7 +213,7 @@
} // end of class FooBar
-.class private auto ansi beforefieldinit Program
+.class public auto ansi beforefieldinit Program
extends [mscorlib]System.Object
{
.method public hidebysig static int32 Main() cil managed
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/simple/simple.ilproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/simple/simple.ilproj
index be0bca337e251..8de20bb275b72 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/simple/simple.ilproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/simple/simple.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.il
index 4056e4057a02b..2bdc8c6097445 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.il
@@ -105,7 +105,7 @@
} // end of method FooBarStruct::SetValue
} // end of class FooBarStruct
-.class private auto ansi beforefieldinit Program
+.class public auto ansi beforefieldinit Program
extends [mscorlib]System.Object
{
.method public hidebysig static int32 Main() cil managed
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.ilproj b/src/tests/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.ilproj
index be0bca337e251..8de20bb275b72 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.ilproj
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/DictionaryExpansion/DictionaryExpansion.cs b/src/tests/Loader/classloader/DictionaryExpansion/DictionaryExpansion.cs
index 0080960784774..97024233aa497 100644
--- a/src/tests/Loader/classloader/DictionaryExpansion/DictionaryExpansion.cs
+++ b/src/tests/Loader/classloader/DictionaryExpansion/DictionaryExpansion.cs
@@ -167,8 +167,8 @@ public static void DoTest_GenDerived3(int max)
[MethodImpl(MethodImplOptions.NoInlining)]
public override void VFunc()
{
- Assert.Equal(typeof(KeyValuePair).ToString(), "System.Collections.Generic.KeyValuePair`2[System.Object,System.String]");
- Assert.Equal(typeof(KeyValuePair).ToString(), "System.Collections.Generic.KeyValuePair`2[System.Object,System.String]");
+ Assert.Equal("System.Collections.Generic.KeyValuePair`2[System.Object,System.String]", typeof(KeyValuePair).ToString());
+ Assert.Equal("System.Collections.Generic.KeyValuePair`2[System.Object,System.String]", typeof(KeyValuePair).ToString());
}
}
@@ -278,7 +278,8 @@ public static void DoTest(int max)
Assert.Equal(GFunc(i).ToString(), i == 0 ? "Test_DictionaryExpansion" : $"TestType{i}`1[Test_DictionaryExpansion]");
}
- public static int Main()
+ [Fact]
+ public static void TestEntryPoint()
{
GenBase deriv4 = new GenDerived4();
@@ -328,7 +329,5 @@ public static int Main()
// base type dictionaries were expanded.
for(int i = 0; i < 5; i++)
deriv4.VFunc();
-
- return 100;
}
}
diff --git a/src/tests/Loader/classloader/DictionaryExpansion/DictionaryExpansion.csproj b/src/tests/Loader/classloader/DictionaryExpansion/DictionaryExpansion.csproj
index 3e62bfd677e86..6de026371ec46 100644
--- a/src/tests/Loader/classloader/DictionaryExpansion/DictionaryExpansion.csproj
+++ b/src/tests/Loader/classloader/DictionaryExpansion/DictionaryExpansion.csproj
@@ -1,9 +1,10 @@
- Exe
+
+ true
-
+
diff --git a/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.cs b/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.cs
index 70aeef5323711..b0e081c7abb4d 100644
--- a/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.cs
+++ b/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.cs
@@ -8,7 +8,7 @@
using Xunit;
-unsafe class Validate
+public unsafe class Validate
{
[Fact]
public static void Explicit_Fails()
diff --git a/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.csproj b/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.csproj
index 2b17f8cac36a5..8323d950dff73 100644
--- a/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.csproj
+++ b/src/tests/Loader/classloader/InlineArray/InlineArrayInvalid.csproj
@@ -1,13 +1,14 @@
+
+ true
true
- Exe
-
+
diff --git a/src/tests/Loader/classloader/InlineArray/InlineArrayValid.cs b/src/tests/Loader/classloader/InlineArray/InlineArrayValid.cs
index 60da6c0c3783a..324695aa82618 100644
--- a/src/tests/Loader/classloader/InlineArray/InlineArrayValid.cs
+++ b/src/tests/Loader/classloader/InlineArray/InlineArrayValid.cs
@@ -36,7 +36,7 @@ public IEnumerator GetEnumerator()
}
}
-unsafe class Validate
+public unsafe class Validate
{
// ====================== SizeOf ==============================================================
[InlineArray(42)]
diff --git a/src/tests/Loader/classloader/InlineArray/InlineArrayValid.csproj b/src/tests/Loader/classloader/InlineArray/InlineArrayValid.csproj
index 2ed1ccb70a0bb..51b51934197c4 100644
--- a/src/tests/Loader/classloader/InlineArray/InlineArrayValid.csproj
+++ b/src/tests/Loader/classloader/InlineArray/InlineArrayValid.csproj
@@ -1,13 +1,14 @@
+
+ true
true
- Exe
-
+
diff --git a/src/tests/Loader/classloader/InterfaceFolding/Ambiguous.ilproj b/src/tests/Loader/classloader/InterfaceFolding/Ambiguous.ilproj
index b3ba1efbda858..82b82978e0198 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/Ambiguous.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/Ambiguous.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase0.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase0.ilproj
index 7f2527fce72b0..9792c17863cf2 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase0.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase0.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_I.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_I.ilproj
index dd296d5c72f69..867cca06c9e66 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_I.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_I.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_I_Nested_J.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_I_Nested_J.ilproj
index afa384f136b3f..9ef40fa908c3e 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_I_Nested_J.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_I_Nested_J.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_J.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_J.ilproj
index 4259f194a33d0..aec1a12b20040 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_J.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_J.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_J_Nested_I.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_J_Nested_I.ilproj
index 345e6c45837e2..f07d5da2402cb 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_J_Nested_I.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase0_Nested_J_Nested_I.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase1.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase1.ilproj
index 19a7325ca6da6..4923543d8b47b 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase1.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase1.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_I.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_I.ilproj
index d36547418643e..1375c0227faf5 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_I.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_I.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_I_Nested_J.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_I_Nested_J.ilproj
index cbee6c3d00b31..4f841a389fb3f 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_I_Nested_J.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_I_Nested_J.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_J.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_J.ilproj
index 6a6ffbaab5bfd..48d1a5af515d6 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_J.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_J.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_J_Nested_I.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_J_Nested_I.ilproj
index e54a8aac20765..75dd45e2ae20e 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_J_Nested_I.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase1_Nested_J_Nested_I.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase2.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase2.ilproj
index 2312a494d8055..2138a70640736 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase2.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase2.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_I.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_I.ilproj
index ae0f5793288e7..c4c611927e12e 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_I.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_I.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_I_Nested_J.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_I_Nested_J.ilproj
index 691ab92dfa498..90756460dc718 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_I_Nested_J.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_I_Nested_J.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_J.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_J.ilproj
index 4ebce25b049b4..22369c07e7fa8 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_J.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_J.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_J_Nested_I.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_J_Nested_I.ilproj
index 93d8751c4d5e8..35039f2fc123e 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_J_Nested_I.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase2_Nested_J_Nested_I.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase3.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase3.ilproj
index de4963b8f679f..c171d5117cf98 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase3.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase3.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_I.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_I.ilproj
index a3ec8086b580f..08c8f0a04abeb 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_I.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_I.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_I_Nested_J.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_I_Nested_J.ilproj
index dcc589d70fed1..dae77763f96d3 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_I_Nested_J.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_I_Nested_J.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_J.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_J.ilproj
index 695cfe95334f8..08a25a606cb1b 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_J.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_J.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_J_Nested_I.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_J_Nested_I.ilproj
index 938ef20faa553..ed5696c221302 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_J_Nested_I.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase3_Nested_J_Nested_I.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase4.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase4.ilproj
index 9f0a49899efaa..ff033d90f4c65 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase4.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase4.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_I.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_I.ilproj
index f7f8358ac19fb..8a2220c960a0a 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_I.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_I.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_I_Nested_J.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_I_Nested_J.ilproj
index c332535a37891..3e73742f81206 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_I_Nested_J.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_I_Nested_J.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_J.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_J.ilproj
index de90b2e44d615..fdc5de70f7b93 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_J.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_J.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_J_Nested_I.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_J_Nested_I.ilproj
index 228469718daab..5d65badc490c3 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_J_Nested_I.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase4_Nested_J_Nested_I.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase5.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase5.ilproj
index e4b8304dd2124..6af4af52870e9 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase5.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase5.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_I.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_I.ilproj
index a4461cf1abb35..93fc05bac3405 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_I.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_I.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_I_Nested_J.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_I_Nested_J.ilproj
index 9d2796bcb3e9d..05b131d1b2788 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_I_Nested_J.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_I_Nested_J.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_J.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_J.ilproj
index 040371404a8c8..79c86a767b2e3 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_J.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_J.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_J_Nested_I.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_J_Nested_I.ilproj
index 64f0fd2889fa4..08cc3257e23f2 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_J_Nested_I.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase5_Nested_J_Nested_I.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase6.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase6.ilproj
index 460173ed353d3..aada4b81bb780 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase6.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase6.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_I.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_I.ilproj
index 50192e49f2a77..b7643c07f69ff 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_I.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_I.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_I_Nested_J.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_I_Nested_J.ilproj
index 5525da68d8ec8..1d83f5971cafa 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_I_Nested_J.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_I_Nested_J.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_J.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_J.ilproj
index 8475476e97d95..099f27bb476f1 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_J.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_J.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_J_Nested_I.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_J_Nested_I.ilproj
index 298be6216fc9b..0e72a2ad76914 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_J_Nested_I.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase6_Nested_J_Nested_I.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase7.ilproj b/src/tests/Loader/classloader/InterfaceFolding/TestCase7.ilproj
index f35086ae84a70..5e1e8a020384d 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase7.ilproj
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase7.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnitTest.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnitTest.ilproj
index 660607f265f77..ef656c0dff17e 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnitTest.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnitTest.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario1.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario1.ilproj
index 712562daee9ec..41ac0cc4a954b 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario1.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario1.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario2.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario2.ilproj
index 2c16fe59798b1..09a9af9702c90 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario2.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario2.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario3.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario3.ilproj
index 482d5257fb245..1c5baa14db6ab 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario3.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario3.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.ilproj
index 6d1c8eeacf644..a9cf164dd5a10 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/ImplicitOverrideSameSigAsDecl.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.ilproj
index 44613b6015366..0755bc766c59a 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/ReturnTypeValidation/OverrideSameSigAsDecl.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Structs/IncompatibleOverride.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Structs/IncompatibleOverride.ilproj
index b4628fb767c0f..54d6554955408 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Structs/IncompatibleOverride.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Structs/IncompatibleOverride.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/AttributeTesting.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/AttributeTesting.ilproj
index 8cc8160cef397..1c513aa9c5c58 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/AttributeTesting.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/AttributeTesting.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/CompatibleWithTest.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/CompatibleWithTest.ilproj
index 80475fc0a1705..8ce8ede481a6e 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/CompatibleWithTest.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/CompatibleWithTest.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
true
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideMoreDerivedReturn.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideMoreDerivedReturn.ilproj
index 12e42266b8e34..2d13885a5b84d 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideMoreDerivedReturn.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideMoreDerivedReturn.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideReabstracted.cs b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideReabstracted.cs
index f0f461777e700..e9a0cee2ce6b0 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideReabstracted.cs
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideReabstracted.cs
@@ -2,13 +2,15 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
namespace ReproMAUI6811;
public static class Program
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
Leaf l = new Leaf();
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideReabstracted.csproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideReabstracted.csproj
index 570644f1dbcb7..c8d7c17797c6c 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideReabstracted.csproj
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideReabstracted.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest.ilproj
index 660607f265f77..ef656c0dff17e 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestDelegates.il b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestDelegates.il
index 1a51dd35f6a42..fe1f1f4c7749d 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestDelegates.il
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestDelegates.il
@@ -775,7 +775,7 @@
// ========================================================================================
-.class private auto ansi beforefieldinit CMain extends [System.Runtime]System.Object
+.class public auto ansi beforefieldinit CMain extends [System.Runtime]System.Object
{
.method private hidebysig static bool CheckResults(string expected,
string a,
@@ -1101,7 +1101,7 @@
ret
}
- .method private hidebysig static int32 Main() cil managed
+ .method public hidebysig static int32 Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestDelegates.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestDelegates.ilproj
index e1434ef5e257b..5b77aaba92e07 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestDelegates.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestDelegates.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestMultiModule.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestMultiModule.ilproj
index 5fca8b3905421..31c8b24f80943 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestMultiModule.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTestMultiModule.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.ilproj b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.ilproj
index ee9dc11d5bc88..a67b27e375f00 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/UnitTest_GVM.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/MethodImpl/generics_override1.il b/src/tests/Loader/classloader/MethodImpl/generics_override1.il
index 124747ba9a368..edb935b4a7a32 100644
--- a/src/tests/Loader/classloader/MethodImpl/generics_override1.il
+++ b/src/tests/Loader/classloader/MethodImpl/generics_override1.il
@@ -536,7 +536,7 @@
} // end of class InvalidOverride
-.class private auto ansi beforefieldinit Program
+.class public auto ansi beforefieldinit Program
extends [mscorlib]System.Object
{
.method private hidebysig static void Assert(string result, string expected, int32& failCount)
@@ -1011,7 +1011,7 @@
IL_005e: ret
} // end of method Program::Test5
- .method private hidebysig static int32 Main() cil managed
+ .method public hidebysig static int32 Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
diff --git a/src/tests/Loader/classloader/MethodImpl/generics_override1.ilproj b/src/tests/Loader/classloader/MethodImpl/generics_override1.ilproj
index 974bb2edb6c28..90f2ad5e53d57 100644
--- a/src/tests/Loader/classloader/MethodImpl/generics_override1.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/generics_override1.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
true
diff --git a/src/tests/Loader/classloader/MethodImpl/override_override1.ilproj b/src/tests/Loader/classloader/MethodImpl/override_override1.ilproj
index 142a20a9f569a..35d314f33711b 100644
--- a/src/tests/Loader/classloader/MethodImpl/override_override1.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/override_override1.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/MethodImpl/self_override1.ilproj b/src/tests/Loader/classloader/MethodImpl/self_override1.ilproj
index 2052e0c29b402..8a17c63cb6398 100644
--- a/src/tests/Loader/classloader/MethodImpl/self_override1.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/self_override1.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/MethodImpl/self_override2.ilproj b/src/tests/Loader/classloader/MethodImpl/self_override2.ilproj
index 6108a27785a23..02141708da0f6 100644
--- a/src/tests/Loader/classloader/MethodImpl/self_override2.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/self_override2.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/MethodImpl/self_override3.ilproj b/src/tests/Loader/classloader/MethodImpl/self_override3.ilproj
index be2b81636e5a2..861e30351d3ca 100644
--- a/src/tests/Loader/classloader/MethodImpl/self_override3.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/self_override3.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/MethodImpl/self_override5.ilproj b/src/tests/Loader/classloader/MethodImpl/self_override5.ilproj
index 01b1c014adbbe..b1e631f7d6436 100644
--- a/src/tests/Loader/classloader/MethodImpl/self_override5.ilproj
+++ b/src/tests/Loader/classloader/MethodImpl/self_override5.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.ilproj b/src/tests/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.ilproj
index a9994e2393d1b..19eeeb508aa8d 100644
--- a/src/tests/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.ilproj
+++ b/src/tests/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/RefFields/Validate.cs b/src/tests/Loader/classloader/RefFields/Validate.cs
index 68b505dc76cf3..65d9d36f8df74 100644
--- a/src/tests/Loader/classloader/RefFields/Validate.cs
+++ b/src/tests/Loader/classloader/RefFields/Validate.cs
@@ -9,7 +9,7 @@
using Xunit;
-class Validate
+public class Validate
{
[StructLayout(LayoutKind.Explicit)]
private ref struct Explicit
diff --git a/src/tests/Loader/classloader/RefFields/Validate.csproj b/src/tests/Loader/classloader/RefFields/Validate.csproj
index d25be953ff91f..f8e94ce317a33 100644
--- a/src/tests/Loader/classloader/RefFields/Validate.csproj
+++ b/src/tests/Loader/classloader/RefFields/Validate.csproj
@@ -1,7 +1,8 @@
+
+ true
true
- Exe
true
@@ -9,6 +10,6 @@
-
+
diff --git a/src/tests/Loader/classloader/SequentialLayout/ManagedSequential/ManagedSequential.cs b/src/tests/Loader/classloader/SequentialLayout/ManagedSequential/ManagedSequential.cs
index ec7140c41933d..fd9408e6885ea 100644
--- a/src/tests/Loader/classloader/SequentialLayout/ManagedSequential/ManagedSequential.cs
+++ b/src/tests/Loader/classloader/SequentialLayout/ManagedSequential/ManagedSequential.cs
@@ -7,7 +7,7 @@
using Xunit;
[SkipOnMono("This test suite tests CoreCLR and Crossgen2/NativeAOT-specific layout rules.")]
-unsafe class ManagedSequential
+public unsafe class ManagedSequential
{
[StructLayout(LayoutKind.Sequential)]
class LayoutClassObjectBase
diff --git a/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t1.ilproj b/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t1.ilproj
index 7febeca263d25..994b7fdeb71b3 100644
--- a/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t1.ilproj
+++ b/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t1.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t2.ilproj b/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t2.ilproj
index 0943b5f146015..e539def6dec25 100644
--- a/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t2.ilproj
+++ b/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t2.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/Loader/classloader/SequentialLayout/Regress/ExplicitSize/ExplicitSize.cs b/src/tests/Loader/classloader/SequentialLayout/Regress/ExplicitSize/ExplicitSize.cs
index 1b3fc336f39fa..a67bc6796b864 100644
--- a/src/tests/Loader/classloader/SequentialLayout/Regress/ExplicitSize/ExplicitSize.cs
+++ b/src/tests/Loader/classloader/SequentialLayout/Regress/ExplicitSize/ExplicitSize.cs
@@ -4,8 +4,9 @@
using System;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using Xunit;
-unsafe class Program
+public unsafe class Program
{
[StructLayout(LayoutKind.Sequential, Size = 16)]
struct GUID
@@ -13,7 +14,8 @@ struct GUID
private int align;
}
- static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
Guid initialGuid = Guid.Parse("E6218D43-3C16-48BF-9C3C-8076FF5AFCD0");
GUID g = default;
diff --git a/src/tests/Loader/classloader/SequentialLayout/Regress/ExplicitSize/ExplicitSize.csproj b/src/tests/Loader/classloader/SequentialLayout/Regress/ExplicitSize/ExplicitSize.csproj
index dc645c9a5acfd..c89d7e6e45604 100644
--- a/src/tests/Loader/classloader/SequentialLayout/Regress/ExplicitSize/ExplicitSize.csproj
+++ b/src/tests/Loader/classloader/SequentialLayout/Regress/ExplicitSize/ExplicitSize.csproj
@@ -1,7 +1,8 @@
+
+ true
true
- Exe
1
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/DiamondShape/svm_diamondshape.il b/src/tests/Loader/classloader/StaticVirtualMethods/DiamondShape/svm_diamondshape.il
index 92e3934e683e2..8b60c9dd6fd1a 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/DiamondShape/svm_diamondshape.il
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/DiamondShape/svm_diamondshape.il
@@ -758,7 +758,7 @@
} // end of class ResolutionAtRuntimeMethodParam
-.class private auto ansi beforefieldinit Program
+.class public auto ansi beforefieldinit Program
extends [mscorlib]System.Object
{
.method public hidebysig static void Negative() cil managed
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/DiamondShape/svm_diamondshape_d.ilproj b/src/tests/Loader/classloader/StaticVirtualMethods/DiamondShape/svm_diamondshape_d.ilproj
index 5a90175fe318f..de1563903897d 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/DiamondShape/svm_diamondshape_d.ilproj
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/DiamondShape/svm_diamondshape_d.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
Full
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/DiamondShape/svm_diamondshape_r.ilproj b/src/tests/Loader/classloader/StaticVirtualMethods/DiamondShape/svm_diamondshape_r.ilproj
index f036395dbd3f9..fce818ebdb7b6 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/DiamondShape/svm_diamondshape_r.ilproj
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/DiamondShape/svm_diamondshape_r.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/Generator/generatetest.csproj b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/Generator/generatetest.csproj
index ed7a5a98dd143..31f49fe2682c6 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/Generator/generatetest.csproj
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/Generator/generatetest.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
$(NetCoreAppCurrent)
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTest/GenericContextTest.ilproj b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTest/GenericContextTest.ilproj
index e76e7e6e8ea0c..d184922c30934 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTest/GenericContextTest.ilproj
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTest/GenericContextTest.ilproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
Full
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDefaultImpCallDefaultImp/GenericContextCommonAndImplementation.il b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDICallDI/GenericContextCommonAndImplementationDICallDI.il
similarity index 99%
rename from src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDefaultImpCallDefaultImp/GenericContextCommonAndImplementation.il
rename to src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDICallDI/GenericContextCommonAndImplementationDICallDI.il
index d1ef889588336..5f21b51ced4c0 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDefaultImpCallDefaultImp/GenericContextCommonAndImplementation.il
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDICallDI/GenericContextCommonAndImplementationDICallDI.il
@@ -7,7 +7,7 @@
.assembly extern mscorlib {}
.assembly extern System.Runtime {}
.assembly extern GenericContextCommonCs {}
-.assembly GenericContextCommonAndImplementation {}
+.assembly GenericContextCommonAndImplementationDICallDI {}
.class interface public abstract auto ansi IFaceNonGeneric
{
.method public newslot virtual abstract static void NormalMethod() {}
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDefaultImpCallDefaultImp/GenericContextCommonAndImplementation.ilproj b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDICallDI/GenericContextCommonAndImplementationDICallDI.ilproj
similarity index 74%
rename from src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDefaultImpCallDefaultImp/GenericContextCommonAndImplementation.ilproj
rename to src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDICallDI/GenericContextCommonAndImplementationDICallDI.ilproj
index 469adcecb8cfb..06e127361ae7a 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDefaultImpCallDefaultImp/GenericContextCommonAndImplementation.ilproj
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDICallDI/GenericContextCommonAndImplementationDICallDI.ilproj
@@ -6,6 +6,6 @@
Full
-
+
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDefaultImpCallDefaultImp/GenericContextTestDefaultImpCallDefaultImp.il b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDICallDI/GenericContextTestDICallDI.il
similarity index 88%
rename from src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDefaultImpCallDefaultImp/GenericContextTestDefaultImpCallDefaultImp.il
rename to src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDICallDI/GenericContextTestDICallDI.il
index c4bc38234b684..f96ebcdf8106b 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDefaultImpCallDefaultImp/GenericContextTestDefaultImpCallDefaultImp.il
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDICallDI/GenericContextTestDICallDI.il
@@ -7,15 +7,15 @@
.assembly extern mscorlib {}
.assembly extern System.Runtime {}
.assembly extern GenericContextCommonCs {}
-.assembly extern GenericContextCommonAndImplementation {}
-.assembly GenericContextTestDefaultImpCallDefaultImp {}
+.assembly extern GenericContextCommonAndImplementationDICallDI {}
+.assembly GenericContextTestDICallDI {}
.class public auto ansi TestEntrypoint
extends [System.Runtime]System.Object
{
.method public static void Test_Call_NonGenericNonGenericClass_NonGeneric_NonGeneric_NormalMethod() cil managed noinlining
{
- constrained. class [GenericContextCommonAndImplementation]NonGenericClass
- call void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::NormalMethod()
+ constrained. class [GenericContextCommonAndImplementationDICallDI]NonGenericClass
+ call void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::NormalMethod()
ldstr "Call_NonGenericNonGenericClass_NonGeneric_NonGeneric_NormalMethod"
ldstr "IFaceNonGenericDefaultImp.NormalMethod"
call void [GenericContextCommonCs]Statics::CheckForFailure(string,string)
@@ -23,8 +23,8 @@
} // end of method Test_Call_NonGenericNonGenericClass_NonGeneric_NonGeneric_NormalMethod
.method public static void Test_Ldftn_NonGenericNonGenericClass_NonGeneric_NonGeneric_NormalMethod() cil managed noinlining
{
- constrained. class [GenericContextCommonAndImplementation]NonGenericClass
- ldftn void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::NormalMethod()
+ constrained. class [GenericContextCommonAndImplementationDICallDI]NonGenericClass
+ ldftn void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::NormalMethod()
volatile.
stsfld native int modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) [GenericContextCommonCs]Statics::FtnHolder
volatile.
@@ -38,8 +38,8 @@
.method public static void Test_CreateDelegate_NonGenericNonGenericClass_NonGeneric_NonGeneric_NormalMethod() cil managed noinlining
{
ldnull
- constrained. class [GenericContextCommonAndImplementation]NonGenericClass
- ldftn void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::NormalMethod()
+ constrained. class [GenericContextCommonAndImplementationDICallDI]NonGenericClass
+ ldftn void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::NormalMethod()
newobj instance void [System.Runtime]System.Action::.ctor(object,
native int)
volatile.
@@ -54,8 +54,8 @@
} // end of method Test_CreateDelegate_NonGenericNonGenericClass_NonGeneric_NonGeneric_NormalMethod
.method public static void Test_Call_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_NormalMethod() cil managed noinlining
{
- constrained. valuetype [GenericContextCommonAndImplementation]NonGenericValuetype
- call void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::NormalMethod()
+ constrained. valuetype [GenericContextCommonAndImplementationDICallDI]NonGenericValuetype
+ call void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::NormalMethod()
ldstr "Call_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_NormalMethod"
ldstr "IFaceNonGenericDefaultImp.NormalMethod"
call void [GenericContextCommonCs]Statics::CheckForFailure(string,string)
@@ -63,8 +63,8 @@
} // end of method Test_Call_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_NormalMethod
.method public static void Test_Ldftn_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_NormalMethod() cil managed noinlining
{
- constrained. valuetype [GenericContextCommonAndImplementation]NonGenericValuetype
- ldftn void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::NormalMethod()
+ constrained. valuetype [GenericContextCommonAndImplementationDICallDI]NonGenericValuetype
+ ldftn void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::NormalMethod()
volatile.
stsfld native int modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) [GenericContextCommonCs]Statics::FtnHolder
volatile.
@@ -78,8 +78,8 @@
.method public static void Test_CreateDelegate_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_NormalMethod() cil managed noinlining
{
ldnull
- constrained. valuetype [GenericContextCommonAndImplementation]NonGenericValuetype
- ldftn void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::NormalMethod()
+ constrained. valuetype [GenericContextCommonAndImplementationDICallDI]NonGenericValuetype
+ ldftn void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::NormalMethod()
newobj instance void [System.Runtime]System.Action::.ctor(object,
native int)
volatile.
@@ -94,8 +94,8 @@
} // end of method Test_CreateDelegate_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_NormalMethod
.method public static void Test_Call_NonGenericNonGenericClass_NonGeneric_NonGeneric_GenericMethodOverInt() cil managed noinlining
{
- constrained. class [GenericContextCommonAndImplementation]NonGenericClass
- call void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::GenericMethod()
+ constrained. class [GenericContextCommonAndImplementationDICallDI]NonGenericClass
+ call void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::GenericMethod()
ldstr "Call_NonGenericNonGenericClass_NonGeneric_NonGeneric_GenericMethodOverInt"
ldstr "IFaceNonGenericDefaultImp.GenericMethod"
call void [GenericContextCommonCs]Statics::CheckForFailure(string,string)
@@ -103,8 +103,8 @@
} // end of method Test_Call_NonGenericNonGenericClass_NonGeneric_NonGeneric_GenericMethodOverInt
.method public static void Test_Ldftn_NonGenericNonGenericClass_NonGeneric_NonGeneric_GenericMethodOverInt() cil managed noinlining
{
- constrained. class [GenericContextCommonAndImplementation]NonGenericClass
- ldftn void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::GenericMethod()
+ constrained. class [GenericContextCommonAndImplementationDICallDI]NonGenericClass
+ ldftn void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::GenericMethod()
volatile.
stsfld native int modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) [GenericContextCommonCs]Statics::FtnHolder
volatile.
@@ -118,8 +118,8 @@
.method public static void Test_CreateDelegate_NonGenericNonGenericClass_NonGeneric_NonGeneric_GenericMethodOverInt() cil managed noinlining
{
ldnull
- constrained. class [GenericContextCommonAndImplementation]NonGenericClass
- ldftn void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::GenericMethod()
+ constrained. class [GenericContextCommonAndImplementationDICallDI]NonGenericClass
+ ldftn void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::GenericMethod()
newobj instance void [System.Runtime]System.Action::.ctor(object,
native int)
volatile.
@@ -134,8 +134,8 @@
} // end of method Test_CreateDelegate_NonGenericNonGenericClass_NonGeneric_NonGeneric_GenericMethodOverInt
.method public static void Test_Call_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_GenericMethodOverInt() cil managed noinlining
{
- constrained. valuetype [GenericContextCommonAndImplementation]NonGenericValuetype
- call void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::GenericMethod()
+ constrained. valuetype [GenericContextCommonAndImplementationDICallDI]NonGenericValuetype
+ call void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::GenericMethod()
ldstr "Call_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_GenericMethodOverInt"
ldstr "IFaceNonGenericDefaultImp.GenericMethod"
call void [GenericContextCommonCs]Statics::CheckForFailure(string,string)
@@ -143,8 +143,8 @@
} // end of method Test_Call_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_GenericMethodOverInt
.method public static void Test_Ldftn_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_GenericMethodOverInt() cil managed noinlining
{
- constrained. valuetype [GenericContextCommonAndImplementation]NonGenericValuetype
- ldftn void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::GenericMethod()
+ constrained. valuetype [GenericContextCommonAndImplementationDICallDI]NonGenericValuetype
+ ldftn void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::GenericMethod()
volatile.
stsfld native int modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) [GenericContextCommonCs]Statics::FtnHolder
volatile.
@@ -158,8 +158,8 @@
.method public static void Test_CreateDelegate_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_GenericMethodOverInt() cil managed noinlining
{
ldnull
- constrained. valuetype [GenericContextCommonAndImplementation]NonGenericValuetype
- ldftn void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::GenericMethod()
+ constrained. valuetype [GenericContextCommonAndImplementationDICallDI]NonGenericValuetype
+ ldftn void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::GenericMethod()
newobj instance void [System.Runtime]System.Action::.ctor(object,
native int)
volatile.
@@ -174,8 +174,8 @@
} // end of method Test_CreateDelegate_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_GenericMethodOverInt
.method public static void Test_Call_NonGenericNonGenericClass_NonGeneric_NonGeneric_GenericMethodOverString() cil managed noinlining
{
- constrained. class [GenericContextCommonAndImplementation]NonGenericClass
- call void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::GenericMethod()
+ constrained. class [GenericContextCommonAndImplementationDICallDI]NonGenericClass
+ call void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::GenericMethod()
ldstr "Call_NonGenericNonGenericClass_NonGeneric_NonGeneric_GenericMethodOverString"
ldstr "IFaceNonGenericDefaultImp.GenericMethod"
call void [GenericContextCommonCs]Statics::CheckForFailure(string,string)
@@ -183,8 +183,8 @@
} // end of method Test_Call_NonGenericNonGenericClass_NonGeneric_NonGeneric_GenericMethodOverString
.method public static void Test_Ldftn_NonGenericNonGenericClass_NonGeneric_NonGeneric_GenericMethodOverString() cil managed noinlining
{
- constrained. class [GenericContextCommonAndImplementation]NonGenericClass
- ldftn void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::GenericMethod()
+ constrained. class [GenericContextCommonAndImplementationDICallDI]NonGenericClass
+ ldftn void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::GenericMethod()
volatile.
stsfld native int modreq([System.Runtime]System.Runtime.CompilerServices.IsVolatile) [GenericContextCommonCs]Statics::FtnHolder
volatile.
@@ -198,8 +198,8 @@
.method public static void Test_CreateDelegate_NonGenericNonGenericClass_NonGeneric_NonGeneric_GenericMethodOverString() cil managed noinlining
{
ldnull
- constrained. class [GenericContextCommonAndImplementation]NonGenericClass
- ldftn void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::GenericMethod()
+ constrained. class [GenericContextCommonAndImplementationDICallDI]NonGenericClass
+ ldftn void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::GenericMethod()
newobj instance void [System.Runtime]System.Action::.ctor(object,
native int)
volatile.
@@ -214,8 +214,8 @@
} // end of method Test_CreateDelegate_NonGenericNonGenericClass_NonGeneric_NonGeneric_GenericMethodOverString
.method public static void Test_Call_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_GenericMethodOverString() cil managed noinlining
{
- constrained. valuetype [GenericContextCommonAndImplementation]NonGenericValuetype
- call void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::GenericMethod()
+ constrained. valuetype [GenericContextCommonAndImplementationDICallDI]NonGenericValuetype
+ call void class [GenericContextCommonAndImplementationDICallDI]IFaceNonGenericDefaultImp::GenericMethod()
ldstr "Call_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_GenericMethodOverString"
ldstr "IFaceNonGenericDefaultImp.GenericMethod"
call void [GenericContextCommonCs]Statics::CheckForFailure(string,string)
@@ -223,8 +223,8 @@
} // end of method Test_Call_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_GenericMethodOverString
.method public static void Test_Ldftn_NonGenericNonGenericValuetype_NonGeneric_NonGeneric_GenericMethodOverString() cil managed noinlining
{
- constrained. valuetype [GenericContextCommonAndImplementation]NonGenericValuetype
- ldftn void class [GenericContextCommonAndImplementation]IFaceNonGenericDefaultImp::GenericMethod